[llvm-branch-commits] [llvm-gcc-tag] r103319 - in /llvm-gcc-4.2/tags/Apple/llvmgcc42-2328.5: ./ gcc/config/i386/i386.h

[Bill Wendling]

Author: void
Date: Fri May  7 18:05:48 2010
New Revision: 103319

URL: http://llvm.org/viewvc/llvm-project?rev=103319&view=rev
Log:
Creating llvmgcc42-2328.5 from llvmgcc42-2328.4 + r103313.

Added:
    llvm-gcc-4.2/tags/Apple/llvmgcc42-2328.5/   (props changed)
      - copied from r103315, llvm-gcc-4.2/tags/Apple/llvmgcc42-2328.4/
Modified:
    llvm-gcc-4.2/tags/Apple/llvmgcc42-2328.5/gcc/config/i386/i386.h

Propchange: llvm-gcc-4.2/tags/Apple/llvmgcc42-2328.5/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May  7 18:05:48 2010
@@ -0,0 +1,2 @@
+/llvm/trunk:100565
+/llvm-gcc-4.2/trunk:98728,98841,98893,99196,99305,99592-99593,99629,99670,99982,99984-99986,99988,99992-99993,99995,99997-99999,100035,100149,100303,100565,100624-100626,100712,100721,101090-101091,101199,101216,101304,101333,101804,101959,102139,102148,102433,102444,102506-102507,102511,102532,102561,102636,102648,103313

Modified: llvm-gcc-4.2/tags/Apple/llvmgcc42-2328.5/gcc/config/i386/i386.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/tags/Apple/llvmgcc42-2328.5/gcc/config/i386/i386.h?rev=103319&r1=103315&r2=103319&view=diff
==============================================================================
--- llvm-gcc-4.2/tags/Apple/llvmgcc42-2328.5/gcc/config/i386/i386.h (original)
+++ llvm-gcc-4.2/tags/Apple/llvmgcc42-2328.5/gcc/config/i386/i386.h Fri May  7 18:05:48 2010
@@ -3931,6 +3931,12 @@
   ((REG_NAME) + (*(REG_NAME) == '%' ? 1 : 0))
 
 /* Propagate code model setting to backend */
+/*
+  FIXME: (See <rdar://problem/7946145>) This option was mis-compiling a library.
+
+    if (TARGET_OMIT_LEAF_FRAME_POINTER)
+      argvec.push_back("--disable-non-leaf-fp-elim");
+*/
 #define LLVM_SET_MACHINE_OPTIONS(argvec)	   \
   switch (ix86_cmodel) {			   \
   default:                                         \
@@ -3950,9 +3956,7 @@
   case CM_32:					   \
     argvec.push_back("--code-model=default");	   \
     break;					   \
-  }                                                \
-  if (TARGET_OMIT_LEAF_FRAME_POINTER)              \
-    argvec.push_back("--disable-non-leaf-fp-elim");
+  }
 
 #endif /* ENABLE_LLVM */
 /* LLVM LOCAL end */