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

[Eric Christopher]

Author: echristo
Date: Fri Jun 18 18:29:09 2010
New Revision: 106354

URL: http://llvm.org/viewvc/llvm-project?rev=106354&view=rev
Log:
Merge r106352 from mainline.

For rdar://7617381

Modified:
    llvm-gcc-4.2/branches/Apple/Morbo/   (props changed)
    llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/i386/i386.h

Propchange: llvm-gcc-4.2/branches/Apple/Morbo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 18 18:29:09 2010
@@ -1,2 +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,102589,102636,102648,102745,103361,103366-103367,103394,103414,103644,103800,103918,104181,104384,104420,104423,104726,105504,105828-105829,105902,105948-105949,106005,106243-106244,106270
+/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,102589,102636,102648,102745,103361,103366-103367,103394,103414,103644,103800,103918,104181,104384,104420,104423,104726,105504,105828-105829,105902,105948-105949,106005,106243-106244,106270,106352

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=106354&r1=106353&r2=106354&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 Jun 18 18:29:09 2010
@@ -3957,6 +3957,9 @@
        omitting leaf frame pointers only.  */           \
     if (flag_omit_frame_pointer == 3)                   \
       argvec.push_back("--disable-non-leaf-fp-elim");   \
+                                                        \
+    if (ix86_force_align_arg_pointer)                   \
+      argvec.push_back("-realign-stack");               \
   } while (0)
 #endif /* ENABLE_LLVM */
 /* LLVM LOCAL end */