Index: llvm/tools/clang/lib/Driver/Tools.cpp
===================================================================
--- llvm.orig/tools/clang/lib/Driver/Tools.cpp
+++ llvm/tools/clang/lib/Driver/Tools.cpp
@@ -1178,8 +1178,8 @@ void Clang::AddX86TargetArgs(const ArgLi
         CPUName = "x86-64";
       else if (getToolChain().getArch() == llvm::Triple::x86)
         // All x86 devices running Android have core2 as their common
-        // denominator. This makes a better choice than pentium4.
-        CPUName = isAndroid ? "core2" : "pentium4";
+        // denominator. This makes a better choice than i586.
+        CPUName = isAndroid ? "core2" : "i586";
     }
   }