Page MenuHomeFreeBSD
Files F97395254

D31401.diff
No OneTemporary
Actions

D31401.diff
View Options

diff --git a/Makefile.inc1 b/Makefile.inc1
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -714,7 +714,6 @@
MAKEOBJDIRPREFIX= \
BOOTSTRAPPING=${BOOTSTRAPPING_OSRELDATE} \
BWPHASE=${.TARGET:C,^_,,} \
- SSP_CFLAGS= \
-DNO_CPU_CFLAGS \
-DNO_LINT \
-DNO_PIC \
@@ -729,6 +728,7 @@
MK_MAN=no \
MK_PROFILE=no \
MK_RETPOLINE=no \
+ MK_SSP=no \
MK_TESTS=no \
MK_UBSAN=no \
MK_WERROR=no \
@@ -749,7 +749,6 @@
DESTDIR= \
BOOTSTRAPPING=${BOOTSTRAPPING_OSRELDATE} \
BWPHASE=${.TARGET:C,^_,,} \
- SSP_CFLAGS= \
-DNO_CPU_CFLAGS \
-DNO_LINT \
MK_ASAN=no \
@@ -759,6 +758,7 @@
MK_CLANG_FULL=no \
MK_LLDB=no \
MK_RETPOLINE=no \
+ MK_SSP=no \
MK_TESTS=no \
MK_UBSAN=no \
MK_WERROR=no
@@ -784,7 +784,6 @@
OBJROOT='$${OBJTOP}/' \
MAKEOBJDIRPREFIX= \
BOOTSTRAPPING=${BOOTSTRAPPING_OSRELDATE} \
- SSP_CFLAGS= \
-DNO_CPU_CFLAGS \
-DNO_LINT \
-DNO_PIC \
@@ -793,6 +792,7 @@
MK_HTML=no \
MK_MAN=no \
MK_PROFILE=no \
+ MK_SSP=no \
MK_RETPOLINE=no \
MK_WERROR=no
@@ -2768,7 +2768,6 @@
-DNO_SHARED \
-DNO_CPU_CFLAGS \
-DNO_PIC \
- SSP_CFLAGS= \
MK_CASPER=no \
MK_CLANG_EXTRAS=no \
MK_CLANG_FORMAT=no \
@@ -2784,6 +2783,7 @@
MK_PROFILE=no \
MK_RETPOLINE=no \
MK_SENDMAIL=no \
+ MK_SSP=no \
MK_TESTS=no \
MK_WERROR=no \
MK_ZFS=no
diff --git a/Makefile.libcompat b/Makefile.libcompat
--- a/Makefile.libcompat
+++ b/Makefile.libcompat
@@ -99,7 +99,7 @@
${_+_}cd ${.CURDIR}/${_dir}; \
WORLDTMP=${WORLDTMP} \
MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" \
- ${MAKE} SSP_CFLAGS= DESTDIR= \
+ ${MAKE} DESTDIR= \
OBJTOP=${LIBCOMPAT_OBJTOP} \
OBJROOT='$${OBJTOP}/' \
MAKEOBJDIRPREFIX= \
@@ -109,6 +109,7 @@
MK_ASAN=no \
MK_CTF=no \
MK_RETPOLINE=no \
+ MK_SSP=no \
MK_UBSAN=no \
MK_WERROR=no \
${_t}
diff --git a/lib/csu/Makefile.inc b/lib/csu/Makefile.inc
--- a/lib/csu/Makefile.inc
+++ b/lib/csu/Makefile.inc
@@ -1,13 +1,12 @@
# $FreeBSD$
-SSP_CFLAGS=
-
NO_WMISSING_VARIABLE_DECLARATIONS=
# Can't instrument these files since that breaks non-sanitized programs.
MK_ASAN:= no
MK_UBSAN:= no
.include <src.opts.mk>
+MK_SSP= no
.if !defined(BUILDING_TESTS)
diff --git a/lib/libclang_rt/Makefile.inc b/lib/libclang_rt/Makefile.inc
--- a/lib/libclang_rt/Makefile.inc
+++ b/lib/libclang_rt/Makefile.inc
@@ -13,11 +13,11 @@
NO_PIC=
MK_PROFILE= no
MK_ASAN:= no
+MK_SSP= no
MK_UBSAN:= no
WARNS?= 0
-SSP_CFLAGS=
CFLAGS+= -DNDEBUG
CFLAGS+= -DHAVE_RPC_XDR_H=0
CFLAGS+= -DSANITIZER_SUPPORTS_WEAK_HOOKS=0
diff --git a/stand/defs.mk b/stand/defs.mk
--- a/stand/defs.mk
+++ b/stand/defs.mk
@@ -135,8 +135,6 @@
AFLAGS+= --32
.endif
-SSP_CFLAGS=
-
# Add in the no float / no SIMD stuff and announce we're freestanding
# aarch64 and riscv don't have -msoft-float, but all others do.
CFLAGS+= -ffreestanding ${CFLAGS_NO_SIMD}
diff --git a/targets/pseudo/bootstrap-tools/Makefile b/targets/pseudo/bootstrap-tools/Makefile
--- a/targets/pseudo/bootstrap-tools/Makefile
+++ b/targets/pseudo/bootstrap-tools/Makefile
@@ -39,7 +39,6 @@
MAKEOBJDIRPREFIX= \
BOOTSTRAPPING=${OSRELDATE} \
BWPHASE=${.TARGET} \
- SSP_CFLAGS= \
-DNO_CPU_CFLAGS \
-DNO_LINT \
-DNO_PIC \
@@ -53,6 +52,7 @@
MK_MAN=no \
MK_PROFILE=no \
MK_RETPOLINE=no \
+ MK_SSP=no \
MK_TESTS=no \
MK_WERROR=no \
MK_INCLUDES=yes \

File Metadata

Mime Type
text/plain
Expires
Mon, Sep 30, 1:34 AM (22 h, 43 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
13162288
Default Alt Text
D31401.diff (3 KB)

Event Timeline