[src/trunk]: Make SPECTRE_V2_GCC_MITIGATION overridable at the m...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a1adad49eb05
branches:  trunk
changeset: 318345:a1adad49eb05
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Apr 18 10:40:22 2018 +0000
description:
Make SPECTRE_V2_GCC_MITIGATION overridable at the make command line.

diffstat:

 sys/arch/i386/conf/Makefile.i386 |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r 9703cc1cd007 -r a1adad49eb05 sys/arch/i386/conf/Makefile.i386
--- a/sys/arch/i386/conf/Makefile.i386  Wed Apr 18 10:38:47 2018 +0000
+++ b/sys/arch/i386/conf/Makefile.i386  Wed Apr 18 10:40:22 2018 +0000
@@ -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 @@
 ## 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