Tweak x86 -mcpu defaults.

 - Default to yonah on Darwin (to get SSE3).

 - Default to Pentium4 (32-bit) and x86-64 (64-bit) on
   non-Darwin. Welcome to the 21st century.

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

diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp
index bb568b149b46711a827b6d3a0254aaebda686e25..d9ae003689ad131484195d143ecfdcad295e0fea 100644 (file)
--- a/lib/Basic/Targets.cpp
+++ b/lib/Basic/Targets.cpp
@@ -565,6 +565,9 @@ void X86TargetInfo::getDefaultFeatures(const std::string &CPU,
   if (CPU == "core2")
     Features["ssse3"] = Features["sse3"] = Features["sse2"] = Features["sse"] =
       Features["mmx"] = true;
+  else if (CPU == "yonah")
+    Features["sse3"] = Features["sse2"] = Features["sse"] = 
+      Features["mmx"] = true;
   else if (CPU == "pentium4")
     Features["sse2"] = Features["sse"] = Features["mmx"] = true;
 }

diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
index a52498dc9506579c12584decb297f8c032a44b58..ad4db49e9b3ca80fff35315e0b4c646b7228f986 100644 (file)
--- a/lib/Driver/Tools.cpp
+++ b/lib/Driver/Tools.cpp
@@ -340,6 +340,11 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
     if (memcmp(getToolChain().getOS().c_str(), "darwin", 6) == 0) {
       if (getToolChain().getArchName() == "x86_64")
         CmdArgs.push_back("--mcpu=core2");
+      else if (getToolChain().getArchName() == "i386")
+        CmdArgs.push_back("--mcpu=yonah");
+    } else {
+      if (getToolChain().getArchName() == "x86_64")
+        CmdArgs.push_back("--mcpu=x86-64");
       else if (getToolChain().getArchName() == "i386")
         CmdArgs.push_back("--mcpu=pentium4");
     }

diff --git a/test/Driver/clang-translation.c b/test/Driver/clang-translation.c
index 6d523954c7fabb84792f8dc9fd96258b6d626cd6..ca60a8d8c6bc990909939a6c04e3d4ad5e946b68 100644 (file)
--- a/test/Driver/clang-translation.c
+++ b/test/Driver/clang-translation.c
@@ -10,7 +10,7 @@
 // RUN: grep '"-o" .*clang-translation\.c\.out\.tmp\.s' %t.log &&
 // RUN: grep '"--asm-verbose"' %t.log &&
 // RUN: clang -ccc-host-triple i386-apple-darwin9 -### -S %s -o %t.s 2> %t.log
-// RUN: grep '"--mcpu=pentium4"' %t.log &&
+// RUN: grep '"--mcpu=yonah"' %t.log &&
 // RUN: clang -ccc-host-triple x86_64-apple-darwin9 -### -S %s -o %t.s 2> %t.log
 // RUN: grep '"--mcpu=core2"' %t.log &&
 // RUN: true