[src/trunk]: src/sys/arch/evbarm/stand -mno-thumb-interwork is the default, a...

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

details:   https://anonhg.NetBSD.org/src/rev/f6afcd84a79e
branches:  trunk
changeset: 791104:f6afcd84a79e
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Nov 04 21:18:05 2013 +0000

description:
-mno-thumb-interwork is the default, and there is no -mthumb in gcc 4.8

diffstat:

 sys/arch/evbarm/stand/boot2440/Makefile      |  4 +++-
 sys/arch/evbarm/stand/bootimx23/Makefile     |  4 +++-
 sys/arch/evbarm/stand/gzboot/Makefile.gzboot |  4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diffs (57 lines):

diff -r 7b878300386e -r f6afcd84a79e sys/arch/evbarm/stand/boot2440/Makefile
--- a/sys/arch/evbarm/stand/boot2440/Makefile   Mon Nov 04 21:08:14 2013 +0000
+++ b/sys/arch/evbarm/stand/boot2440/Makefile   Mon Nov 04 21:18:05 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.11 2013/08/21 05:59:14 matt Exp $
+#      $NetBSD: Makefile,v 1.12 2013/11/04 21:18:05 christos Exp $
 
 S=             ${.CURDIR}/../../../..
 
@@ -16,7 +16,9 @@
 CPPFLAGS+=     -DDEFAULT_BOOTFILE="ld0a:netbsd;net:"
 CPPFLAGS+=     -nostdinc -I. -I${.OBJDIR} -I${S} -I${S}/arch
 CPPFLAGS+=     -march=armv4 -mabi=apcs-gnu -mfloat-abi=soft
+.if ${HAVE_GCC} < 48
 CPPFLAGS+=     -mno-thumb -mno-thumb-interwork
+.endif
 CPUFLAGS=
 DBG=           -Os
 
diff -r 7b878300386e -r f6afcd84a79e sys/arch/evbarm/stand/bootimx23/Makefile
--- a/sys/arch/evbarm/stand/bootimx23/Makefile  Mon Nov 04 21:08:14 2013 +0000
+++ b/sys/arch/evbarm/stand/bootimx23/Makefile  Mon Nov 04 21:18:05 2013 +0000
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.8 2013/10/07 17:36:40 matt Exp $
+# $Id: Makefile,v 1.9 2013/11/04 21:18:05 christos Exp $
 
 S=             ${.CURDIR}/../../../../
 PROG=          bootimx23
@@ -13,7 +13,9 @@
 CPPFLAGS+=     -DKERNEL_BOOT_ARGS=\"root=ld0a\"
 CPPFLAGS+=     -nostdinc -I. -I${.CURDIR} -I${.OBJDIR} -I${S} -I${S}/arch
 CPPFLAGS+=     -mabi=apcs-gnu -mfloat-abi=soft
+.if ${HAVE_GCC} < 48
 CPPFLAGS+=     -mno-thumb -mno-thumb-interwork
+.endif
 #CPPFLAGS+=    -DDEBUG
 #CPPFLAGS+=    -DDIAGNOSTIC
 DBG=           -g
diff -r 7b878300386e -r f6afcd84a79e sys/arch/evbarm/stand/gzboot/Makefile.gzboot
--- a/sys/arch/evbarm/stand/gzboot/Makefile.gzboot      Mon Nov 04 21:08:14 2013 +0000
+++ b/sys/arch/evbarm/stand/gzboot/Makefile.gzboot      Mon Nov 04 21:18:05 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.gzboot,v 1.25 2013/08/21 05:55:26 matt Exp $
+#      $NetBSD: Makefile.gzboot,v 1.26 2013/11/04 21:18:06 christos Exp $
 
 NOMAN=  # defined
 
@@ -37,7 +37,9 @@
 CPPFLAGS+= -I${S} -I${S}/arch -I${S}/lib/libsa
 CPPFLAGS+= -I${S}/../common/dist/zlib
 CPPFLAGS+= -mabi=apcs-gnu -mfloat-abi=soft
+.if ${HAVE_GCC} < 48
 CPPFLAGS+= -mno-thumb -mno-thumb-interwork
+.ebdif
 
 CPPFLAGS+= -D_STANDALONE