summaryrefslogtreecommitdiffstats
path: root/clang/lib/Basic/Targets/X86.cpp
diff options
context:
space:
mode:
authorCraig Topper <craig.topper@intel.com>2017-10-26 23:06:19 +0000
committerCraig Topper <craig.topper@intel.com>2017-10-26 23:06:19 +0000
commita6021e3bc12947dabedbdddb0270cb1af66a29b5 (patch)
tree97741b4134084560c981efdff80f2c8ec67110b3 /clang/lib/Basic/Targets/X86.cpp
parentcddf3c5e1c4c99c56aebe56b3fe96d56fe2fe578 (diff)
downloadbcm5719-llvm-a6021e3bc12947dabedbdddb0270cb1af66a29b5.tar.gz
bcm5719-llvm-a6021e3bc12947dabedbdddb0270cb1af66a29b5.zip
[X86] Make -march=i686 an alias of -march=pentiumpro
I think the only reason they are different is because we don't set tune_i686 for -march=i686 to match GCC. But GCC 4.9.0 seems to have changed this behavior and they do set it now. So I think they can aliases now. Differential Revision: https://reviews.llvm.org/D39349 llvm-svn: 316712
Diffstat (limited to 'clang/lib/Basic/Targets/X86.cpp')
-rw-r--r--clang/lib/Basic/Targets/X86.cpp16
1 files changed, 3 insertions, 13 deletions
diff --git a/clang/lib/Basic/Targets/X86.cpp b/clang/lib/Basic/Targets/X86.cpp
index d2716ac6702..c1d0a845298 100644
--- a/clang/lib/Basic/Targets/X86.cpp
+++ b/clang/lib/Basic/Targets/X86.cpp
@@ -119,7 +119,6 @@ bool X86TargetInfo::initFeatureMap(
case CK_i486:
case CK_i586:
case CK_Pentium:
- case CK_i686:
case CK_PentiumPro:
case CK_Lakemont:
break;
@@ -806,15 +805,8 @@ void X86TargetInfo::getTargetDefines(const LangOptions &Opts,
Builder.defineMacro("__tune_pentium2__");
LLVM_FALLTHROUGH;
case CK_PentiumPro:
- Builder.defineMacro("__tune_i686__");
- Builder.defineMacro("__tune_pentiumpro__");
- LLVM_FALLTHROUGH;
- case CK_i686:
- Builder.defineMacro("__i686");
- Builder.defineMacro("__i686__");
- // Strangely, __tune_i686__ isn't defined by GCC when CPU == i686.
- Builder.defineMacro("__pentiumpro");
- Builder.defineMacro("__pentiumpro__");
+ defineCPUMacros(Builder, "i686");
+ defineCPUMacros(Builder, "pentiumpro");
break;
case CK_Pentium4:
defineCPUMacros(Builder, "pentium4");
@@ -1542,7 +1534,6 @@ bool X86TargetInfo::checkCPUKind(CPUKind Kind) const {
case CK_i586:
case CK_Pentium:
case CK_PentiumMMX:
- case CK_i686:
case CK_PentiumPro:
case CK_Pentium2:
case CK_Pentium3:
@@ -1606,8 +1597,7 @@ X86TargetInfo::CPUKind X86TargetInfo::getCPUKind(StringRef CPU) const {
.Case("i586", CK_i586)
.Case("pentium", CK_Pentium)
.Case("pentium-mmx", CK_PentiumMMX)
- .Case("i686", CK_i686)
- .Case("pentiumpro", CK_PentiumPro)
+ .Cases("i686", "pentiumpro", CK_PentiumPro)
.Case("pentium2", CK_Pentium2)
.Cases("pentium3", "pentium3m", CK_Pentium3)
.Case("pentium-m", CK_PentiumM)
OpenPOWER on IntegriCloud