[llvm-commits] [llvm-gcc-4.2] r145754 - /llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp

[Nick Lewycky]

Author: nicholas
Date: Fri Dec  2 22:32:03 2011
New Revision: 145754

URL: http://llvm.org/viewvc/llvm-project?rev=145754&view=rev
Log:
Further attempts to fix llvm-gcc build.

Modified:
    llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp

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=145754&r1=145753&r2=145754&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp Fri Dec  2 22:32:03 2011
@@ -449,16 +449,6 @@
   
   if (time_report)
     Args.push_back("--time-passes");
-  if (fast_math_flags_set_p())
-    Args.push_back("--enable-unsafe-fp-math");
-  if (!flag_honor_infinites)
-    Args.push_back("--enable-no-infs-fp-math");
-  if (!flag_honor_nans)
-    Args.push_back("--enable-no-nans-fp-math");
-  if (!flag_omit_frame_pointer)
-    Args.push_back("--disable-fp-elim");
-  if (!flag_zero_initialized_in_bss)
-    Args.push_back("--nozero-initialized-in-bss");
   if (flag_verbose_asm)
     Args.push_back("--asm-verbose");
   if (flag_debug_pass_structure)
@@ -571,6 +561,11 @@
   FeatureStr = Features.getString();
 
   TargetOptions Options;
+  Options.UnsafeFPMath = fast_math_flags_set_p();
+  Options.NoInfsFPMath = !flag_honor_infinites;
+  Options.NoNaNsFPMath = !flag_honor_nans;
+  Options.NoFramePointerElim = !flag_omit_frame_pointer;
+  Options.NoZerosInBss = !flag_zero_initialized_in_bss;
   TheTarget = TME->createTargetMachine(TargetTriple, CPU, FeatureStr, Options,
                                        RelocModel, CMModel, OptLevel);
   TheTarget->setMCUseLoc(false);