--- Merging (from foreign repository) r66721 into '.':
U    gcc/config/i386/i386.h

Change -soft-float to -no-implicit-float on x86 to be more in line with what GCC
means by -msoft-float.

llvm-svn: 66722
diff --git a/llvm-gcc-4.2/gcc/config/i386/i386.h b/llvm-gcc-4.2/gcc/config/i386/i386.h
index f405c47..c09c740 100644
--- a/llvm-gcc-4.2/gcc/config/i386/i386.h
+++ b/llvm-gcc-4.2/gcc/config/i386/i386.h
@@ -3895,7 +3895,7 @@
 
 #define LLVM_SET_MACHINE_OPTIONS(argvec)                      \
   if (!TARGET_80387)                                          \
-    argvec.push_back("-soft-float");
+    argvec.push_back("-no-implicit-float")
     
 /* LLVM ABI definition macros. */