Module Name: src
Committed By: martin
Date: Wed Apr 18 10:38:47 UTC 2018
Modified Files:
src/sys/arch/amd64/conf: Makefile.amd64
Log Message:
Simplify previous, pointed out by mrg.
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/amd64/conf/Makefile.amd64
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/amd64/conf/Makefile.amd64
diff -u src/sys/arch/amd64/conf/Makefile.amd64:1.69 src/sys/arch/amd64/conf/Makefile.amd64:1.70
--- src/sys/arch/amd64/conf/Makefile.amd64:1.69 Wed Apr 18 09:29:35 2018
+++ src/sys/arch/amd64/conf/Makefile.amd64 Wed Apr 18 10:38:47 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.amd64,v 1.69 2018/04/18 09:29:35 martin Exp $
+# $NetBSD: Makefile.amd64,v 1.70 2018/04/18 10:38:47 martin Exp $
# Makefile for NetBSD
#
@@ -43,8 +43,7 @@ CFLAGS+= -msoft-float
# For gcc we might need this, but other compilers barf
# CFLAGS+= -mno-fp-ret-in-387
-.if !empty(SPECTRE_V2_GCC_MITIGATION) && ${SPECTRE_V2_GCC_MITIGATION:U0} > 0 \
- && ${HAVE_GCC:U0} > 0
+.if ${SPECTRE_V2_GCC_MITIGATION:U0} > 0 && ${HAVE_GCC:U0} > 0
CFLAGS+= -mindirect-branch=thunk-inline
CFLAGS+= -mindirect-branch-register
.endif
