The branch stable/12 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=62bee146aa42276264008df1d2190ca94eef26cd
commit 62bee146aa42276264008df1d2190ca94eef26cd Author: Mitchell Horne <[email protected]> AuthorDate: 2021-08-04 18:20:50 +0000 Commit: Mitchell Horne <[email protected]> CommitDate: 2021-08-11 17:20:01 +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 (cherry picked from commit 61ed578ee66648eff206ee5622b66727bfb52e78) --- 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 d7e05df9ae24..08574880be97 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -655,7 +655,6 @@ BSARGS= DESTDIR= \ MAKEOBJDIRPREFIX= \ BOOTSTRAPPING=${OSRELDATE} \ BWPHASE=${.TARGET:C,^_,,} \ - SSP_CFLAGS= \ -DNO_CPU_CFLAGS \ -DNO_LINT \ -DNO_PIC \ @@ -669,6 +668,7 @@ BSARGS= DESTDIR= \ MK_MAN=no \ MK_PROFILE=no \ MK_RETPOLINE=no \ + MK_SSP=no \ MK_TESTS=no \ MK_WARNS=no \ MK_INCLUDES=yes @@ -687,7 +687,6 @@ TMAKE= \ DESTDIR= \ BOOTSTRAPPING=${OSRELDATE} \ BWPHASE=${.TARGET:C,^_,,} \ - SSP_CFLAGS= \ -DNO_CPU_CFLAGS \ -DNO_LINT \ MK_CTF=no \ @@ -696,6 +695,7 @@ TMAKE= \ MK_CLANG_FULL=no \ MK_LLDB=no \ MK_RETPOLINE=no \ + MK_SSP=no \ MK_TESTS=no \ MK_WARNS=no @@ -718,7 +718,6 @@ KTMAKE= \ OBJROOT='$${OBJTOP}/' \ MAKEOBJDIRPREFIX= \ BOOTSTRAPPING=${OSRELDATE} \ - SSP_CFLAGS= \ -DNO_CPU_CFLAGS \ -DNO_LINT \ -DNO_PIC \ @@ -727,6 +726,7 @@ KTMAKE= \ MK_HTML=no \ MK_MAN=no \ MK_PROFILE=no \ + MK_SSP=no \ MK_RETPOLINE=no \ MK_WARNS=no @@ -2499,7 +2499,6 @@ NXBMAKEARGS+= \ -DNO_SHARED \ -DNO_CPU_CFLAGS \ -DNO_PIC \ - SSP_CFLAGS= \ MK_CLANG_EXTRAS=no \ MK_CLANG_FORMAT=no \ MK_CLANG_FULL=no \ @@ -2516,6 +2515,7 @@ NXBMAKEARGS+= \ MK_RETPOLINE=no \ MK_SENDMAIL=no \ MK_SVNLITE=no \ + MK_SSP=no \ MK_TESTS=no \ MK_WARNS=no \ MK_ZFS=no diff --git a/Makefile.libcompat b/Makefile.libcompat index 4e5a8dd8ae73..89509a266af0 100644 --- a/Makefile.libcompat +++ b/Makefile.libcompat @@ -197,7 +197,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= \ @@ -206,6 +206,7 @@ build${libcompat}: .PHONY -DNO_CPU_CFLAGS \ MK_CTF=no \ MK_RETPOLINE=no \ + MK_SSP=no \ MK_WARNS=no \ ${_t} .endfor diff --git a/lib/csu/Makefile.inc b/lib/csu/Makefile.inc index 93bf9672db04..5aa2132fe8c4 100644 --- a/lib/csu/Makefile.inc +++ b/lib/csu/Makefile.inc @@ -1,12 +1,11 @@ # $FreeBSD$ -SSP_CFLAGS= - SED_FIX_NOTE = -i "" -e '/\.note\.tag/s/progbits/note/' NO_WMISSING_VARIABLE_DECLARATIONS= .include <src.opts.mk> +MK_SSP= no .if ${MK_BSD_CRTBEGIN} != "no" && !defined(BUILDING_TESTS) diff --git a/lib/libclang_rt/Makefile.inc b/lib/libclang_rt/Makefile.inc index f2f25843dda3..07b66015acb1 100644 --- a/lib/libclang_rt/Makefile.inc +++ b/lib/libclang_rt/Makefile.inc @@ -20,10 +20,10 @@ SHLIBDIR= ${LIBDIR} NO_PIC= MK_PROFILE= no +MK_SSP= 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 3f440d9017f8..c81be884f3ae 100644 --- a/stand/defs.mk +++ b/stand/defs.mk @@ -120,8 +120,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. riscv # currently has no /boot/loader, but may soon. diff --git a/targets/pseudo/bootstrap-tools/Makefile b/targets/pseudo/bootstrap-tools/Makefile index 7ab8032157c3..1a973dc7fc18 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 \ @@ -52,6 +51,7 @@ BSARGS= DESTDIR= \ MK_LLDB=no \ MK_MAN=no \ MK_PROFILE=no \ + MK_SSP=no \ MK_TESTS=no \ MK_WARNS=no \ MK_INCLUDES=yes _______________________________________________ [email protected] mailing list https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all To unsubscribe, send any mail to "[email protected]"
