Skip to content

[compiler-rt][AArch64] Add GCS property in assembly files #152502

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 7, 2025
Merged

[compiler-rt][AArch64] Add GCS property in assembly files #152502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions compiler-rt/lib/builtins/aarch64/lse.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ END_COMPILERRT_OUTLINE_FUNCTION(NAME(LDNM))

NO_EXEC_STACK_DIRECTIVE

// GNU property note for BTI and PAC
GNU_PROPERTY_BTI_PAC
// GNU property note for BTI, PAC, and GCS
GNU_PROPERTY_BTI_PAC_GCS

#endif // defined(__aarch64__) || defined(__arm64ec__)
4 changes: 2 additions & 2 deletions compiler-rt/lib/builtins/aarch64/sme-abi.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,5 +371,5 @@ END_COMPILERRT_FUNCTION(__arm_sme_restore)

NO_EXEC_STACK_DIRECTIVE

// GNU property note for BTI and PAC
GNU_PROPERTY_BTI_PAC
// GNU property note for BTI, PAC, and GCS
GNU_PROPERTY_BTI_PAC_GCS
18 changes: 13 additions & 5 deletions compiler-rt/lib/builtins/assembly.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,12 @@
#define FUNC_ALIGN
#endif

// BTI and PAC gnu property note
// BTI, PAC, and GCS gnu property note
#define NT_GNU_PROPERTY_TYPE_0 5
#define GNU_PROPERTY_AARCH64_FEATURE_1_AND 0xc0000000
#define GNU_PROPERTY_AARCH64_FEATURE_1_BTI 1
#define GNU_PROPERTY_AARCH64_FEATURE_1_PAC 2
#define GNU_PROPERTY_AARCH64_FEATURE_1_GCS 4

#if defined(__ARM_FEATURE_BTI_DEFAULT)
#define BTI_FLAG GNU_PROPERTY_AARCH64_FEATURE_1_BTI
Expand All @@ -97,6 +98,12 @@
#define PAC_FLAG 0
#endif

#if defined(__ARM_FEATURE_GCS_DEFAULT)
#define GCS_FLAG GNU_PROPERTY_AARCH64_FEATURE_1_GCS
#else
#define GCS_FLAG 0
#endif

#define GNU_PROPERTY(type, value) \
.pushsection .note.gnu.property, "a" SEPARATOR \
.p2align 3 SEPARATOR \
Expand All @@ -118,11 +125,12 @@
#define BTI_J
#endif

#if (BTI_FLAG | PAC_FLAG) != 0
#define GNU_PROPERTY_BTI_PAC \
GNU_PROPERTY(GNU_PROPERTY_AARCH64_FEATURE_1_AND, BTI_FLAG | PAC_FLAG)
#if (BTI_FLAG | PAC_FLAG | GCS_FLAG) != 0
#define GNU_PROPERTY_BTI_PAC_GCS \
GNU_PROPERTY(GNU_PROPERTY_AARCH64_FEATURE_1_AND, \
BTI_FLAG | PAC_FLAG | GCS_FLAG)
#else
#define GNU_PROPERTY_BTI_PAC
#define GNU_PROPERTY_BTI_PAC_GCS
#endif

#if defined(__clang__) || defined(__GCC_HAVE_DWARF2_CFI_ASM)
Expand Down
2 changes: 1 addition & 1 deletion compiler-rt/lib/hwasan/hwasan_interceptors_vfork.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@

NO_EXEC_STACK_DIRECTIVE

GNU_PROPERTY_BTI_PAC
GNU_PROPERTY_BTI_PAC_GCS
2 changes: 1 addition & 1 deletion compiler-rt/lib/hwasan/hwasan_setjmp_aarch64.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,4 +99,4 @@ ASM_TRAMPOLINE_ALIAS(_setjmp, setjmp)
// We do not need executable stack.
NO_EXEC_STACK_DIRECTIVE

GNU_PROPERTY_BTI_PAC
GNU_PROPERTY_BTI_PAC_GCS
2 changes: 1 addition & 1 deletion compiler-rt/lib/hwasan/hwasan_tag_mismatch_aarch64.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,4 +157,4 @@ mismatch:
// We do not need executable stack.
NO_EXEC_STACK_DIRECTIVE

GNU_PROPERTY_BTI_PAC
GNU_PROPERTY_BTI_PAC_GCS
2 changes: 1 addition & 1 deletion compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_vfork_aarch64.inc.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,6 @@ ASM_SIZE(vfork)
ASM_INTERCEPTOR_TRAMPOLINE(vfork)
ASM_TRAMPOLINE_ALIAS(vfork, vfork)

GNU_PROPERTY_BTI_PAC
GNU_PROPERTY_BTI_PAC_GCS

#endif
2 changes: 1 addition & 1 deletion compiler-rt/lib/tsan/rtl/tsan_rtl_aarch64.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,6 @@ ASM_SIZE(ASM_SYMBOL_INTERCEPTOR(__sigsetjmp))

NO_EXEC_STACK_DIRECTIVE

GNU_PROPERTY_BTI_PAC
GNU_PROPERTY_BTI_PAC_GCS

#endif
Loading