From a8c168db7f3b1e6034d558e9b31a7530f01499fc Mon Sep 17 00:00:00 2001 From: Tim Northover Date: Fri, 29 May 2015 21:28:25 +0000 Subject: [PATCH] ARM: fix ACLE predefine for iOS's "-arch armv7s". We were getting "#define __ARM_ARCH_7 -S__ 1" which is really not a good idea. llvm-svn: 238614 --- clang/lib/Basic/Targets.cpp | 1 + clang/test/Preprocessor/arm-target-features.c | 1 + 2 files changed, 2 insertions(+) diff --git a/clang/lib/Basic/Targets.cpp b/clang/lib/Basic/Targets.cpp index 03cc914..0eb5cee 100644 --- a/clang/lib/Basic/Targets.cpp +++ b/clang/lib/Basic/Targets.cpp @@ -4322,6 +4322,7 @@ public: return "6M"; case llvm::ARM::AK_ARMV7: case llvm::ARM::AK_ARMV7A: + case llvm::ARM::AK_ARMV7S: return "7A"; case llvm::ARM::AK_ARMV7R: return "7R"; diff --git a/clang/test/Preprocessor/arm-target-features.c b/clang/test/Preprocessor/arm-target-features.c index 0dace43..2b0ebb9 100644 --- a/clang/test/Preprocessor/arm-target-features.c +++ b/clang/test/Preprocessor/arm-target-features.c @@ -7,6 +7,7 @@ // 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 -- 2.7.4