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

[Bill Wendling]

Author: void
Date: Tue May 18 17:01:38 2010
New Revision: 104072

URL: http://llvm.org/viewvc/llvm-project?rev=104072&view=rev
Log:
$ svn merge -c 104067 https://llvm.org/svn/llvm-project/llvm-gcc-4.2/trunk
--- Merging r104067 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=104072&r1=104071&r2=104072&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 Tue May 18 17:01:38 2010
@@ -2081,6 +2081,7 @@
   if (flag_omit_frame_pointer)
     target_flags &= ~MASK_OMIT_LEAF_FRAME_POINTER;
   else if (TARGET_OMIT_LEAF_FRAME_POINTER)
+    /* LLVM LOCAL - Use '3' to indicate omitting leaf FPs only  */
     flag_omit_frame_pointer = 3;
 
   /* If we're doing fast math, we don't care about comparison order

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=104072&r1=104071&r2=104072&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 Tue May 18 17:01:38 2010
@@ -3953,6 +3953,8 @@
       argvec.push_back("--code-model=default");         \
       break;                                            \
     }                                                   \
+    /* A value of 3 in flag_omit_frame_pointer implies  \
+       omitting leaf frame pointers only.  */           \
     if (flag_omit_frame_pointer == 3)                   \
       argvec.push_back("--disable-non-leaf-fp-elim");   \
   } while (0)