[Glibc-bsd-commits] r4147 - in trunk/kfreebsd-10/debian: . patches

[Robert Millan]

Author: rmh
Date: 2012-03-17 00:16:32 +0000 (Sat, 17 Mar 2012)
New Revision: 4147

Removed:
   trunk/kfreebsd-10/debian/patches/950_no_stack_protector.diff
Modified:
   trunk/kfreebsd-10/debian/changelog
   trunk/kfreebsd-10/debian/patches/series
   trunk/kfreebsd-10/debian/rules
Log:
Replace 950_no_stack_protector.diff with -DWITHOUT_SSP build knob.

Modified: trunk/kfreebsd-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog	2012-03-16 23:02:44 UTC (rev 4146)
+++ trunk/kfreebsd-10/debian/changelog	2012-03-17 00:16:32 UTC (rev 4147)
@@ -1,8 +1,9 @@
 kfreebsd-10 (10.0~svn232747-2) UNRELEASED; urgency=low
 
   * Set -DWITHOUT_KERNEL_SYMBOLS MK knob to make lintian happy.
+  * Replace 950_no_stack_protector.diff with -DWITHOUT_SSP build knob.
 
- -- Robert Millan <rmh at debian.org>  Sun, 11 Mar 2012 15:16:11 +0100
+ -- Robert Millan <rmh at debian.org>  Sat, 17 Mar 2012 01:16:08 +0100
 
 kfreebsd-10 (10.0~svn232747-1) experimental; urgency=low
 

Deleted: trunk/kfreebsd-10/debian/patches/950_no_stack_protector.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/950_no_stack_protector.diff	2012-03-16 23:02:44 UTC (rev 4146)
+++ trunk/kfreebsd-10/debian/patches/950_no_stack_protector.diff	2012-03-17 00:16:32 UTC (rev 4147)
@@ -1,31 +0,0 @@
-
- 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/kern.mk
-+++ b/sys/conf/kern.mk
-@@ -151,6 +151,8 @@
- #
- # GCC SSP support
- #
-+# Disable stack protector as it causes kernel panic
-+MK_SSP=                no
- .if ${MK_SSP} != "no" && ${MACHINE_CPUARCH} != "ia64" && \
-     ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips"
- CFLAGS+=	-fstack-protector
---- a/sys/conf/kmod.mk
-+++ b/sys/conf/kmod.mk
-@@ -141,6 +141,9 @@
- CTFFLAGS+=	-g
- .endif
- 
-+# Disable stack protector as it causes kernel panic
-+MK_SSP=		no
-+
- .if defined(FIRMWS)
- .if !exists(@)
- ${KMOD:S/$/.c/}: @

Modified: trunk/kfreebsd-10/debian/patches/series
===================================================================
--- trunk/kfreebsd-10/debian/patches/series	2012-03-16 23:02:44 UTC (rev 4146)
+++ trunk/kfreebsd-10/debian/patches/series	2012-03-17 00:16:32 UTC (rev 4147)
@@ -28,7 +28,6 @@
 918_unix_socket_overflow.diff
 919_delete_key.diff
 920_linux_cflags.diff
-950_no_stack_protector.diff
 951_disable_mk_magic.diff
 952_nodebug.diff
 999_config.diff

Modified: trunk/kfreebsd-10/debian/rules
===================================================================
--- trunk/kfreebsd-10/debian/rules	2012-03-16 23:02:44 UTC (rev 4146)
+++ trunk/kfreebsd-10/debian/rules	2012-03-17 00:16:32 UTC (rev 4147)
@@ -50,6 +50,14 @@
 # "unstripped-binary-or-object" lintian error).
 MAKE += -DWITHOUT_KERNEL_SYMBOLS	
 
+# Disable ssp for now ...
+# at least under QEMU it panics, might be due to
+#   - QEMU
+#   - newer gcc compared to plain FreeBSD
+#   - different init order
+#   - ...
+MAKE += -DWITHOUT_SSP
+
 get-orig-source:
 	rm -rf $(ORIG_DIR)
 	for i in sys usr.sbin/config ; do \