diff -Nru llvm-3.4.orig/tools/clang/lib/Driver/Tools.cpp llvm-3.4/tools/clang/lib/Driver/Tools.cpp
--- llvm-3.4.orig/clang-3.4/lib/Driver/Tools.cpp	2013-12-09 03:59:27.000000000 +0100
+++ llvm-3.4/clang-3.4/lib/Driver/Tools.cpp	2014-02-17 10:53:55.496716319 +0100
@@ -1309,7 +1309,7 @@
   }
 
   // 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";
 
@@ -1327,8 +1327,8 @@
   case llvm::Triple::Bitrig:
     return "i686";
   default:
-    // Fallback to p4.
-    return "pentium4";
+    // Fallback to i586.
+    return "i586";
   }
 }