Don't disable SSE4A when disabling AVX.

Thanks for Craig Topper for noticing it.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@188902 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp
index d5392fb2384e0abce45fb0d657bd50216ecd4c6b..e2898cc86b57471bced521c2777d3da2f78c5fbe 100644 (file)
--- a/lib/Basic/Targets.cpp
+++ b/lib/Basic/Targets.cpp
@@ -2120,7 +2120,7 @@ void X86TargetInfo::setSSELevel(llvm::StringMap<bool> &Features,
     Features["popcnt"] = Features["sse42"] = false;
   case AVX:
     Features["fma"] = Features["avx"] = false;
-    setXOPLevel(Features, SSE4A, false);
+    setXOPLevel(Features, FMA4, false);
   case AVX2:
     Features["avx2"] = false;
   case AVX512F:

diff --git a/test/Preprocessor/x86_target_features.c b/test/Preprocessor/x86_target_features.c
index 4cdd3425cc983aed25773b12a06182b1ea26125f..7d6a6d8a7c03e1aaae7d495a60012ef6d25487b5 100644 (file)
--- a/test/Preprocessor/x86_target_features.c
+++ b/test/Preprocessor/x86_target_features.c
@@ -42,3 +42,16 @@
 // AVX: #define __SSE_MATH__ 1
 // AVX: #define __SSE__ 1
 // AVX: #define __SSSE3__ 1
+
+
+// RUN: %clang -target i386-unknown-unknown -march=pentium-m -mxop -mno-avx -x c -E -dM -o - %s | FileCheck --check-prefix=SSE4A %s
+
+// SSE4A: #define __SSE2_MATH__ 1
+// SSE4A: #define __SSE2__ 1
+// SSE4A: #define __SSE3__ 1
+// SSE4A: #define __SSE4A__ 1
+// SSE4A: #define __SSE4_1__ 1
+// SSE4A: #define __SSE4_2__ 1
+// SSE4A: #define __SSE_MATH__ 1
+// SSE4A: #define __SSE__ 1
+// SSE4A: #define __SSSE3__ 1