Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d31b9814 authored by Sami Tolvanen's avatar Sami Tolvanen Committed by Alistair Strachan
Browse files

ANDROID: arm64: lse: fix LSE atomics with LTO 



LLVM's integrated assembler is always used for inline assembly with
CONFIG_LTO_CLANG. Unlike gcc, LLVM considers each inline assembly
block to be independent and therefore, any preambles that enable
features must be included in each block.

This change adds the necessary preamble to ARM64_LSE_ATOMIC_INSN to
allow CONFIG_ARM64_LSE_ATOMICS to be enabled with LTO.

Bug: 117299373
Change-Id: Icc06361dc2a2dba0f5f967d7f540cac2753b3e9c
Signed-off-by: default avatarSami Tolvanen <samitolvanen@google.com>
parent d4a0a177

arch/arm64/include/asm/lse.h

+6 −1
Original line number Diff line number Diff line
@@ -20,7 +20,12 @@ 


#else	/* __ASSEMBLER__ */



#ifdef CONFIG_LTO_CLANG

#define __LSE_PREAMBLE	".arch armv8-a+lse\n"

#else

__asm__(".arch_extension	lse");

#define __LSE_PREAMBLE

#endif



/* Move the ll/sc atomics out-of-line */

#define __LL_SC_INLINE		notrace
@@ -33,7 +38,7 @@ __asm__(".arch_extension lse"); 


/* In-line patching at runtime */

#define ARM64_LSE_ATOMIC_INSN(llsc, lse)				\

	ALTERNATIVE(llsc, lse, ARM64_HAS_LSE_ATOMICS)

	ALTERNATIVE(llsc, __LSE_PREAMBLE lse, ARM64_HAS_LSE_ATOMICS)



#endif	/* __ASSEMBLER__ */

#else	/* CONFIG_AS_LSE && CONFIG_ARM64_LSE_ATOMICS */