Module Name: src
Committed By: martin
Date: Wed Apr 18 10:40:22 UTC 2018
Modified Files:
src/sys/arch/i386/conf: Makefile.i386
Log Message:
Make SPECTRE_V2_GCC_MITIGATION overridable at the make command line.
To generate a diff of this commit:
cvs rdiff -u -r1.190 -r1.191 src/sys/arch/i386/conf/Makefile.i386
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/conf/Makefile.i386
diff -u src/sys/arch/i386/conf/Makefile.i386:1.190 src/sys/arch/i386/conf/Makefile.i386:1.191
--- src/sys/arch/i386/conf/Makefile.i386:1.190 Sat Apr 7 19:38:06 2018
+++ src/sys/arch/i386/conf/Makefile.i386 Wed Apr 18 10:40:22 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.i386,v 1.190 2018/04/07 19:38:06 mrg Exp $
+# $NetBSD: Makefile.i386,v 1.191 2018/04/18 10:40:22 martin Exp $
# Makefile for NetBSD
#
@@ -39,7 +39,7 @@ CFLAGS+= -msoft-float
## no-sse implies no-sse2 but not no-avx
CFLAGS+= -mno-mmx -mno-sse -mno-avx
-.if !empty(SPECTRE_V2_GCC_MITIGATION) && ${HAVE_GCC:U0} > 0
+.if ${SPECTRE_V2_GCC_MITIGATION:U0} > 0 && ${HAVE_GCC:U0} > 0
CFLAGS+= -mindirect-branch=thunk
CFLAGS+= -mindirect-branch-register
.endif
