Hi,
This patch implements target feature macros when PACBTI is
enabled through the -march option or -mbranch-protection.
Tested on arm-none-eabi. OK for trunk?
2021-10-04 Tejas Belagod <[email protected]>
gcc/ChangeLog:
* config/arm/arm-c.c (arm_cpu_builtins): Define
__ARM_FEATURE_BTI_DEFAULT and __ARM_FEATURE_PAC_DEFAULT.
gcc/testsuite/ChangeLog:
* gcc.target/arm/acle/pacbti-m-predef-2.c: New test.
* gcc.target/arm/acle/pacbti-m-predef-4.c: New test.
* gcc.target/arm/acle/pacbti-m-predef-5.c: New test.
diff --git a/gcc/config/arm/arm-c.c b/gcc/config/arm/arm-c.c
index
cc7901bca8dc9c5c27ed6afc5bc26afd42689e6d..00dc1c2f13f2023c2ba8d7b03038a4cdde068ef6
100644
--- a/gcc/config/arm/arm-c.c
+++ b/gcc/config/arm/arm-c.c
@@ -193,6 +193,17 @@ arm_cpu_builtins (struct cpp_reader* pfile)
def_or_undef_macro (pfile, "__ARM_FEATURE_COMPLEX", TARGET_COMPLEX);
def_or_undef_macro (pfile, "__ARM_32BIT_STATE", TARGET_32BIT);
+ cpp_undef (pfile, "__ARM_FEATURE_BTI_DEFAULT");
+ cpp_undef (pfile, "__ARM_FEATURE_PAC_DEFAULT");
+ if (TARGET_HAVE_PACBTI)
+ {
+ builtin_define_with_int_value ("__ARM_FEATURE_BTI_DEFAULT",
+ arm_enable_pacbti & 0x1);
+ builtin_define_with_int_value ("__ARM_FEATURE_PAC_DEFAULT",
+ arm_enable_pacbti >> 1);
+ }
+
+
cpp_undef (pfile, "__ARM_FEATURE_MVE");
if (TARGET_HAVE_MVE && TARGET_HAVE_MVE_FLOAT)
{
diff --git a/gcc/testsuite/gcc.target/arm/acle/pacbti-m-predef-2.c
b/gcc/testsuite/gcc.target/arm/acle/pacbti-m-predef-2.c
new file mode 100644
index
0000000000000000000000000000000000000000..7e8cdb2c5fc74dd22085fcac1f692229300a333a
--- /dev/null
+++ b/gcc/testsuite/gcc.target/arm/acle/pacbti-m-predef-2.c
@@ -0,0 +1,16 @@
+
+/* { dg-do run } */
+/* { dg-require-effective-target arm_pacbti_hw } */
+/* { dg-additional-options " -mbranch-protection=bti+pac-ret+b-key+leaf" } */
+
+int
+main()
+{
+ if (__ARM_FEATURE_BTI_DEFAULT != 1)
+ __builtin_abort ();
+
+ if (__ARM_FEATURE_PAC_DEFAULT != 6)
+ __builtin_abort ();
+
+ return 0;
+}
diff --git a/gcc/testsuite/gcc.target/arm/acle/pacbti-m-predef-4.c
b/gcc/testsuite/gcc.target/arm/acle/pacbti-m-predef-4.c
new file mode 100644
index
0000000000000000000000000000000000000000..41fdcf91a8ab789d055407ae3f8c151984660ee9
--- /dev/null
+++ b/gcc/testsuite/gcc.target/arm/acle/pacbti-m-predef-4.c
@@ -0,0 +1,16 @@
+
+/* { dg-do run } */
+/* { dg-require-effective-target arm_pacbti_hw } */
+/* { dg-additional-options " -mbranch-protection=pac-ret+b-key" } */
+
+int
+main()
+{
+ if (__ARM_FEATURE_BTI_DEFAULT != 0)
+ __builtin_abort ();
+
+ if (__ARM_FEATURE_PAC_DEFAULT != 2)
+ __builtin_abort ();
+
+ return 0;
+}
diff --git a/gcc/testsuite/gcc.target/arm/acle/pacbti-m-predef-5.c
b/gcc/testsuite/gcc.target/arm/acle/pacbti-m-predef-5.c
new file mode 100644
index
0000000000000000000000000000000000000000..9527c9620a3a5c973b47a5f364ae290d975358c1
--- /dev/null
+++ b/gcc/testsuite/gcc.target/arm/acle/pacbti-m-predef-5.c
@@ -0,0 +1,16 @@
+
+/* { dg-do run } */
+/* { dg-require-effective-target arm_pacbti_hw } */
+/* { dg-additional-options " -mbranch-protection=bti+pac-ret+leaf" } */
+
+int
+main()
+{
+ if (__ARM_FEATURE_BTI_DEFAULT != 1)
+ __builtin_abort ();
+
+ if (__ARM_FEATURE_PAC_DEFAULT != 5)
+ __builtin_abort ();
+
+ return 0;
+}