[src/trunk]: src/sys/arch GC more logic that was intended for GCC <4.8 (or !L...

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

details:   https://anonhg.NetBSD.org/src/rev/5fe40d66b6f8
branches:  trunk
changeset: 821938:5fe40d66b6f8
user:      maya <maya%NetBSD.org@localhost>
date:      Wed Feb 22 12:51:38 2017 +0000

description:
GC more logic that was intended for GCC <4.8 (or !LLVM)

Same as before (-marm implies -mno-thumb), but now the condition was flipped

diffstat:

 sys/arch/evbarm/stand/gzboot/Makefile.gzboot |  6 +-----
 sys/arch/zaurus/stand/zboot/Makefile         |  6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diffs (42 lines):

diff -r e74f67388e32 -r 5fe40d66b6f8 sys/arch/evbarm/stand/gzboot/Makefile.gzboot
--- a/sys/arch/evbarm/stand/gzboot/Makefile.gzboot      Wed Feb 22 12:44:21 2017 +0000
+++ b/sys/arch/evbarm/stand/gzboot/Makefile.gzboot      Wed Feb 22 12:51:38 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.gzboot,v 1.34 2016/03/01 16:08:22 joerg Exp $
+#      $NetBSD: Makefile.gzboot,v 1.35 2017/02/22 12:51:38 maya Exp $
 
 NOMAN=  # defined
 
@@ -39,11 +39,7 @@
 CPPFLAGS+= -I${S} -I${S}/arch -I${S}/lib/libsa
 CPPFLAGS+= -I${S}/../common/dist/zlib
 CPPFLAGS+= ${ARM_APCS_FLAGS}
-.if ${HAVE_LLVM:Uno} != "no" || ${HAVE_GCC:U0} >= 48
 CPPFLAGS+=     -marm
-.else
-CPPFLAGS+=     -mno-thumb -mno-thumb-interwork
-.endif
 
 CPPFLAGS+= -D_STANDALONE
 
diff -r e74f67388e32 -r 5fe40d66b6f8 sys/arch/zaurus/stand/zboot/Makefile
--- a/sys/arch/zaurus/stand/zboot/Makefile      Wed Feb 22 12:44:21 2017 +0000
+++ b/sys/arch/zaurus/stand/zboot/Makefile      Wed Feb 22 12:51:38 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.18 2016/01/31 15:32:12 christos Exp $
+#      $NetBSD: Makefile,v 1.19 2017/02/22 12:51:38 maya Exp $
 
 PROG=          zboot
 
@@ -22,11 +22,7 @@
 CPPFLAGS+=     -D_STANDALONE -DHEAP_VARIABLE
 CPPFLAGS+=     -DLIBSA_ENABLE_LS_OP
 CPPFLAGS+=     ${ARM_APCS_FLAGS} -mcpu=xscale
-.if ${HAVE_LLVM:Uno} != "no" || ${HAVE_GCC:U0} >= 48
 CPPFLAGS+=     -marm
-.else
-CPPFLAGS+=     -mno-thumb -mno-thumb-interwork
-.endif
 CPUFLAGS=
 AFLAGS+=       -D_LOCORE
 LDFLAGS+=      -nostdlib -Bstatic