Module Name: src
Committed By: tron
Date: Thu Nov 12 14:30:34 UTC 2009
Modified Files:
src/share/mk: bsd.sys.mk
Log Message:
Revert SSP changes because at least rmind@, pooka@ and haad@ consider
5% more performance more important than the gain in security.
To generate a diff of this commit:
cvs rdiff -u -r1.184 -r1.185 src/share/mk/bsd.sys.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.sys.mk
diff -u src/share/mk/bsd.sys.mk:1.184 src/share/mk/bsd.sys.mk:1.185
--- src/share/mk/bsd.sys.mk:1.184 Thu Nov 12 13:22:34 2009
+++ src/share/mk/bsd.sys.mk Thu Nov 12 14:30:34 2009
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sys.mk,v 1.184 2009/11/12 13:22:34 tron Exp $
+# $NetBSD: bsd.sys.mk,v 1.185 2009/11/12 14:30:34 tron Exp $
#
# Build definitions used for NetBSD source tree builds.
@@ -59,13 +59,6 @@
HAS_SSP= yes
.endif
-.if ((${MACHINE_ARCH} == "amd64") || (${MACHINE_ARCH} == "i386")) && \
- defined(_SRC_TOP_) && (${_SRC_TOP_} != "")
-USE_SSP_DEFAULT?= yes
-.else
-USE_SSP_DEFAULT?= no
-.endif
-
.if defined(USE_FORT) && (${USE_FORT} != "no")
USE_SSP?= yes
.if !defined(KERNSRCDIR) && !defined(KERN) # not for kernels nor kern modules
@@ -73,9 +66,7 @@
.endif
.endif
-USE_SSP?= ${USE_SSP_DEFAULT}
-
-.if (${USE_SSP} != "no") && (${BINDIR:Ux} != "/usr/mdec")
+.if defined(USE_SSP) && (${USE_SSP} != "no") && (${BINDIR:Ux} != "/usr/mdec")
.if ${HAS_SSP} == "yes"
COPTS+= -fstack-protector -Wstack-protector --param ssp-buffer-size=1
.endif
