diff options
| author | Tim Northover <tnorthover@apple.com> | 2015-07-21 21:47:33 +0000 |
|---|---|---|
| committer | Tim Northover <tnorthover@apple.com> | 2015-07-21 21:47:33 +0000 |
| commit | 525c73ceb70fc5c86cbfc246022402fa3d8a8f17 (patch) | |
| tree | 3ed79cc09ac9e7395d3a44ac2c36a13f326b4589 /clang | |
| parent | e8640518a983eccbe7990885acf53bd6976c5067 (diff) | |
| download | bcm5719-llvm-525c73ceb70fc5c86cbfc246022402fa3d8a8f17.tar.gz bcm5719-llvm-525c73ceb70fc5c86cbfc246022402fa3d8a8f17.zip | |
ARM: actually define __ARM_ARCH_7S__ for the armv7s slice
We ended up with the wrong predefine after the recent TargetParser shuffle, and
I accidentally solidified it with a test. This should fix it.
llvm-svn: 242841
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/Basic/Targets.cpp | 3 | ||||
| -rw-r--r-- | clang/test/Preprocessor/arm-target-features.c | 9 |
2 files changed, 10 insertions, 2 deletions
diff --git a/clang/lib/Basic/Targets.cpp b/clang/lib/Basic/Targets.cpp index c4ca091604c..b7ac9f8bf2c 100644 --- a/clang/lib/Basic/Targets.cpp +++ b/clang/lib/Basic/Targets.cpp @@ -4293,9 +4293,10 @@ class ARMTargetInfo : public TargetInfo { case llvm::ARM::AK_ARMV6SM: case llvm::ARM::AK_ARMV6HL: return "6M"; + case llvm::ARM::AK_ARMV7S: + return "7S"; case llvm::ARM::AK_ARMV7: case llvm::ARM::AK_ARMV7A: - case llvm::ARM::AK_ARMV7S: case llvm::ARM::AK_ARMV7L: case llvm::ARM::AK_ARMV7HL: return "7A"; diff --git a/clang/test/Preprocessor/arm-target-features.c b/clang/test/Preprocessor/arm-target-features.c index 389877125d1..c4b887f4552 100644 --- a/clang/test/Preprocessor/arm-target-features.c +++ b/clang/test/Preprocessor/arm-target-features.c @@ -7,7 +7,6 @@ // CHECK: __ARM_FEATURE_NUMERIC_MAXMIN 1 // RUN: %clang -target armv7a-none-linux-gnu -x c -E -dM %s -o - | FileCheck --check-prefix=CHECK-V7 %s -// RUN: %clang -target x86_64-apple-macosx10.10 -arch armv7s -x c -E -dM %s -o - | FileCheck --check-prefix=CHECK-V7 %s // CHECK-V7: __ARMEL__ 1 // CHECK-V7: __ARM_ARCH 7 // CHECK-V7: __ARM_ARCH_7A__ 1 @@ -15,6 +14,14 @@ // CHECK-V7-NOT: __ARM_FEATURE_NUMERIC_MAXMIN // CHECK-V7-NOT: __ARM_FEATURE_DIRECTED_ROUNDING +// RUN: %clang -target x86_64-apple-macosx10.10 -arch armv7s -x c -E -dM %s -o - | FileCheck --check-prefix=CHECK-V7S %s +// CHECK-V7S: __ARMEL__ 1 +// CHECK-V7S: __ARM_ARCH 7 +// CHECK-V7S: __ARM_ARCH_7S__ 1 +// CHECK-V7S-NOT: __ARM_FEATURE_CRC32 +// CHECK-V7S-NOT: __ARM_FEATURE_NUMERIC_MAXMIN +// CHECK-V7S-NOT: __ARM_FEATURE_DIRECTED_ROUNDING + // RUN: %clang -target armv8a -mfloat-abi=hard -x c -E -dM %s | FileCheck --check-prefix=CHECK-V8-BAREHF %s // CHECK-V8-BAREHF: __ARMEL__ 1 // CHECK-V8-BAREHF: __ARM_ARCH 8 |
