Module Name: src
Committed By: christos
Date: Mon Nov 4 21:25:05 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:
explicitly add -marm
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/stand/boot2440/Makefile
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/stand/bootimx23/Makefile
cvs rdiff -u -r1.26 -r1.27 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.12 src/sys/arch/evbarm/stand/boot2440/Makefile:1.13
--- src/sys/arch/evbarm/stand/boot2440/Makefile:1.12 Mon Nov 4 16:18:05 2013
+++ src/sys/arch/evbarm/stand/boot2440/Makefile Mon Nov 4 16:25:05 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2013/11/04 21:18:05 christos Exp $
+# $NetBSD: Makefile,v 1.13 2013/11/04 21:25:05 christos Exp $
S= ${.CURDIR}/../../../..
@@ -18,6 +18,8 @@ CPPFLAGS+= -nostdinc -I. -I${.OBJDIR} -I
CPPFLAGS+= -march=armv4 -mabi=apcs-gnu -mfloat-abi=soft
.if ${HAVE_GCC} < 48
CPPFLAGS+= -mno-thumb -mno-thumb-interwork
+.else
+CPPFLAGS+= -marm
.endif
CPUFLAGS=
DBG= -Os
Index: src/sys/arch/evbarm/stand/bootimx23/Makefile
diff -u src/sys/arch/evbarm/stand/bootimx23/Makefile:1.9 src/sys/arch/evbarm/stand/bootimx23/Makefile:1.10
--- src/sys/arch/evbarm/stand/bootimx23/Makefile:1.9 Mon Nov 4 16:18:05 2013
+++ src/sys/arch/evbarm/stand/bootimx23/Makefile Mon Nov 4 16:25:05 2013
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.9 2013/11/04 21:18:05 christos Exp $
+# $Id: Makefile,v 1.10 2013/11/04 21:25:05 christos Exp $
S= ${.CURDIR}/../../../../
PROG= bootimx23
@@ -15,6 +15,8 @@ CPPFLAGS+= -nostdinc -I. -I${.CURDIR} -I
CPPFLAGS+= -mabi=apcs-gnu -mfloat-abi=soft
.if ${HAVE_GCC} < 48
CPPFLAGS+= -mno-thumb -mno-thumb-interwork
+.else
+CPPFLAGS+= -marm
.endif
#CPPFLAGS+= -DDEBUG
#CPPFLAGS+= -DDIAGNOSTIC
Index: src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot
diff -u src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.26 src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.27
--- src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.26 Mon Nov 4 16:18:06 2013
+++ src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot Mon Nov 4 16:25:05 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.gzboot,v 1.26 2013/11/04 21:18:06 christos Exp $
+# $NetBSD: Makefile.gzboot,v 1.27 2013/11/04 21:25:05 christos Exp $
NOMAN= # defined
@@ -39,7 +39,9 @@ CPPFLAGS+= -I${S}/../common/dist/zlib
CPPFLAGS+= -mabi=apcs-gnu -mfloat-abi=soft
.if ${HAVE_GCC} < 48
CPPFLAGS+= -mno-thumb -mno-thumb-interwork
-.ebdif
+.else
+CPPFLAGS+= -marm
+.endif
CPPFLAGS+= -D_STANDALONE
