Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: Simplify previous, pointed out by mrg.



details:   https://anonhg.NetBSD.org/src/rev/9703cc1cd007
branches:  trunk
changeset: 318344:9703cc1cd007
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Apr 18 10:38:47 2018 +0000
description:
Simplify previous, pointed out by mrg.

diffstat:

 sys/arch/amd64/conf/Makefile.amd64 |  5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diffs (19 lines):

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



Home | Main Index | Thread Index | Old Index