[llvm-commits] [llvm-gcc-4.2] r54306 - in /llvm-gcc-4.2/trunk/gcc: common.opt fold-const.c

[Bill Wendling]

Author: void
Date: Sat Aug  2 23:37:27 2008
New Revision: 54306

URL: http://llvm.org/viewvc/llvm-project?rev=54306&view=rev
Log:
Default stack-protctor to -1.

Modified:
    llvm-gcc-4.2/trunk/gcc/common.opt
    llvm-gcc-4.2/trunk/gcc/fold-const.c

Modified: llvm-gcc-4.2/trunk/gcc/common.opt
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/common.opt?rev=54306&r1=54305&r2=54306&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/common.opt (original)
+++ llvm-gcc-4.2/trunk/gcc/common.opt Sat Aug  2 23:37:27 2008
@@ -1011,9 +1011,11 @@
 Common RejectNegative Joined
 -fstack-limit-symbol=<name>	Trap if the stack goes past symbol <name>
 
+; APPLE LOCAL begin stack-protector default 5095227
 fstack-protector
-Common Report Var(flag_stack_protect, 1)
+Common Report Var(flag_stack_protect, 1) Init(-1)
 Use propolice as a stack protection method
+; APPLE LOCAL end stack-protector default 5095227
 
 fstack-protector-all
 Common Report RejectNegative Var(flag_stack_protect, 2) VarExists

Modified: llvm-gcc-4.2/trunk/gcc/fold-const.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/fold-const.c?rev=54306&r1=54305&r2=54306&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/fold-const.c (original)
+++ llvm-gcc-4.2/trunk/gcc/fold-const.c Sat Aug  2 23:37:27 2008
@@ -9387,7 +9387,6 @@
 
               /* LLVM LOCAL Disable pow generation (FIXME: PR1631) */
 #ifndef ENABLE_LLVM
-              
 	      /* Optimize x*x as pow(x,2.0), which is expanded as x*x.  */
 	      if (! optimize_size
 		  && operand_equal_p (arg0, arg1, 0))