summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.inc113
-rw-r--r--gnu/lib/csu/Makefile4
-rw-r--r--gnu/lib/libssp/Makefile4
-rw-r--r--lib/csu/Makefile.inc2
-rw-r--r--lib/libstand/Makefile4
-rw-r--r--lib/libthr/Makefile3
-rw-r--r--libexec/rtld-elf/Makefile3
-rw-r--r--rescue/librescue/Makefile3
-rw-r--r--rescue/rescue/Makefile2
-rw-r--r--sys/boot/Makefile.inc2
-rw-r--r--sys/boot/i386/loader/Makefile3
-rw-r--r--sys/boot/ia64/common/Makefile3
-rw-r--r--sys/boot/ia64/efi/Makefile2
-rw-r--r--sys/boot/ia64/ski/Makefile2
-rw-r--r--sys/boot/pc98/loader/Makefile3
-rw-r--r--sys/boot/powerpc/ofw/Makefile3
-rw-r--r--sys/boot/sparc64/loader/Makefile3
17 files changed, 29 insertions, 30 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index f6a9c74..14c8663 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -230,7 +230,7 @@ BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \
${BMAKEENV} ${MAKE} -f Makefile.inc1 \
DESTDIR= \
BOOTSTRAPPING=${OSRELDATE} \
- -DWITHOUT_SSP \
+ SSP_CFLAGS= \
-DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \
-DWITHOUT_NLS -DNO_PIC -DWITHOUT_PROFILE -DNO_SHARED \
-DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF
@@ -240,8 +240,9 @@ TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \
${BMAKEENV} ${MAKE} -f Makefile.inc1 \
TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
DESTDIR= \
+ SSP_CFLAGS= \
BOOTSTRAPPING=${OSRELDATE} -DNO_LINT -DNO_CPU_CFLAGS \
- -DNO_WARNS -DNO_CTF -DWITHOUT_SSP
+ -DNO_WARNS -DNO_CTF
# cross-tools stage
XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \
@@ -458,7 +459,7 @@ build32:
.if ${MK_KERBEROS} != "no"
.for _t in obj depend all
cd ${.CURDIR}/kerberos5/tools; \
- MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} -DWITHOUT_SSP DESTDIR= \
+ MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} SSP_CFLAGS= DESTDIR= \
${_t}
.endfor
.endif
@@ -481,7 +482,7 @@ build32:
.endfor
.for _dir in lib/ncurses/ncurses lib/ncurses/ncursesw lib/libmagic
cd ${.CURDIR}/${_dir}; \
- MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} -DWITHOUT_SSP DESTDIR= \
+ MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} SSP_CFLAGS= DESTDIR= \
build-tools
.endfor
cd ${.CURDIR}; \
@@ -782,14 +783,14 @@ buildkernel:
@echo "--------------------------------------------------------------"
cd ${KRNLOBJDIR}/${_kernel}; \
MAKESRCPATH=${KERNSRCDIR}/dev/aic7xxx/aicasm \
- ${MAKE} -DWITHOUT_SSP -DNO_CPU_CFLAGS -DNO_CTF \
+ ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS -DNO_CTF \
-f ${KERNSRCDIR}/dev/aic7xxx/aicasm/Makefile
# XXX - Gratuitously builds aicasm in the ``makeoptions NO_MODULES'' case.
.if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists(${KERNSRCDIR}/modules)
.for target in obj depend all
cd ${KERNSRCDIR}/modules/aic7xxx/aicasm; \
MAKEOBJDIRPREFIX=${KRNLOBJDIR}/${_kernel}/modules \
- ${MAKE} -DWITHOUT_SSP -DNO_CPU_CFLAGS -DNO_CTF ${target}
+ ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS -DNO_CTF ${target}
.endfor
.endif
.if !defined(NO_KERNELDEPEND)
diff --git a/gnu/lib/csu/Makefile b/gnu/lib/csu/Makefile
index 6a27969..382a1ff 100644
--- a/gnu/lib/csu/Makefile
+++ b/gnu/lib/csu/Makefile
@@ -1,5 +1,8 @@
# $FreeBSD$
+.include <bsd.own.mk>
+MK_SSP= no
+
GCCDIR= ${.CURDIR}/../../../contrib/gcc
GCCLIB= ${.CURDIR}/../../../contrib/gcclibs
CCDIR= ${.CURDIR}/../../usr.bin/cc
@@ -19,7 +22,6 @@ CFLAGS+= -I${GCCLIB}/include -I${GCCDIR}/config -I${GCCDIR} -I. \
-I${CCDIR}/cc_tools
CRTS_CFLAGS= -DCRTSTUFFS_O -DSHARED ${PICFLAG}
MKDEP= -DCRT_BEGIN
-WITHOUT_SSP=
.if ${MACHINE_ARCH} == "ia64"
BEGINSRC= crtbegin.asm
diff --git a/gnu/lib/libssp/Makefile b/gnu/lib/libssp/Makefile
index 4f6170e..c6b20dc 100644
--- a/gnu/lib/libssp/Makefile
+++ b/gnu/lib/libssp/Makefile
@@ -1,5 +1,8 @@
# $FreeBSD$
+.include <bsd.own.mk>
+MK_SSP= no
+
GCCDIR= ${.CURDIR}/../../../contrib/gcc
GCCLIB= ${.CURDIR}/../../../contrib/gcclibs
SRCDIR= ${GCCLIB}/libssp
@@ -10,7 +13,6 @@ LIB= ssp
SHLIB_MAJOR= 0
SHLIBDIR?= /lib
NO_PROFILE=
-WITHOUT_SSP=
SRCS= ssp.c gets-chk.c memcpy-chk.c memmove-chk.c mempcpy-chk.c \
memset-chk.c snprintf-chk.c sprintf-chk.c stpcpy-chk.c \
diff --git a/lib/csu/Makefile.inc b/lib/csu/Makefile.inc
index 09bde81..3545446 100644
--- a/lib/csu/Makefile.inc
+++ b/lib/csu/Makefile.inc
@@ -1,3 +1,3 @@
# $FreeBSD$
-WITHOUT_SSP=
+SSP_CFLAGS=
diff --git a/lib/libstand/Makefile b/lib/libstand/Makefile
index 66e6ebb..0c2a65c 100644
--- a/lib/libstand/Makefile
+++ b/lib/libstand/Makefile
@@ -6,13 +6,15 @@
# quite large.
#
+.include <bsd.own.mk>
+MK_SSP= no
+
LIB= stand
NO_PROFILE=
NO_PIC=
INCS= stand.h
MAN= libstand.3
-WITHOUT_SSP=
CFLAGS+= -ffreestanding -Wformat
CFLAGS+= -I${.CURDIR}
diff --git a/lib/libthr/Makefile b/lib/libthr/Makefile
index 8fb18df..100af30 100644
--- a/lib/libthr/Makefile
+++ b/lib/libthr/Makefile
@@ -8,9 +8,8 @@
# (for system call stubs) to CFLAGS below. -DSYSLIBC_SCCS affects just the
# system call stubs.
-WITHOUT_SSP=
-
.include <bsd.own.mk>
+MK_SSP= no
.if ${SHLIBDIR} == "/usr/lib"
SHLIBDIR= /lib
diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile
index abf9209..7c20398 100644
--- a/libexec/rtld-elf/Makefile
+++ b/libexec/rtld-elf/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
-WITHOUT_SSP=
-
.include <bsd.own.mk>
+MK_SSP= no
PROG?= ld-elf.so.1
SRCS= rtld_start.S \
diff --git a/rescue/librescue/Makefile b/rescue/librescue/Makefile
index 9fd3c8f..62f5da1 100644
--- a/rescue/librescue/Makefile
+++ b/rescue/librescue/Makefile
@@ -2,9 +2,8 @@
# $FreeBSD$
#
-WITHOUT_SSP=
-
.include <bsd.own.mk>
+MK_SSP= no
# Certain library entries have hard-coded references to
# /bin, /sbin, etc, that require those entries to be
diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile
index 685c49b..77f5963 100644
--- a/rescue/rescue/Makefile
+++ b/rescue/rescue/Makefile
@@ -2,9 +2,9 @@
# @(#)Makefile 8.1 (Berkeley) 6/2/93
NO_MAN=
-WITHOUT_SSP=
.include <bsd.own.mk>
+MK_SSP= no
PROG= rescue
BINDIR?=/rescue
diff --git a/sys/boot/Makefile.inc b/sys/boot/Makefile.inc
index 09bde81..3545446 100644
--- a/sys/boot/Makefile.inc
+++ b/sys/boot/Makefile.inc
@@ -1,3 +1,3 @@
# $FreeBSD$
-WITHOUT_SSP=
+SSP_CFLAGS=
diff --git a/sys/boot/i386/loader/Makefile b/sys/boot/i386/loader/Makefile
index f1aa15c..cd3c951 100644
--- a/sys/boot/i386/loader/Makefile
+++ b/sys/boot/i386/loader/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
-WITHOUT_SSP=
-
.include <bsd.own.mk>
+MK_SSP= no
PROG= loader.sym
INTERNALPROG=
diff --git a/sys/boot/ia64/common/Makefile b/sys/boot/ia64/common/Makefile
index d36c550..8261c25 100644
--- a/sys/boot/ia64/common/Makefile
+++ b/sys/boot/ia64/common/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
-WITHOUT_SSP=
-
.include <bsd.own.mk>
+MK_SSP= no
LIB= ia64
INTERNALLIB=
diff --git a/sys/boot/ia64/efi/Makefile b/sys/boot/ia64/efi/Makefile
index 5c7fda5..5682ac8 100644
--- a/sys/boot/ia64/efi/Makefile
+++ b/sys/boot/ia64/efi/Makefile
@@ -1,9 +1,9 @@
# $FreeBSD$
NO_MAN=
-WITHOUT_SSP=
.include <bsd.own.mk>
+MK_SSP= no
PROG= loader.sym
INTERNALPROG=
diff --git a/sys/boot/ia64/ski/Makefile b/sys/boot/ia64/ski/Makefile
index 76498d3..081fd72 100644
--- a/sys/boot/ia64/ski/Makefile
+++ b/sys/boot/ia64/ski/Makefile
@@ -1,9 +1,9 @@
# $FreeBSD$
NO_MAN=
-WITHOUT_SSP=
.include <bsd.own.mk>
+MK_SSP= no
PROG= skiload
STRIP= # We must not strip skiload at install time.
diff --git a/sys/boot/pc98/loader/Makefile b/sys/boot/pc98/loader/Makefile
index a8b35ff..91d5150 100644
--- a/sys/boot/pc98/loader/Makefile
+++ b/sys/boot/pc98/loader/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
-WITHOUT_SSP=
-
.include <bsd.own.mk>
+MK_SSP= no
PROG= loader.sym
INTERNALPROG=
diff --git a/sys/boot/powerpc/ofw/Makefile b/sys/boot/powerpc/ofw/Makefile
index 2bdde76..dfc80db 100644
--- a/sys/boot/powerpc/ofw/Makefile
+++ b/sys/boot/powerpc/ofw/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
-WITHOUT_SSP=
-
.include <bsd.own.mk>
+MK_SSP= no
PROG= loader
NEWVERSWHAT= "Open Firmware loader" ${MACHINE_ARCH}
diff --git a/sys/boot/sparc64/loader/Makefile b/sys/boot/sparc64/loader/Makefile
index 9ee93d4..0d7161c 100644
--- a/sys/boot/sparc64/loader/Makefile
+++ b/sys/boot/sparc64/loader/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
-WITHOUT_SSP=
-
.include <bsd.own.mk>
+MK_SSP= no
PROG= loader
NEWVERSWHAT= "bootstrap loader" sparc64
OpenPOWER on IntegriCloud