[Glibc-bsd-commits] r5935 - trunk/kfreebsd-10/debian
stevenc-guest at alioth.debian.org
stevenc-guest at alioth.debian.org
Fri Mar 11 13:31:40 UTC 2016
Author: stevenc-guest
Date: 2016-03-11 13:31:39 +0000 (Fri, 11 Mar 2016)
New Revision: 5935
Modified:
trunk/kfreebsd-10/debian/changelog
trunk/kfreebsd-10/debian/rules
Log:
Enable Stack-Smashing Protection (disable it only when building the
aic7xxx firmware toolchain).
Modified: trunk/kfreebsd-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog 2016-03-11 11:44:19 UTC (rev 5934)
+++ trunk/kfreebsd-10/debian/changelog 2016-03-11 13:31:39 UTC (rev 5935)
@@ -5,6 +5,8 @@
new MK knobs from 10.3 are needed.
* Re-enable debugging options:
- 999_config.diff
+ * Enable Stack-Smashing Protection (disable it only when building the
+ aic7xxx firmware toolchain).
-- Steven Chamberlain <steven at pyro.eu.org> Fri, 11 Mar 2016 11:39:19 +0000
Modified: trunk/kfreebsd-10/debian/rules
===================================================================
--- trunk/kfreebsd-10/debian/rules 2016-03-11 11:44:19 UTC (rev 5934)
+++ trunk/kfreebsd-10/debian/rules 2016-03-11 13:31:39 UTC (rev 5935)
@@ -84,14 +84,6 @@
# "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)
svn export --ignore-keywords -r $(svn_revision) $(SVN)/sys $(ORIG_DIR)/sys
@@ -228,7 +220,7 @@
# We must rebuild firmware from sources, per the DFSG
CFLAGS='-D_GNU_SOURCE -isystem /usr/include/freebsd' LDFLAGS='-ldb -lbsd' \
- $(MAKE) CC=$(cc_cmd) -C $(FLAVOR_DIR)-$*/sys/modules/aic7xxx/ firmware
+ $(MAKE) -DWITHOUT_SSP CC=$(cc_cmd) -C $(FLAVOR_DIR)-$*/sys/modules/aic7xxx/ firmware
# Build it
$(MAKE) CC=$(cc_cmd) -C $(FLAVOR_DIR)-$*/sys/$(kfreebsd_cpu)/compile/$(configfile)/ depend
More information about the Glibc-bsd-commits
mailing list