[llvm-commits] [llvm-gcc-4.2] r54279 - in /llvm-gcc-4.2/trunk/gcc/config: darwin.c rs6000/rs6000.c

[Bill Wendling]

Author: void
Date: Sat Aug  2 23:05:27 2008
New Revision: 54279

URL: http://llvm.org/viewvc/llvm-project?rev=54279&view=rev
Log:
- stack-protector default 5095227

Modified:
    llvm-gcc-4.2/trunk/gcc/config/darwin.c
    llvm-gcc-4.2/trunk/gcc/config/rs6000/rs6000.c

Modified: llvm-gcc-4.2/trunk/gcc/config/darwin.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/darwin.c?rev=54279&r1=54278&r2=54279&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/darwin.c (original)
+++ llvm-gcc-4.2/trunk/gcc/config/darwin.c Sat Aug  2 23:05:27 2008
@@ -2570,6 +2570,16 @@
     darwin_stubs = true;
   /* APPLE LOCAL end ARM 5683689 */
   /* APPLE LOCAL end axe stubs 5571540 */
+  /* APPLE LOCAL begin stack-protector default 5095227 */
+  /* Default flag_stack_protect to 1 if on 10.5 or later for user code,
+     or 10.6 or later for code identified as part of the kernel.  */
+  if (flag_stack_protect == -1
+      && darwin_macosx_version_min
+      && ((! flag_mkernel && ! flag_apple_kext
+	   && strverscmp (darwin_macosx_version_min, "10.5") >= 0)
+	  || strverscmp (darwin_macosx_version_min, "10.6") >= 0))
+    flag_stack_protect = 1;
+  /* APPLE LOCAL end stack-protector default 5095227 */
 /* APPLE LOCAL diff confuses me */
 }
 /* APPLE LOCAL begin radar 4985544 */

Modified: llvm-gcc-4.2/trunk/gcc/config/rs6000/rs6000.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/rs6000/rs6000.c?rev=54279&r1=54278&r2=54279&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/rs6000/rs6000.c (original)
+++ llvm-gcc-4.2/trunk/gcc/config/rs6000/rs6000.c Sat Aug  2 23:05:27 2008
@@ -1296,6 +1296,15 @@
   if (DARWIN_GENERATE_ISLANDS)
     darwin_stubs = true;
   /* APPLE LOCAL end axe stubs 5571540 */
+  /* APPLE LOCAL begin stack-protector default 5095227 */
+  /* Don't enable -fstack-protector by default for kexts on darwin ppc
+     targeting 10.6 because there's a bug that it exposes in some kext,
+     <rdar://problem/6034665>.  */
+  if (flag_stack_protect == -1
+      && (flag_mkernel || flag_apple_kext)
+      && strcmp (darwin_macosx_version_min, "10.6") == 0)
+    flag_stack_protect = 0;
+  /* APPLE LOCAL end stack-protector default 5095227 */
 }
 #endif