Module Name: src
Committed By: christos
Date: Sun Jan 27 02:31:44 UTC 2013
Modified Files:
src/share/mk: bsd.own.mk bsd.sys.mk
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.720 -r1.721 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.222 -r1.223 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.own.mk
diff -u src/share/mk/bsd.own.mk:1.720 src/share/mk/bsd.own.mk:1.721
--- src/share/mk/bsd.own.mk:1.720 Sat Jan 26 21:22:27 2013
+++ src/share/mk/bsd.own.mk Sat Jan 26 21:31:44 2013
@@ -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 @@ USE_COMPILERCRTSTUFF?= yes
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
Index: src/share/mk/bsd.sys.mk
diff -u src/share/mk/bsd.sys.mk:1.222 src/share/mk/bsd.sys.mk:1.223
--- src/share/mk/bsd.sys.mk:1.222 Sat Jan 26 17:04:18 2013
+++ src/share/mk/bsd.sys.mk Sat Jan 26 21:31:44 2013
@@ -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 @@ _NOWERROR= ${defined(NOGCCERROR) || (${A
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
