diff options
authorWarner Losh <imp@FreeBSD.org>2021-07-15 03:06:08 +0000
committerWarner Losh <imp@FreeBSD.org>2021-07-21 16:16:32 +0000
commitee6908d78275449011f8fb1b6d73bde75c02f705 (patch)
parent18b511454f779305f828b71ad5df69d1c1a3b3ba (diff)
loader: make sure CPUTYPE is ignored when building
CPUTYPE?=native causes -march=native to be added to the command line. When the host machine is haswell, this causes some versions of clang to generate code that can't execute in the efi boot loader environment. Set _CPUCFLAGS= to undo what's done bsd.cpu.mk. bsd.cpu.mk is included too early to control with NO_CPU_CFLAGS here. The only other option is to put that in all the Makefiles, and this is less tedious and error prone. PR: 194641 Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D31187 MFC After: 1 week (cherry picked from commit 7a0c0ff7ee25ff1efa3dbedcb20d2c80178639cc)
1 files changed, 8 insertions, 0 deletions
diff --git a/stand/defs.mk b/stand/defs.mk
index 514a6c9b98dc..3f440d9017f8 100644
--- a/stand/defs.mk
+++ b/stand/defs.mk
@@ -15,6 +15,14 @@ MAN=
+# Should be NO_CPU_FLAGS, but bsd.cpu.mk is included too early in bsd.init.mk
+# via the early include of bsd.opts.mk. Moving Makefile.inc include earlier in
+# that file causes weirdness, so this is the next best thing. We need to do this
+# because the loader needs very specific flags to work right, and things like
+# CPUTYPE?=native prevent that, and introduce an endless game of whack-a-mole
+# to disable more and more features. Boot loader performance is never improved
+# enough to make that hassle worth chasing.
.include <src.opts.mk>