[clang] 7925e28 - Revert "[AArch64] Add __ARM_FEATURE_BTI and __ARM_FEATURE_PAUTH"

[Roman Lebedev via cfe-commits]

Reminder to please always mention the reason for the revert in the
commit message.

On Wed, Dec 7, 2022 at 5:20 PM Daniel Kiss via cfe-commits
<cfe-commits at lists.llvm.org> wrote:
>
>
> Author: Daniel Kiss
> Date: 2022-12-07T15:19:31+01:00
> New Revision: 7925e2828e3290f2851f29aec66c882597f8bc61
>
> URL: https://github.com/llvm/llvm-project/commit/7925e2828e3290f2851f29aec66c882597f8bc61
> DIFF: https://github.com/llvm/llvm-project/commit/7925e2828e3290f2851f29aec66c882597f8bc61.diff
>
> LOG: Revert "[AArch64] Add __ARM_FEATURE_BTI and __ARM_FEATURE_PAUTH"
>
> This reverts commit cfd44221e3e1783c0f44d5b1694dfbe84187246a.
>
> Added:
>
>
> Modified:
>     clang/lib/Basic/Targets/AArch64.cpp
>     clang/test/Preprocessor/aarch64-target-features.c
>
> Removed:
>
>
>
> ################################################################################
> diff  --git a/clang/lib/Basic/Targets/AArch64.cpp b/clang/lib/Basic/Targets/AArch64.cpp
> index 1abe646f88bfd..c5fce62bc501f 100644
> --- a/clang/lib/Basic/Targets/AArch64.cpp
> +++ b/clang/lib/Basic/Targets/AArch64.cpp
> @@ -199,7 +199,6 @@ void AArch64TargetInfo::getTargetDefinesARMV83A(const LangOptions &Opts,
>                                                  MacroBuilder &Builder) const {
>    Builder.defineMacro("__ARM_FEATURE_COMPLEX", "1");
>    Builder.defineMacro("__ARM_FEATURE_JCVT", "1");
> -  Builder.defineMacro("__ARM_FEATURE_PAUTH", "1");
>    // Also include the Armv8.2 defines
>    getTargetDefinesARMV82A(Opts, Builder);
>  }
> @@ -213,7 +212,6 @@ void AArch64TargetInfo::getTargetDefinesARMV84A(const LangOptions &Opts,
>  void AArch64TargetInfo::getTargetDefinesARMV85A(const LangOptions &Opts,
>                                                  MacroBuilder &Builder) const {
>    Builder.defineMacro("__ARM_FEATURE_FRINT", "1");
> -  Builder.defineMacro("__ARM_FEATURE_BTI", "1");
>    // Also include the Armv8.4 defines
>    getTargetDefinesARMV84A(Opts, Builder);
>  }
> @@ -387,9 +385,6 @@ void AArch64TargetInfo::getTargetDefines(const LangOptions &Opts,
>      Builder.defineMacro("__ARM_FEATURE_SM4", "1");
>    }
>
> -  if (HasPAuth)
> -    Builder.defineMacro("__ARM_FEATURE_PAUTH", "1");
> -
>    if (HasUnaligned)
>      Builder.defineMacro("__ARM_FEATURE_UNALIGNED", "1");
>
>
> diff  --git a/clang/test/Preprocessor/aarch64-target-features.c b/clang/test/Preprocessor/aarch64-target-features.c
> index 53b6644ef12e6..40ea003a85848 100644
> --- a/clang/test/Preprocessor/aarch64-target-features.c
> +++ b/clang/test/Preprocessor/aarch64-target-features.c
> @@ -461,7 +461,6 @@
>  // ================== Check Pointer Authentication Extension (PAuth).
>  // RUN: %clang -target arm64-none-linux-gnu -march=armv8-a -x c -E -dM %s -o - | FileCheck -check-prefix=CHECK-PAUTH-OFF %s
>  // RUN: %clang -target arm64-none-linux-gnu -march=armv8.5-a -x c -E -dM %s -o - | FileCheck -check-prefix=CHECK-PAUTH-OFF %s
> -// RUN: %clang -target arm64-none-linux-gnu -march=armv8-a+pauth -mbranch-protection=none -x c -E -dM %s -o - | FileCheck -check-prefix=CHECK-PAUTH-ON %s
>  // RUN: %clang -target arm64-none-linux-gnu -march=armv8-a -mbranch-protection=none -x c -E -dM %s -o - | FileCheck -check-prefix=CHECK-PAUTH-OFF %s
>  // RUN: %clang -target arm64-none-linux-gnu -march=armv8-a -mbranch-protection=bti -x c -E -dM %s -o - | FileCheck -check-prefix=CHECK-PAUTH-OFF %s
>  // RUN: %clang -target arm64-none-linux-gnu -march=armv8-a -mbranch-protection=standard -x c -E -dM %s -o - | FileCheck -check-prefix=CHECK-PAUTH %s
> @@ -474,7 +473,6 @@
>  // CHECK-PAUTH-BKEY:     #define __ARM_FEATURE_PAC_DEFAULT 2
>  // CHECK-PAUTH-ALL:      #define __ARM_FEATURE_PAC_DEFAULT 5
>  // CHECK-PAUTH-BKEY-ALL: #define __ARM_FEATURE_PAC_DEFAULT 6
> -// CHECK-PAUTH-ON:       #define __ARM_FEATURE_PAUTH 1
>
>  // ================== Check Branch Target Identification (BTI).
>  // RUN: %clang -target arm64-none-linux-gnu -march=armv8-a -x c -E -dM %s -o - | FileCheck -check-prefix=CHECK-BTI-OFF %s
> @@ -562,12 +560,10 @@
>  // RUN: %clang -target aarch64-arm-none-eabi -march=armv9.2-a -x c -E -dM %s -o - | FileCheck --check-prefixes=CHECK-V81-OR-LATER,CHECK-V83-OR-LATER,CHECK-V85-OR-LATER %s
>  // RUN: %clang -target aarch64-arm-none-eabi -march=armv9.3-a -x c -E -dM %s -o - | FileCheck --check-prefixes=CHECK-V81-OR-LATER,CHECK-V83-OR-LATER,CHECK-V85-OR-LATER %s
>  // CHECK-V81-OR-LATER: __ARM_FEATURE_ATOMICS 1
> -// CHECK-V85-OR-LATER: __ARM_FEATURE_BTI 1
>  // CHECK-V83-OR-LATER: __ARM_FEATURE_COMPLEX 1
>  // CHECK-V81-OR-LATER: __ARM_FEATURE_CRC32 1
>  // CHECK-V85-OR-LATER: __ARM_FEATURE_FRINT 1
>  // CHECK-V83-OR-LATER: __ARM_FEATURE_JCVT 1
> -// CHECK-V83-OR-LATER: __ARM_FEATURE_PAUTH 1
>  // CHECK-V81-OR-LATER: __ARM_FEATURE_QRDMX 1
>  // CHECK-BEFORE-V83-NOT: __ARM_FEATURE_COMPLEX 1
>  // CHECK-BEFORE-V83-NOT: __ARM_FEATURE_JCVT 1
>
>
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at lists.llvm.org
> https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits