Module Name: src
Committed By: maya
Date: Wed Feb 22 12:51:38 UTC 2017
Modified Files:
src/sys/arch/evbarm/stand/gzboot: Makefile.gzboot
src/sys/arch/zaurus/stand/zboot: Makefile
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/zaurus/stand/zboot/Makefile
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/evbarm/stand/gzboot/Makefile.gzboot
diff -u src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.34 src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.35
--- src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.34 Tue Mar 1 16:08:22 2016
+++ src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot Wed Feb 22 12:51:38 2017
@@ -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+= -nostdinc -I. -I${EVBARM_STAN
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
Index: src/sys/arch/zaurus/stand/zboot/Makefile
diff -u src/sys/arch/zaurus/stand/zboot/Makefile:1.18 src/sys/arch/zaurus/stand/zboot/Makefile:1.19
--- src/sys/arch/zaurus/stand/zboot/Makefile:1.18 Sun Jan 31 15:32:12 2016
+++ src/sys/arch/zaurus/stand/zboot/Makefile Wed Feb 22 12:51:38 2017
@@ -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+= -nostdinc -I. -I${.CURDIR} -I
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
