[src/trunk]: src/share/mk Move HAS_SSP and USE_SSP out of bsd.sys.mk. They di...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ae256ce43d84
branches:  trunk
changeset: 784375:ae256ce43d84
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Jan 27 02:31:44 2013 +0000

description:
Move HAS_SSP and USE_SSP out of bsd.sys.mk. They did not belong there in
the first place. Rename HAS_SSP to HAVE_SSP to match existing practice.

diffstat:

 share/mk/bsd.own.mk |  15 ++++++++++++++-
 share/mk/bsd.sys.mk |  20 ++------------------
 2 files changed, 16 insertions(+), 19 deletions(-)

diffs (70 lines):

diff -r 4e2809e88010 -r ae256ce43d84 share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Sun Jan 27 02:22:27 2013 +0000
+++ b/share/mk/bsd.own.mk       Sun Jan 27 02:31:44 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.own.mk,v 1.720 2013/01/27 02:22:27 christos Exp $
+#      $NetBSD: bsd.own.mk,v 1.721 2013/01/27 02:31:44 christos Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -70,6 +70,19 @@
 
 HAVE_GDB?=     7
 
+.if (${MACHINE_ARCH} == "alpha") || \
+    (${MACHINE_ARCH} == "hppa") || \
+    (${MACHINE_ARCH} == "ia64") || \
+    (${MACHINE_ARCH} == "mipsel") || (${MACHINE_ARCH} == "mipseb") || \
+    (${MACHINE_ARCH} == "mips64el") || (${MACHINE_ARCH} == "mips64eb")
+HAVE_SSP?=     no
+.else
+HAVE_SSP?=     yes
+.if ${USE_FORT:Uno} != "no"
+USE_SSP?=      yes
+.endif
+.endif
+
 .if empty(.MAKEFLAGS:tW:M*-V .OBJDIR*)
 .if defined(MAKEOBJDIRPREFIX) || defined(MAKEOBJDIR)
 PRINTOBJDIR=   ${MAKE} -r -V .OBJDIR -f /dev/null xxx
diff -r 4e2809e88010 -r ae256ce43d84 share/mk/bsd.sys.mk
--- a/share/mk/bsd.sys.mk       Sun Jan 27 02:22:27 2013 +0000
+++ b/share/mk/bsd.sys.mk       Sun Jan 27 02:31:44 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.sys.mk,v 1.222 2013/01/26 22:04:18 christos Exp $
+#      $NetBSD: bsd.sys.mk,v 1.223 2013/01/27 02:31:44 christos Exp $
 #
 # Build definitions used for NetBSD source tree builds.
 
@@ -89,30 +89,14 @@
 CFLAGS+=       ${${_NOWERROR} == "no" :?-Werror:} ${CWARNFLAGS}
 LINTFLAGS+=    ${DESTDIR:D-d ${DESTDIR}/usr/include}
 
-.if (${MACHINE_ARCH} == "alpha") || \
-    (${MACHINE_ARCH} == "hppa") || \
-    (${MACHINE_ARCH} == "ia64") || \
-    (${MACHINE_ARCH} == "mipsel") || (${MACHINE_ARCH} == "mipseb") || \
-    (${MACHINE_ARCH} == "mips64el") || (${MACHINE_ARCH} == "mips64eb")
-HAS_SSP=       no
-.else
-HAS_SSP=       yes
-.endif
-
-.if ${USE_FORT:Uno} != "no"
-USE_SSP?=      yes
+.if (${USE_SSP:Uno} != "no") && (${BINDIR:Ux} != "/usr/mdec")
 .if !defined(KERNSRCDIR) && !defined(KERN) # not for kernels nor kern modules
 CPPFLAGS+=     -D_FORTIFY_SOURCE=2
 .endif
-.endif
-
-.if (${USE_SSP:Uno} != "no") && (${BINDIR:Ux} != "/usr/mdec")
-.if ${HAS_SSP} == "yes"
 COPTS+=        -fstack-protector -Wstack-protector 
 COPTS+=        ${${ACTIVE_CC} == "clang":? --param ssp-buffer-size=1 :}
 COPTS+=        ${${ACTIVE_CC} == "gcc":? --param ssp-buffer-size=1 :}
 .endif
-.endif
 
 .if ${MKSOFTFLOAT:Uno} != "no"
 COPTS+=                -msoft-float