mirror of
https://git.yoctoproject.org/poky
synced 2026-01-29 21:08:42 +01:00
clang: Fix GCS annotations in compiler-rt on aarch64
Fixes builds for Distros with TC_CXX_RUNTIME = "llvm" (From OE-Core rev: 44a550ef2a32eb00dcf5d7efd475d9916548e031) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
@@ -0,0 +1,151 @@
|
||||
From 2d102880766a5e55e5d7b4f9a2fb106d7d1ee55c Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Csan=C3=A1d=20Hajd=C3=BA?= <csanad.hajdu@arm.com>
|
||||
Date: Thu, 7 Aug 2025 16:40:36 +0200
|
||||
Subject: [PATCH] [compiler-rt][AArch64] Add GCS property in assembly files
|
||||
(#152502)
|
||||
|
||||
Only BTI and PAC properties were added previously.
|
||||
|
||||
Fixes https://github.com/llvm/llvm-project/issues/152427.
|
||||
|
||||
Upstream-Status: Backport [https://github.com/llvm/llvm-project/pull/152502]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
compiler-rt/lib/builtins/aarch64/lse.S | 4 ++--
|
||||
compiler-rt/lib/builtins/aarch64/sme-abi.S | 4 ++--
|
||||
compiler-rt/lib/builtins/assembly.h | 18 +++++++++++++-----
|
||||
.../lib/hwasan/hwasan_interceptors_vfork.S | 2 +-
|
||||
compiler-rt/lib/hwasan/hwasan_setjmp_aarch64.S | 2 +-
|
||||
.../lib/hwasan/hwasan_tag_mismatch_aarch64.S | 2 +-
|
||||
...zer_common_interceptors_vfork_aarch64.inc.S | 2 +-
|
||||
compiler-rt/lib/tsan/rtl/tsan_rtl_aarch64.S | 2 +-
|
||||
8 files changed, 22 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/compiler-rt/lib/builtins/aarch64/lse.S b/compiler-rt/lib/builtins/aarch64/lse.S
|
||||
index 1fe18f4a4681..abad047096cc 100644
|
||||
--- a/compiler-rt/lib/builtins/aarch64/lse.S
|
||||
+++ b/compiler-rt/lib/builtins/aarch64/lse.S
|
||||
@@ -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 // __aarch64__
|
||||
diff --git a/compiler-rt/lib/builtins/aarch64/sme-abi.S b/compiler-rt/lib/builtins/aarch64/sme-abi.S
|
||||
index 8dbbe061edb9..29d7ad53047d 100644
|
||||
--- a/compiler-rt/lib/builtins/aarch64/sme-abi.S
|
||||
+++ b/compiler-rt/lib/builtins/aarch64/sme-abi.S
|
||||
@@ -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
|
||||
diff --git a/compiler-rt/lib/builtins/assembly.h b/compiler-rt/lib/builtins/assembly.h
|
||||
index 34c71241524d..a554c10c18ac 100644
|
||||
--- a/compiler-rt/lib/builtins/assembly.h
|
||||
+++ b/compiler-rt/lib/builtins/assembly.h
|
||||
@@ -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
|
||||
@@ -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 \
|
||||
@@ -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)
|
||||
diff --git a/compiler-rt/lib/hwasan/hwasan_interceptors_vfork.S b/compiler-rt/lib/hwasan/hwasan_interceptors_vfork.S
|
||||
index fd20825e3dac..825f41156509 100644
|
||||
--- a/compiler-rt/lib/hwasan/hwasan_interceptors_vfork.S
|
||||
+++ b/compiler-rt/lib/hwasan/hwasan_interceptors_vfork.S
|
||||
@@ -11,4 +11,4 @@
|
||||
|
||||
NO_EXEC_STACK_DIRECTIVE
|
||||
|
||||
-GNU_PROPERTY_BTI_PAC
|
||||
+GNU_PROPERTY_BTI_PAC_GCS
|
||||
diff --git a/compiler-rt/lib/hwasan/hwasan_setjmp_aarch64.S b/compiler-rt/lib/hwasan/hwasan_setjmp_aarch64.S
|
||||
index 0c0abb6de861..b8d98b09ada2 100644
|
||||
--- a/compiler-rt/lib/hwasan/hwasan_setjmp_aarch64.S
|
||||
+++ b/compiler-rt/lib/hwasan/hwasan_setjmp_aarch64.S
|
||||
@@ -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
|
||||
diff --git a/compiler-rt/lib/hwasan/hwasan_tag_mismatch_aarch64.S b/compiler-rt/lib/hwasan/hwasan_tag_mismatch_aarch64.S
|
||||
index fd060c51cd8e..be82475101c8 100644
|
||||
--- a/compiler-rt/lib/hwasan/hwasan_tag_mismatch_aarch64.S
|
||||
+++ b/compiler-rt/lib/hwasan/hwasan_tag_mismatch_aarch64.S
|
||||
@@ -157,4 +157,4 @@ mismatch:
|
||||
// We do not need executable stack.
|
||||
NO_EXEC_STACK_DIRECTIVE
|
||||
|
||||
-GNU_PROPERTY_BTI_PAC
|
||||
+GNU_PROPERTY_BTI_PAC_GCS
|
||||
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_vfork_aarch64.inc.S b/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_vfork_aarch64.inc.S
|
||||
index cdfa6f1d7f53..5066953980af 100644
|
||||
--- a/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_vfork_aarch64.inc.S
|
||||
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_vfork_aarch64.inc.S
|
||||
@@ -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
|
||||
diff --git a/compiler-rt/lib/tsan/rtl/tsan_rtl_aarch64.S b/compiler-rt/lib/tsan/rtl/tsan_rtl_aarch64.S
|
||||
index 7d920bee4a2d..f1d11a3e7f54 100644
|
||||
--- a/compiler-rt/lib/tsan/rtl/tsan_rtl_aarch64.S
|
||||
+++ b/compiler-rt/lib/tsan/rtl/tsan_rtl_aarch64.S
|
||||
@@ -222,6 +222,6 @@ ASM_SIZE(ASM_SYMBOL_INTERCEPTOR(__sigsetjmp))
|
||||
|
||||
NO_EXEC_STACK_DIRECTIVE
|
||||
|
||||
-GNU_PROPERTY_BTI_PAC
|
||||
+GNU_PROPERTY_BTI_PAC_GCS
|
||||
|
||||
#endif
|
||||
@@ -62,6 +62,7 @@ SRC_URI = "\
|
||||
file://0001-libclc-allow-existing-prepare-builtins-in-standalone.patch \
|
||||
file://no-c-index-test.patch \
|
||||
file://0001-llvm-Allow-users-to-set-LLVM_HAVE_OPT_VIEWER_MODULES.patch \
|
||||
file://0001-compiler-rt-AArch64-Add-GCS-property-in-assembly-fil.patch \
|
||||
"
|
||||
# Fallback to no-PIE if not set
|
||||
GCCPIE ??= ""
|
||||
|
||||
Reference in New Issue
Block a user