diff options
| -rw-r--r-- | clang/lib/Basic/Targets/X86.cpp | 2 | ||||
| -rw-r--r-- | clang/test/Preprocessor/predefined-arch-macros.c | 18 |
2 files changed, 13 insertions, 7 deletions
diff --git a/clang/lib/Basic/Targets/X86.cpp b/clang/lib/Basic/Targets/X86.cpp index 93dcd4e234c..ee70c14e1d2 100644 --- a/clang/lib/Basic/Targets/X86.cpp +++ b/clang/lib/Basic/Targets/X86.cpp @@ -852,6 +852,8 @@ void X86TargetInfo::getTargetDefines(const LangOptions &Opts, case CK_KNM: break; case CK_Lakemont: + defineCPUMacros(Builder, "i586", /*Tuning*/false); + defineCPUMacros(Builder, "pentium", /*Tuning*/false); Builder.defineMacro("__tune_lakemont__"); break; case CK_K6_2: diff --git a/clang/test/Preprocessor/predefined-arch-macros.c b/clang/test/Preprocessor/predefined-arch-macros.c index 2f3d9e30475..d7c10cec58c 100644 --- a/clang/test/Preprocessor/predefined-arch-macros.c +++ b/clang/test/Preprocessor/predefined-arch-macros.c @@ -1158,15 +1158,19 @@ // // RUN: %clang -march=lakemont -m32 -E -dM %s -o - 2>&1 \ // RUN: -target i386-unknown-linux \ -// RUN: | FileCheck %s -check-prefix=CHECK_LMT_M32 -// CHECK_LMT_M32: #define __i386 1 -// CHECK_LMT_M32: #define __i386__ 1 -// CHECK_LMT_M32: #define __tune_lakemont__ 1 -// CHECK_LMT_M32: #define i386 1 +// RUN: | FileCheck %s -check-prefix=CHECK_LAKEMONT_M32 +// CHECK_LAKEMONT_M32: #define __i386 1 +// CHECK_LAKEMONT_M32: #define __i386__ 1 +// CHECK_LAKEMONT_M32: #define __i586 1 +// CHECK_LAKEMONT_M32: #define __i586__ 1 +// CHECK_LAKEMONT_M32: #define __pentium 1 +// CHECK_LAKEMONT_M32: #define __pentium__ 1 +// CHECK_LAKEMONT_M32: #define __tune_lakemont__ 1 +// CHECK_LAKEMONT_M32: #define i386 1 // RUN: not %clang -march=lakemont -m64 -E -dM %s -o - 2>&1 \ // RUN: -target i386-unknown-linux \ -// RUN: | FileCheck %s -check-prefix=CHECK_LMT_M64 -// CHECK_LMT_M64: error: +// RUN: | FileCheck %s -check-prefix=CHECK_LAKEMONT_M64 +// CHECK_LAKEMONT_M64: error: // // RUN: %clang -march=geode -m32 -E -dM %s -o - 2>&1 \ // RUN: -target i386-unknown-linux \ |
