[Glibc-bsd-commits] r3071 - in trunk/kfreebsd-7/debian: . patches

[Aurelien Jarno]

Author: aurel32
Date: 2010-07-19 23:31:16 +0000 (Mon, 19 Jul 2010)
New Revision: 3071

Added:
   trunk/kfreebsd-7/debian/patches/950_no_stack_protector.diff
Modified:
   trunk/kfreebsd-7/debian/changelog
   trunk/kfreebsd-7/debian/patches/series
Log:
  * Disable -fstack-protector for modules, now that freebsd-buildutils
    enable it by default. Closes: #587629.



Modified: trunk/kfreebsd-7/debian/changelog
===================================================================
--- trunk/kfreebsd-7/debian/changelog	2010-07-19 22:46:47 UTC (rev 3070)
+++ trunk/kfreebsd-7/debian/changelog	2010-07-19 23:31:16 UTC (rev 3071)
@@ -1,3 +1,10 @@
+kfreebsd-7 (7.3-6) unstable; urgency=medium
+
+  * Disable -fstack-protector for modules, now that freebsd-buildutils
+    enable it by default. Closes: #587629.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Tue, 20 Jul 2010 01:30:55 +0200
+
 kfreebsd-7 (7.3-5) unstable; urgency=high
 
   [ Guillem Jover ]

Added: trunk/kfreebsd-7/debian/patches/950_no_stack_protector.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/950_no_stack_protector.diff	                        (rev 0)
+++ trunk/kfreebsd-7/debian/patches/950_no_stack_protector.diff	2010-07-19 23:31:16 UTC (rev 3071)
@@ -0,0 +1,20 @@
+
+ disable ssp for now ...
+ at least under QEMU it panics, might be due to 
+   - QEMU
+   - newer gcc compared to plain FreeBSD
+   - different init order 
+   - ...
+
+--- 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/}: @

Modified: trunk/kfreebsd-7/debian/patches/series
===================================================================
--- trunk/kfreebsd-7/debian/patches/series	2010-07-19 22:46:47 UTC (rev 3070)
+++ trunk/kfreebsd-7/debian/patches/series	2010-07-19 23:31:16 UTC (rev 3071)
@@ -26,4 +26,5 @@
 914_psm.diff
 915_ip6.v6only.diff
 916_ip6.accept_rtadv.diff
+950_no_stack_protector.diff
 999_config.diff