[cfe-commits] r71129 - in /cfe/branches/Apple/Dib: lib/Basic/Targets.cpp lib/Driver/Tools.cpp test/Driver/clang-translation.c

[Mike Stump]

Author: mrs
Date: Wed May  6 18:55:01 2009
New Revision: 71129

URL: http://llvm.org/viewvc/llvm-project?rev=71129&view=rev
Log:
Merge in 71069:

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.

Modified:
    cfe/branches/Apple/Dib/lib/Basic/Targets.cpp
    cfe/branches/Apple/Dib/lib/Driver/Tools.cpp
    cfe/branches/Apple/Dib/test/Driver/clang-translation.c

Modified: cfe/branches/Apple/Dib/lib/Basic/Targets.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/Dib/lib/Basic/Targets.cpp?rev=71129&r1=71128&r2=71129&view=diff

==============================================================================
--- cfe/branches/Apple/Dib/lib/Basic/Targets.cpp (original)
+++ cfe/branches/Apple/Dib/lib/Basic/Targets.cpp Wed May  6 18:55:01 2009
@@ -565,6 +565,9 @@
   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;
 }

Modified: cfe/branches/Apple/Dib/lib/Driver/Tools.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/Dib/lib/Driver/Tools.cpp?rev=71129&r1=71128&r2=71129&view=diff

==============================================================================
--- cfe/branches/Apple/Dib/lib/Driver/Tools.cpp (original)
+++ cfe/branches/Apple/Dib/lib/Driver/Tools.cpp Wed May  6 18:55:01 2009
@@ -341,6 +341,11 @@
       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");
     }
   }

Modified: cfe/branches/Apple/Dib/test/Driver/clang-translation.c
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/Dib/test/Driver/clang-translation.c?rev=71129&r1=71128&r2=71129&view=diff

==============================================================================
--- cfe/branches/Apple/Dib/test/Driver/clang-translation.c (original)
+++ cfe/branches/Apple/Dib/test/Driver/clang-translation.c Wed May  6 18:55:01 2009
@@ -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