The branch main has been updated by mhorne:
URL:
https://cgit.FreeBSD.org/src/commit/?id=61ed578ee66648eff206ee5622b66727bfb52e78
commit 61ed578ee66648eff206ee5622b66727bfb52e78
Author: Mitchell Horne <mho...@freebsd.org>
AuthorDate: 2021-08-04 18:20:50 +0000
Commit: Mitchell Horne <mho...@freebsd.org>
CommitDate: 2021-08-04 18:23:22 +0000
Prefer MK_SSP=no to SSP_CFLAGS=
It is more idiomatic. CFLAGS is only augmented with $SSP_CFLAGS when
$MK_SSP != "no".
Reviewed by: imp
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D31401
---
Makefile.inc1 | 8 ++++----
Makefile.libcompat | 3 ++-
lib/csu/Makefile.inc | 3 +--
lib/libclang_rt/Makefile.inc | 2 +-
stand/defs.mk | 2 --
targets/pseudo/bootstrap-tools/Makefile | 2 +-
6 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/Makefile.inc1 b/Makefile.inc1
index b61ed693af77..be8ac02353e1 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -714,7 +714,6 @@ BSARGS= DESTDIR= \
MAKEOBJDIRPREFIX= \
BOOTSTRAPPING=${BOOTSTRAPPING_OSRELDATE} \
BWPHASE=${.TARGET:C,^_,,} \
- SSP_CFLAGS= \
-DNO_CPU_CFLAGS \
-DNO_LINT \
-DNO_PIC \
@@ -729,6 +728,7 @@ BSARGS= DESTDIR= \
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 @@ TMAKE= \
DESTDIR= \
BOOTSTRAPPING=${BOOTSTRAPPING_OSRELDATE} \
BWPHASE=${.TARGET:C,^_,,} \
- SSP_CFLAGS= \
-DNO_CPU_CFLAGS \
-DNO_LINT \
MK_ASAN=no \
@@ -759,6 +758,7 @@ TMAKE= \
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 @@ KTMAKE= ${TIME_ENV} \
OBJROOT='$${OBJTOP}/' \
MAKEOBJDIRPREFIX= \
BOOTSTRAPPING=${BOOTSTRAPPING_OSRELDATE} \
- SSP_CFLAGS= \
-DNO_CPU_CFLAGS \
-DNO_LINT \
-DNO_PIC \
@@ -793,6 +792,7 @@ KTMAKE= ${TIME_ENV} \
MK_HTML=no \
MK_MAN=no \
MK_PROFILE=no \
+ MK_SSP=no \
MK_RETPOLINE=no \
MK_WERROR=no
@@ -2768,7 +2768,6 @@ NXBMAKEARGS+= \
-DNO_SHARED \
-DNO_CPU_CFLAGS \
-DNO_PIC \
- SSP_CFLAGS= \
MK_CASPER=no \
MK_CLANG_EXTRAS=no \
MK_CLANG_FORMAT=no \
@@ -2784,6 +2783,7 @@ NXBMAKEARGS+= \
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
index 88b1e3f0cf18..b376ebaa65f4 100644
--- a/Makefile.libcompat
+++ b/Makefile.libcompat
@@ -99,7 +99,7 @@ build${libcompat}: .PHONY
${_+_}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 @@ build${libcompat}: .PHONY
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
index b089e1a947b1..31c1bcbd7278 100644
--- 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
index 19b8868b60e3..cb4ad189e18b 100644
--- a/lib/libclang_rt/Makefile.inc
+++ b/lib/libclang_rt/Makefile.inc
@@ -13,11 +13,11 @@ SHLIBDIR= ${LIBDIR}
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
index 02a03b92577e..1e22f7b7c693 100644
--- a/stand/defs.mk
+++ b/stand/defs.mk
@@ -135,8 +135,6 @@ LD_FLAGS+= -m elf_i386_fbsd
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
index 1a7f2bd15ad0..3ac47053a388 100644
--- a/targets/pseudo/bootstrap-tools/Makefile
+++ b/targets/pseudo/bootstrap-tools/Makefile
@@ -39,7 +39,6 @@ BSARGS= DESTDIR= \
MAKEOBJDIRPREFIX= \
BOOTSTRAPPING=${OSRELDATE} \
BWPHASE=${.TARGET} \
- SSP_CFLAGS= \
-DNO_CPU_CFLAGS \
-DNO_LINT \
-DNO_PIC \
@@ -53,6 +52,7 @@ BSARGS= DESTDIR= \
MK_MAN=no \
MK_PROFILE=no \
MK_RETPOLINE=no \
+ MK_SSP=no \
MK_TESTS=no \
MK_WERROR=no \
MK_INCLUDES=yes \
_______________________________________________
dev-commits-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all
To unsubscribe, send any mail to "dev-commits-src-all-unsubscr...@freebsd.org"
