aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyrylo Tkachov <kyrylo.tkachov@arm.com>2022-12-12 11:07:45 +0000
committerKyrylo Tkachov <kyrylo.tkachov@arm.com>2022-12-12 11:07:45 +0000
commit688f4eb28186daf333f7a7f5b1bdc1df43bb6c47 (patch)
tree65973cd6a3145240a6feb8fd29bb27f7e29b3015
parent49bf49bb6174734879adcba7fb340c1c8f5dd253 (diff)
downloadgcc-688f4eb28186daf333f7a7f5b1bdc1df43bb6c47.zip
gcc-688f4eb28186daf333f7a7f5b1bdc1df43bb6c47.tar.gz
gcc-688f4eb28186daf333f7a7f5b1bdc1df43bb6c47.tar.bz2
aarch64: Add __ARM_FEATURE_PAUTH and __ARM_FEATURE_BTI ACLE defines
Recent ACLE additions specified the __ARM_FEATURE_PAUTH and __ARM_FEATURE_BTI macros [1] that the compiler should define when the pointer authentication and BTI instructions are available (and don't act as NOPs). We've received requests to enable them in GCC for aarch64, similar to clang [2]. It's a fairly simple patch and should be non-intrusive at this stage. Pointer authentication has its own "pauth" feature flag, whereas BTI depends on an architecture level of Armv8.5-a or later. Bootstrapped and tested on aarch64-none-linux-gnu. [1] https://github.com/ARM-software/acle/blob/main/main/acle.md#pointer-authentication [2] https://reviews.llvm.org/rG7d40baa82b1f272f68de63f3c4f68d970bdcd6ed gcc/ChangeLog: * config/aarch64/aarch64-c.cc (aarch64_update_cpp_builtins): Define __ARM_FEATURE_PAUTH and __ARM_FEATURE_BTI when appropriate. * config/aarch64/aarch64.h (TARGET_BTI): Define. gcc/testsuite/ChangeLog: * gcc.target/aarch64/acle/bti_def.c: New test. * gcc.target/aarch64/acle/pauth_def.c: New test.
-rw-r--r--gcc/config/aarch64/aarch64-c.cc2
-rw-r--r--gcc/config/aarch64/aarch64.h5
-rw-r--r--gcc/testsuite/gcc.target/aarch64/acle/bti_def.c10
-rw-r--r--gcc/testsuite/gcc.target/aarch64/acle/pauth_def.c10
4 files changed, 27 insertions, 0 deletions
diff --git a/gcc/config/aarch64/aarch64-c.cc b/gcc/config/aarch64/aarch64-c.cc
index e296c73..e47b6a8 100644
--- a/gcc/config/aarch64/aarch64-c.cc
+++ b/gcc/config/aarch64/aarch64-c.cc
@@ -195,6 +195,8 @@ aarch64_update_cpp_builtins (cpp_reader *pfile)
builtin_define_with_int_value ("__ARM_FEATURE_PAC_DEFAULT", v);
}
+ aarch64_def_or_undef (TARGET_PAUTH, "__ARM_FEATURE_PAUTH", pfile);
+ aarch64_def_or_undef (TARGET_BTI, "__ARM_FEATURE_BTI", pfile);
aarch64_def_or_undef (TARGET_I8MM, "__ARM_FEATURE_MATMUL_INT8", pfile);
aarch64_def_or_undef (TARGET_BF16_SIMD,
"__ARM_FEATURE_BF16_VECTOR_ARITHMETIC", pfile);
diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h
index dcb1ece..db6ec5c 100644
--- a/gcc/config/aarch64/aarch64.h
+++ b/gcc/config/aarch64/aarch64.h
@@ -312,6 +312,11 @@ enum class aarch64_feature : unsigned char {
/* PAUTH instructions are enabled through +pauth. */
#define TARGET_PAUTH (AARCH64_ISA_PAUTH)
+/* BTI instructions exist from Armv8.5-a onwards. Their automatic use is
+ enabled through -mbranch-protection by using NOP-space instructions,
+ but this TARGET_ is used for defining BTI-related ACLE things. */
+#define TARGET_BTI (AARCH64_ISA_V8_5A)
+
/* MOPS instructions are enabled through +mops. */
#define TARGET_MOPS (AARCH64_ISA_MOPS)
diff --git a/gcc/testsuite/gcc.target/aarch64/acle/bti_def.c b/gcc/testsuite/gcc.target/aarch64/acle/bti_def.c
new file mode 100644
index 0000000..db94769
--- /dev/null
+++ b/gcc/testsuite/gcc.target/aarch64/acle/bti_def.c
@@ -0,0 +1,10 @@
+/* { dg-do compile } */
+
+#pragma GCC target "arch=armv8.5-a"
+#ifndef __ARM_FEATURE_BTI
+#error "__ARM_FEATURE_BTI is not defined but should be!"
+#endif
+
+void
+foo (void) {}
+
diff --git a/gcc/testsuite/gcc.target/aarch64/acle/pauth_def.c b/gcc/testsuite/gcc.target/aarch64/acle/pauth_def.c
new file mode 100644
index 0000000..400a0f6
--- /dev/null
+++ b/gcc/testsuite/gcc.target/aarch64/acle/pauth_def.c
@@ -0,0 +1,10 @@
+/* { dg-do compile } */
+
+#pragma GCC target "+pauth"
+#ifndef __ARM_FEATURE_PAUTH
+#error "__ARM_FEATURE_PAUTH is not defined but should be!"
+#endif
+
+void
+foo (void) {}
+