Fix a think-o on my part that got enshrined in a FIXME by setting up the

__tune_...__ define as well.

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

diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp
index f2404d29b1ef1f86916456dcaba0f0f782fe08d9..244205400c6a0ccb75a8eb9a06cab0401c9871ca 100644 (file)
--- a/lib/Basic/Targets.cpp
+++ b/lib/Basic/Targets.cpp
@@ -1799,8 +1799,10 @@ void X86TargetInfo::getTargetDefines(const LangOptions &Opts,
     Builder.defineMacro("__athlon");
     Builder.defineMacro("__athlon__");
     Builder.defineMacro("__tune_athlon__");
-    if (SSELevel != NoSSE)
+    if (SSELevel != NoSSE) {
       Builder.defineMacro("__athlon_sse__");
+      Builder.defineMacro("__tune_athlon_sse__");
+    }
     break;
   case CK_K8:
   case CK_K8SSE3:

diff --git a/test/Preprocessor/predefined-arch-macros.c b/test/Preprocessor/predefined-arch-macros.c
index c59a08104ff82a34fbcb66e493256fb05f8fd896..2e776822f6d956b6a393d88af80649bc6ae8ec7d 100644 (file)
--- a/test/Preprocessor/predefined-arch-macros.c
+++ b/test/Preprocessor/predefined-arch-macros.c
@@ -441,8 +441,7 @@
 // CHECK_ATHLON_4_M32: #define __i386 1
 // CHECK_ATHLON_4_M32: #define __i386__ 1
 // CHECK_ATHLON_4_M32: #define __tune_athlon__ 1
-// FIXME: This should be defined!
-// CHECK_ATHLON_4_M32-NOT: #define __tune_athlon_sse__ 1
+// CHECK_ATHLON_4_M32: #define __tune_athlon_sse__ 1
 // CHECK_ATHLON_4_M32: #define i386 1
 // RUN: %clang -march=athlon-4 -m64 -E -dM %s -o - 2>&1 \
 // RUN:   | FileCheck %s -check-prefix=CHECK_ATHLON_4_M64
@@ -456,8 +455,7 @@
 // CHECK_ATHLON_XP_M32: #define __i386 1
 // CHECK_ATHLON_XP_M32: #define __i386__ 1
 // CHECK_ATHLON_XP_M32: #define __tune_athlon__ 1
-// FIXME: This should be defined!
-// CHECK_ATHLON_XP_M32-NOT: #define __tune_athlon_sse__ 1
+// CHECK_ATHLON_XP_M32: #define __tune_athlon_sse__ 1
 // CHECK_ATHLON_XP_M32: #define i386 1
 // RUN: %clang -march=athlon-xp -m64 -E -dM %s -o - 2>&1 \
 // RUN:   | FileCheck %s -check-prefix=CHECK_ATHLON_XP_M64
@@ -471,8 +469,7 @@
 // CHECK_ATHLON_MP_M32: #define __i386 1
 // CHECK_ATHLON_MP_M32: #define __i386__ 1
 // CHECK_ATHLON_MP_M32: #define __tune_athlon__ 1
-// FIXME: This should be defined!
-// CHECK_ATHLON_MP_M32-NOT: #define __tune_athlon_sse__ 1
+// CHECK_ATHLON_MP_M32: #define __tune_athlon_sse__ 1
 // CHECK_ATHLON_MP_M32: #define i386 1
 // RUN: %clang -march=athlon-mp -m64 -E -dM %s -o - 2>&1 \
 // RUN:   | FileCheck %s -check-prefix=CHECK_ATHLON_MP_M64