[llvm-commits] [llvm-gcc-4.2] r145784 - in /llvm-gcc-4.2/trunk/gcc: config/arm/arm.h config/i386/i386.h config/rs6000/rs6000.h llvm-backend.cpp

[Nick Lewycky]

Author: nicholas
Date: Sat Dec  3 19:46:35 2011
New Revision: 145784

URL: http://llvm.org/viewvc/llvm-project?rev=145784&view=rev
Log:
Try to fix llvm-gcc build again. Rename my new macro to something that doesn't
exist with a macro that ... once existed but is still called when defined?

Modified:
    llvm-gcc-4.2/trunk/gcc/config/arm/arm.h
    llvm-gcc-4.2/trunk/gcc/config/i386/i386.h
    llvm-gcc-4.2/trunk/gcc/config/rs6000/rs6000.h
    llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp

Modified: llvm-gcc-4.2/trunk/gcc/config/arm/arm.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/arm/arm.h?rev=145784&r1=145783&r2=145784&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/arm/arm.h (original)
+++ llvm-gcc-4.2/trunk/gcc/config/arm/arm.h Sat Dec  3 19:46:35 2011
@@ -3574,7 +3574,7 @@
     argvec.push_back("-arm-strict-align");             \
   }
 
-#define LLVM_SET_TARGET_OPTIONS(options)               \
+#define LLVM_SET_TARGET_MACHINE_OPTIONS(options)       \
   options.GenerateSoftFloatCalls = TARGET_SOFT_FLOAT;  \
   if (TARGET_HARD_FLOAT_ABI)                           \
     options.FloatABIForCalls = llvm::FloatABI::Hard;

Modified: llvm-gcc-4.2/trunk/gcc/config/i386/i386.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/i386/i386.h?rev=145784&r1=145783&r2=145784&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/i386/i386.h (original)
+++ llvm-gcc-4.2/trunk/gcc/config/i386/i386.h Sat Dec  3 19:46:35 2011
@@ -3966,7 +3966,7 @@
       argvec.push_back("-force-align-stack");           \
   } while (0)
 
-#define LLVM_SET_TARGET_OPTIONS(options)                \
+#define LLVM_SET_TARGET_MACHINE_OPTIONS(options)        \
   do {                                                  \
     /* A value of 3 in flag_omit_frame_pointer implies  \
        omitting leaf frame pointers only.  */           \

Modified: llvm-gcc-4.2/trunk/gcc/config/rs6000/rs6000.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/rs6000/rs6000.h?rev=145784&r1=145783&r2=145784&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/rs6000/rs6000.h (original)
+++ llvm-gcc-4.2/trunk/gcc/config/rs6000/rs6000.h Sat Dec  3 19:46:35 2011
@@ -3470,7 +3470,7 @@
 
 #define LLVM_SET_MACHINE_OPTIONS(argvec)
 
-#define LLVM_SET_TARGET_OPTIONS(options)               \
+#define LLVM_SET_TARGET_MACHINE_OPTIONS(options)       \
   options.GenerateSoftFloatCalls = TARGET_SOFT_FLOAT;
 
 /* When -m64 is specified, set the architecture to powerpc64-os-blah even if the

Modified: llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp?rev=145784&r1=145783&r2=145784&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp Sat Dec  3 19:46:35 2011
@@ -561,7 +561,7 @@
   FeatureStr = Features.getString();
 
   TargetOptions Options;
-  LLVM_SET_TARGET_OPTIONS(Options);
+  LLVM_SET_TARGET_MACHINE_OPTIONS(Options);
   Options.UnsafeFPMath = fast_math_flags_set_p();
   Options.NoInfsFPMath = !flag_honor_infinites;
   Options.NoNaNsFPMath = !flag_honor_nans;