[Glibc-bsd-commits] r3070 - in trunk/kfreebsd-8/debian: . patches

[Aurelien Jarno]

Author: aurel32
Date: 2010-07-19 22:46:47 +0000 (Mon, 19 Jul 2010)
New Revision: 3070

Modified:
   trunk/kfreebsd-8/debian/changelog
   trunk/kfreebsd-8/debian/patches/950_no_stack_protector.diff
Log:
  * Also disable -fstack-protector for modules, now that 
    freebsd-buildutils enable it by default. Closes: #587630.



Modified: trunk/kfreebsd-8/debian/changelog
===================================================================
--- trunk/kfreebsd-8/debian/changelog	2010-07-13 18:33:04 UTC (rev 3069)
+++ trunk/kfreebsd-8/debian/changelog	2010-07-19 22:46:47 UTC (rev 3070)
@@ -13,6 +13,13 @@
 
  -- Aurelien Jarno <aurel32 at debian.org>  Tue, 13 Jul 2010 20:21:24 +0200
 
+kfreebsd-8 (8.0-11) unstable; urgency=medium
+
+  * Also disable -fstack-protector for modules, now that 
+    freebsd-buildutils enable it by default. Closes: #587630.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Tue, 20 Jul 2010 00:00:55 +0200
+
 kfreebsd-8 (8.0-10) unstable; urgency=high
 
   * Fix lost mbuf flag resulting in data corruption

Modified: trunk/kfreebsd-8/debian/patches/950_no_stack_protector.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/950_no_stack_protector.diff	2010-07-13 18:33:04 UTC (rev 3069)
+++ trunk/kfreebsd-8/debian/patches/950_no_stack_protector.diff	2010-07-19 22:46:47 UTC (rev 3070)
@@ -8,10 +8,24 @@
 
 --- a/sys/conf/kern.mk
 +++ b/sys/conf/kern.mk
-@@ -125,5 +125,5 @@
+@@ -111,6 +111,8 @@
  #
+ # GCC SSP support.
+ #
++# Disable stack protector as it causes kernel panic
++MK_SSP=		no
  .if ${MK_SSP} != "no" && ${CC} != "icc" && ${MACHINE_ARCH} != "ia64" && \
  	${MACHINE_ARCH} != "arm" && ${MACHINE_ARCH} != "mips"
--CFLAGS+=	-fstack-protector
-+CFLAGS+=	-fno-stack-protector
+ CFLAGS+=	-fstack-protector
+--- a/sys/conf/kmod.mk
++++ b/sys/conf/kmod.mk
+@@ -128,6 +128,9 @@
+ CFLAGS+=	-mlongcall -fno-omit-frame-pointer
  .endif
+ 
++# Disable stack protector as it causes kernel panic
++MK_SSP=		no
++
+ .if defined(FIRMWS)
+ .if !exists(@)
+ ${KMOD:S/$/.c/}: @