Module Name: src
Committed By: christos
Date: Mon Nov 4 21:18:06 UTC 2013
Modified Files:
src/sys/arch/evbarm/stand/boot2440: Makefile
src/sys/arch/evbarm/stand/bootimx23: Makefile
src/sys/arch/evbarm/stand/gzboot: Makefile.gzboot
Log Message:
-mno-thumb-interwork is the default, and there is no -mthumb in gcc 4.8
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/stand/boot2440/Makefile
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/stand/bootimx23/Makefile
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot
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/boot2440/Makefile
diff -u src/sys/arch/evbarm/stand/boot2440/Makefile:1.11 src/sys/arch/evbarm/stand/boot2440/Makefile:1.12
--- src/sys/arch/evbarm/stand/boot2440/Makefile:1.11 Wed Aug 21 01:59:14 2013
+++ src/sys/arch/evbarm/stand/boot2440/Makefile Mon Nov 4 16:18:05 2013
@@ -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+= -DDM9000MAC="0x08,0x08,0x11,0
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
Index: src/sys/arch/evbarm/stand/bootimx23/Makefile
diff -u src/sys/arch/evbarm/stand/bootimx23/Makefile:1.8 src/sys/arch/evbarm/stand/bootimx23/Makefile:1.9
--- src/sys/arch/evbarm/stand/bootimx23/Makefile:1.8 Mon Oct 7 13:36:40 2013
+++ src/sys/arch/evbarm/stand/bootimx23/Makefile Mon Nov 4 16:18:05 2013
@@ -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+= -D_STANDALONE -DMEMSIZE=64
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
Index: src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot
diff -u src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.25 src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.26
--- src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.25 Wed Aug 21 01:55:26 2013
+++ src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot Mon Nov 4 16:18:06 2013
@@ -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+= -nostdinc -I. -I${EVBARM_STAN
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
