diff options
| -rw-r--r-- | clang/lib/Basic/Targets/X86.cpp | 7 | ||||
| -rw-r--r-- | clang/test/Preprocessor/predefined-arch-macros.c | 18 |
2 files changed, 14 insertions, 11 deletions
diff --git a/clang/lib/Basic/Targets/X86.cpp b/clang/lib/Basic/Targets/X86.cpp index f91d712ce8f..6cb493f9e3f 100644 --- a/clang/lib/Basic/Targets/X86.cpp +++ b/clang/lib/Basic/Targets/X86.cpp @@ -836,16 +836,13 @@ void X86TargetInfo::getTargetDefines(const LangOptions &Opts, case CK_Haswell: case CK_Broadwell: case CK_SkylakeClient: + case CK_SkylakeServer: + case CK_Cannonlake: // FIXME: Historically, we defined this legacy name, it would be nice to // remove it at some point. We've never exposed fine-grained names for // recent primary x86 CPUs, and we should keep it that way. defineCPUMacros(Builder, "corei7"); break; - case CK_SkylakeServer: - defineCPUMacros(Builder, "skx"); - break; - case CK_Cannonlake: - break; case CK_KNL: defineCPUMacros(Builder, "knl"); break; diff --git a/clang/test/Preprocessor/predefined-arch-macros.c b/clang/test/Preprocessor/predefined-arch-macros.c index d7c10cec58c..6377b48c072 100644 --- a/clang/test/Preprocessor/predefined-arch-macros.c +++ b/clang/test/Preprocessor/predefined-arch-macros.c @@ -892,11 +892,11 @@ // CHECK_SKX_M32: #define __XSAVEOPT__ 1 // CHECK_SKX_M32: #define __XSAVES__ 1 // CHECK_SKX_M32: #define __XSAVE__ 1 +// CHECK_SKX_M32: #define __corei7 1 +// CHECK_SKX_M32: #define __corei7__ 1 // CHECK_SKX_M32: #define __i386 1 // CHECK_SKX_M32: #define __i386__ 1 -// CHECK_SKX_M32: #define __skx 1 -// CHECK_SKX_M32: #define __skx__ 1 -// CHECK_SKX_M32: #define __tune_skx__ 1 +// CHECK_SKX_M32: #define __tune_corei7__ 1 // CHECK_SKX_M32: #define i386 1 // RUN: %clang -march=skylake-avx512 -m64 -E -dM %s -o - 2>&1 \ @@ -938,9 +938,9 @@ // CHECK_SKX_M64: #define __XSAVE__ 1 // CHECK_SKX_M64: #define __amd64 1 // CHECK_SKX_M64: #define __amd64__ 1 -// CHECK_SKX_M64: #define __skx 1 -// CHECK_SKX_M64: #define __skx__ 1 -// CHECK_SKX_M64: #define __tune_skx__ 1 +// CHECK_SKX_M64: #define __corei7 1 +// CHECK_SKX_M64: #define __corei7__ 1 +// CHECK_SKX_M64: #define __tune_corei7__ 1 // CHECK_SKX_M64: #define __x86_64 1 // CHECK_SKX_M64: #define __x86_64__ 1 // @@ -981,8 +981,11 @@ // CHECK_CNL_M32: #define __XSAVEOPT__ 1 // CHECK_CNL_M32: #define __XSAVES__ 1 // CHECK_CNL_M32: #define __XSAVE__ 1 +// CHECK_CNL_M32: #define __corei7 1 +// CHECK_CNL_M32: #define __corei7__ 1 // CHECK_CNL_M32: #define __i386 1 // CHECK_CNL_M32: #define __i386__ 1 +// CHECK_CNL_M32: #define __tune_corei7__ 1 // CHECK_CNL_M32: #define i386 1 // // RUN: %clang -march=cannonlake -m64 -E -dM %s -o - 2>&1 \ @@ -1024,6 +1027,9 @@ // CHECK_CNL_M64: #define __XSAVE__ 1 // CHECK_CNL_M64: #define __amd64 1 // CHECK_CNL_M64: #define __amd64__ 1 +// CHECK_CNL_M64: #define __corei7 1 +// CHECK_CNL_M64: #define __corei7__ 1 +// CHECK_CNL_M64: #define __tune_corei7__ 1 // CHECK_CNL_M64: #define __x86_64 1 // CHECK_CNL_M64: #define __x86_64__ 1 |
