[llvm-branch-commits] [llvm-gcc-branch] r103991 - in /llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/i386: i386.c i386.h

[Bill Wendling]

Author: void
Date: Mon May 17 18:10:48 2010
New Revision: 103991

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


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

Modified: llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/i386/i386.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/i386/i386.c?rev=103991&r1=103990&r2=103991&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/i386/i386.c (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/i386/i386.c Mon May 17 18:10:48 2010
@@ -2081,7 +2081,7 @@
   if (flag_omit_frame_pointer)
     target_flags &= ~MASK_OMIT_LEAF_FRAME_POINTER;
   else if (TARGET_OMIT_LEAF_FRAME_POINTER)
-    flag_omit_frame_pointer = 1;
+    flag_omit_frame_pointer = 3;
 
   /* If we're doing fast math, we don't care about comparison order
      wrt NaNs.  This lets us use a shorter comparison sequence.  */

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=103991&r1=103990&r2=103991&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 Mon May 17 18:10:48 2010
@@ -3953,7 +3953,7 @@
       argvec.push_back("--code-model=default");         \
       break;                                            \
     }                                                   \
-    if (TARGET_OMIT_LEAF_FRAME_POINTER)                 \
+    if (flag_omit_frame_pointer == 3)                   \
       argvec.push_back("--disable-non-leaf-fp-elim");   \
   } while (0)
 #endif /* ENABLE_LLVM */