This is an archive of the discontinued LLVM Phabricator instance.

Differential D92549

[compiler-rt] Fix building the aarch64 out-of-line atomics assembly for non-ELF platforms
ClosedPublic

Authored by mstorsjo on Dec 3 2020, 12:38 AM.

Details

Reviewers
ilinpv
danielkiss
t.p.northover
Commits
rGd3fef7a7c25e: [compiler-rt] Fix building the aarch64 out-of-line atomics assembly for non-ELF…
Summary

Move the two different definitions of FUNC_ALIGN out of the ELF specific block. Add the missing CFI_END in the non-ELF version of END_COMPILERRT_OUTLINE_FUNCTION, to go with the corresponding CFI_START in DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED.

Diff Detail

Event Timeline

mstorsjo created this revision.Dec 3 2020, 12:38 AM
Herald added a project: Restricted Project. · View Herald TranscriptDec 3 2020, 12:38 AM
Herald added subscribers: Restricted Project, kristof.beyls, dberris. · View Herald Transcript
mstorsjo requested review of this revision.Dec 3 2020, 12:38 AM
Harbormaster completed remote builds in B80922: Diff 309176.Dec 3 2020, 1:36 AM
danielkiss accepted this revision.Dec 3 2020, 3:47 AM

LGTM

This revision is now accepted and ready to land.Dec 3 2020, 3:47 AM
This revision was landed with ongoing or failed builds.Dec 3 2020, 5:31 AM
Closed by commit rGd3fef7a7c25e: [compiler-rt] Fix building the aarch64 out-of-line atomics assembly for non-ELF… (authored by mstorsjo). · Explain Why
This revision was automatically updated to reflect the committed changes.
mstorsjo added a commit: rGd3fef7a7c25e: [compiler-rt] Fix building the aarch64 out-of-line atomics assembly for non-ELF….
ilinpv mentioned this in D92530: [compiler-rt] [builtins] Make lse.S compile on Darwin.Dec 3 2020, 5:37 AM

Revision Contents

PathSize
compiler-rt/
lib/
builtins/
15 lines

Diff 309233

compiler-rt/lib/builtins/assembly.h

Show All 31 Lines
#elif defined(__ELF__) #elif defined(__ELF__)
#define HIDDEN(name) .hidden name #define HIDDEN(name) .hidden name
#define LOCAL_LABEL(name) .L_##name #define LOCAL_LABEL(name) .L_##name
#define FILE_LEVEL_DIRECTIVE #define FILE_LEVEL_DIRECTIVE
#if defined(__arm__) || defined(__aarch64__) #if defined(__arm__) || defined(__aarch64__)
#define SYMBOL_IS_FUNC(name) .type name,%function #define SYMBOL_IS_FUNC(name) .type name,%function
#define FUNC_ALIGN \
.text SEPARATOR \
.balign 16 SEPARATOR
#else #else
#define SYMBOL_IS_FUNC(name) .type name,@function #define SYMBOL_IS_FUNC(name) .type name,@function
#define FUNC_ALIGN
#endif #endif
#define CONST_SECTION .section .rodata #define CONST_SECTION .section .rodata
#if defined(__GNU__) || defined(__FreeBSD__) || defined(__Fuchsia__) || \ #if defined(__GNU__) || defined(__FreeBSD__) || defined(__Fuchsia__) || \
defined(__linux__) defined(__linux__)
#define NO_EXEC_STACK_DIRECTIVE .section .note.GNU-stack,"",%progbits #define NO_EXEC_STACK_DIRECTIVE .section .note.GNU-stack,"",%progbits
#else #else
#define NO_EXEC_STACK_DIRECTIVE #define NO_EXEC_STACK_DIRECTIVE
Show All 10 Lines .def name SEPARATOR \
.type 32 SEPARATOR \ .type 32 SEPARATOR \
.endef .endef
#define CONST_SECTION .section .rdata,"rd" #define CONST_SECTION .section .rdata,"rd"
#define NO_EXEC_STACK_DIRECTIVE #define NO_EXEC_STACK_DIRECTIVE
#endif #endif
#if defined(__arm__) || defined(__aarch64__)
#define FUNC_ALIGN \
.text SEPARATOR \
.balign 16 SEPARATOR
#else
#define FUNC_ALIGN
#endif
// BTI and PAC gnu property note // BTI and PAC gnu property note
#define NT_GNU_PROPERTY_TYPE_0 5 #define NT_GNU_PROPERTY_TYPE_0 5
#define GNU_PROPERTY_AARCH64_FEATURE_1_AND 0xc0000000 #define GNU_PROPERTY_AARCH64_FEATURE_1_AND 0xc0000000
#define GNU_PROPERTY_AARCH64_FEATURE_1_BTI 1 #define GNU_PROPERTY_AARCH64_FEATURE_1_BTI 1
#define GNU_PROPERTY_AARCH64_FEATURE_1_PAC 2 #define GNU_PROPERTY_AARCH64_FEATURE_1_PAC 2
#if defined(__ARM_FEATURE_BTI_DEFAULT) #if defined(__ARM_FEATURE_BTI_DEFAULT)
#define BTI_FLAG GNU_PROPERTY_AARCH64_FEATURE_1_BTI #define BTI_FLAG GNU_PROPERTY_AARCH64_FEATURE_1_BTI
▲ Show 20 Lines • Show All 185 Lines • ▼ Show 20 Lines
#ifdef __ELF__ #ifdef __ELF__
#define END_COMPILERRT_FUNCTION(name) \ #define END_COMPILERRT_FUNCTION(name) \
.size SYMBOL_NAME(name), . - SYMBOL_NAME(name) .size SYMBOL_NAME(name), . - SYMBOL_NAME(name)
#define END_COMPILERRT_OUTLINE_FUNCTION(name) \ #define END_COMPILERRT_OUTLINE_FUNCTION(name) \
CFI_END SEPARATOR \ CFI_END SEPARATOR \
.size SYMBOL_NAME(name), . - SYMBOL_NAME(name) .size SYMBOL_NAME(name), . - SYMBOL_NAME(name)
#else #else
#define END_COMPILERRT_FUNCTION(name) #define END_COMPILERRT_FUNCTION(name)
#define END_COMPILERRT_OUTLINE_FUNCTION(name) #define END_COMPILERRT_OUTLINE_FUNCTION(name) \
CFI_END
#endif #endif
#endif // COMPILERRT_ASSEMBLY_H #endif // COMPILERRT_ASSEMBLY_H