[llvm-branch-commits] [llvm-gcc-branch] r103316 - /llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/i386/i386.h

[Bill Wendling]

Author: void
Date: Fri May  7 17:52:03 2010
New Revision: 103316

URL: http://llvm.org/viewvc/llvm-project?rev=103316&view=rev
Log:
$ svn merge -c 103313 https://llvm.org/svn/llvm-project/llvm-gcc-4.2/trunk
--- Merging r103313 into '.':
U    gcc/config/i386/i386.h


Modified:
    llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/i386/i386.h

Modified: llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/i386/i386.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/i386/i386.h?rev=103316&r1=103315&r2=103316&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/i386/i386.h (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/i386/i386.h Fri May  7 17:52:03 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 */