Index: llvm/tools/clang/lib/Driver/Tools.cpp
===================================================================
--- llvm.orig/tools/clang/lib/Driver/Tools.cpp
+++ llvm/tools/clang/lib/Driver/Tools.cpp
@@ -1304,7 +1304,7 @@ static const char *getX86TargetCPU(const
   }
 
   // All x86 devices running Android have core2 as their common
-  // denominator. This makes a better choice than pentium4.
+  // denominator. This makes a better choice than i586.
   if (Triple.getEnvironment() == llvm::Triple::Android)
     return "core2";
 
@@ -1322,8 +1322,8 @@ static const char *getX86TargetCPU(const
   case llvm::Triple::Bitrig:
     return "i686";
   default:
-    // Fallback to p4.
-    return "pentium4";
+    // Fallback to i586.
+    return "i586";
   }
 }