[llvm-commits] [llvm-gcc-4.2] r64816 - in /llvm-gcc-4.2/branches/Apple/Dib/gcc: config/arm/arm.h config/i386/i386.h config/rs6000/rs6000.h llvm-backend.cpp

[Bill Wendling]

Author: void
Date: Tue Feb 17 15:24:55 2009
New Revision: 64816

URL: http://llvm.org/viewvc/llvm-project?rev=64816&view=rev
Log:
--- Merging (from foreign repository) r64506 into '.':
U    gcc/config/i386/i386.h
U    gcc/config/rs6000/rs6000.h
U    gcc/config/arm/arm.h

Translate -msoft-float to -soft-float.

--- Merging (from foreign repository) r64792 into '.':
U    gcc/llvm-backend.cpp

Forgot to check this in last time. This makes sure machine specfic options are
passed to llvm backend.

Modified:
    llvm-gcc-4.2/branches/Apple/Dib/gcc/config/arm/arm.h
    llvm-gcc-4.2/branches/Apple/Dib/gcc/config/i386/i386.h
    llvm-gcc-4.2/branches/Apple/Dib/gcc/config/rs6000/rs6000.h
    llvm-gcc-4.2/branches/Apple/Dib/gcc/llvm-backend.cpp

Modified: llvm-gcc-4.2/branches/Apple/Dib/gcc/config/arm/arm.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Dib/gcc/config/arm/arm.h?rev=64816&r1=64815&r2=64816&view=diff

==============================================================================
--- llvm-gcc-4.2/branches/Apple/Dib/gcc/config/arm/arm.h (original)
+++ llvm-gcc-4.2/branches/Apple/Dib/gcc/config/arm/arm.h Tue Feb 17 15:24:55 2009
@@ -2922,6 +2922,10 @@
 #define LLVM_OVERRIDE_TARGET_ARCH() \
   (TARGET_THUMB ? "thumb" : "")
 
+#define LLVM_SET_MACHINE_OPTIONS(argvec)               \
+  if (TARGET_SOFT_FLAT)                                \
+    argvec.push_back("-soft-float");
+
 /* Doing struct copy by partial-word loads and stores is not a good idea on ARM. */
 #define TARGET_LLVM_MIN_BYTES_COPY_BY_MEMCPY 4
 

Modified: llvm-gcc-4.2/branches/Apple/Dib/gcc/config/i386/i386.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Dib/gcc/config/i386/i386.h?rev=64816&r1=64815&r2=64816&view=diff

==============================================================================
--- llvm-gcc-4.2/branches/Apple/Dib/gcc/config/i386/i386.h (original)
+++ llvm-gcc-4.2/branches/Apple/Dib/gcc/config/i386/i386.h Tue Feb 17 15:24:55 2009
@@ -3892,6 +3892,10 @@
     if (TARGET_3DNOW)   F.AddFeature("3dnow");                \
     if (TARGET_3DNOW_A) F.AddFeature("3dnowa");               \
   }
+
+#define LLVM_SET_MACHINE_OPTIONS(argvec)                      \
+  if (!TARGET_80387)                                          \
+    argvec.push_back("-soft-float");
     
 /* LLVM ABI definition macros. */
 

Modified: llvm-gcc-4.2/branches/Apple/Dib/gcc/config/rs6000/rs6000.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Dib/gcc/config/rs6000/rs6000.h?rev=64816&r1=64815&r2=64816&view=diff

==============================================================================
--- llvm-gcc-4.2/branches/Apple/Dib/gcc/config/rs6000/rs6000.h (original)
+++ llvm-gcc-4.2/branches/Apple/Dib/gcc/config/rs6000/rs6000.h Tue Feb 17 15:24:55 2009
@@ -3464,6 +3464,10 @@
     F.AddFeature("64bit", TARGET_POWERPC64); \
   }
 
+#define LLVM_SET_MACHINE_OPTIONS(argvec)               \
+  if (TARGET_SOFT_FLAT)                                \
+    argvec.push_back("-soft-float");
+
 /* When -m64 is specified, set the architecture to powerpc64-os-blah even if the
  * compiler was configured for powerpc-os-blah.
  */

Modified: llvm-gcc-4.2/branches/Apple/Dib/gcc/llvm-backend.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Dib/gcc/llvm-backend.cpp?rev=64816&r1=64815&r2=64816&view=diff

==============================================================================
--- llvm-gcc-4.2/branches/Apple/Dib/gcc/llvm-backend.cpp (original)
+++ llvm-gcc-4.2/branches/Apple/Dib/gcc/llvm-backend.cpp Tue Feb 17 15:24:55 2009
@@ -137,6 +137,9 @@
 #ifdef LLVM_SET_TARGET_OPTIONS
   LLVM_SET_TARGET_OPTIONS(Args);
 #endif
+#ifdef LLVM_SET_MACHINE_OPTIONS
+  LLVM_SET_MACHINE_OPTIONS(Args);
+#endif
   
   if (time_report)
     Args.push_back("--time-passes");