[src/trunk]: src/sys/arch/evbarm/stand gcc will supply -Wa, -eabi=gnu so don't...

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

details:   https://anonhg.NetBSD.org/src/rev/894fef824fbd
branches:  trunk
changeset: 784702:894fef824fbd
user:      matt <matt%NetBSD.org@localhost>
date:      Wed Feb 06 07:19:19 2013 +0000

description:
gcc will supply -Wa,-eabi=gnu so don't include.  Use -mabi=apcs-base, not atpcs

diffstat:

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

diffs (55 lines):

diff -r a527f1c0fae0 -r 894fef824fbd sys/arch/evbarm/stand/boot2440/Makefile
--- a/sys/arch/evbarm/stand/boot2440/Makefile   Wed Feb 06 07:18:15 2013 +0000
+++ b/sys/arch/evbarm/stand/boot2440/Makefile   Wed Feb 06 07:19:19 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2013/02/05 03:17:50 matt Exp $
+#      $NetBSD: Makefile,v 1.7 2013/02/06 07:19:19 matt Exp $
 
 S=             ${.CURDIR}/../../../..
 
@@ -14,8 +14,7 @@
 CPPFLAGS+=     -DDM9000MAC="0x08,0x08,0x11,0x18,0x12,0x27" 
 CPPFLAGS+=     -DDEFAULT_BOOTFILE="ld0a:netbsd;net:"
 CPPFLAGS+=     -nostdinc -I. -I${.OBJDIR} -I${S} -I${S}/arch
-CPPFLAGS+=     -march=armv4 -mabi=atpcs -mfloat-abi=soft
-CPUFLAGS+=     -Wa,-meabi=gnu
+CPPFLAGS+=     -march=armv4 -mabi=apcs-gnu -mfloat-abi=soft
 DBG=           
 
 LIBCRT0=       # nothing
diff -r a527f1c0fae0 -r 894fef824fbd sys/arch/evbarm/stand/bootimx23/Makefile
--- a/sys/arch/evbarm/stand/bootimx23/Makefile  Wed Feb 06 07:18:15 2013 +0000
+++ b/sys/arch/evbarm/stand/bootimx23/Makefile  Wed Feb 06 07:19:19 2013 +0000
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.3 2013/02/05 07:28:48 matt Exp $
+# $Id: Makefile,v 1.4 2013/02/06 07:19:19 matt Exp $
 
 S=             ${.CURDIR}/../../../../
 PROG=          bootimx23
@@ -11,7 +11,7 @@
 CFLAGS+=       -Wall -Wno-main -ffreestanding -march=armv5te -mtune=arm926ej-s
 CPPFLAGS+=     -D_STANDALONE
 CPPFLAGS+=     -nostdinc -I. -I${.CURDIR} -I${.OBJDIR} -I${S} -I${S}/arch
-CPPFLAGS+=     -mabi=atpcs -mfloat-abi=soft -Wa,-meabi=gnu
+CPPFLAGS+=     -mabi=apcs-gnu -mfloat-abi=soft
 #CPPFLAGS+=    -DDEBUG
 #DBG=          -g
 
diff -r a527f1c0fae0 -r 894fef824fbd sys/arch/evbarm/stand/gzboot/Makefile.gzboot
--- a/sys/arch/evbarm/stand/gzboot/Makefile.gzboot      Wed Feb 06 07:18:15 2013 +0000
+++ b/sys/arch/evbarm/stand/gzboot/Makefile.gzboot      Wed Feb 06 07:19:19 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.gzboot,v 1.21 2013/02/05 03:17:51 matt Exp $
+#      $NetBSD: Makefile.gzboot,v 1.22 2013/02/06 07:19:19 matt Exp $
 
 NOMAN=  # defined
 
@@ -35,7 +35,7 @@
 CPPFLAGS+= -nostdinc -I. -I${EVBARM_STAND}/gzboot -I${EVBARM_STAND}/board
 CPPFLAGS+= -I${S} -I${S}/arch -I${S}/lib/libsa
 CPPFLAGS+= -I${S}/../common/dist/zlib
-CPPFLAGS+= -mabi=atpcs -mfloat-abi=soft -Wa,-meabi=gnu
+CPPFLAGS+= -mabi=apcs-gnu -mfloat-abi=soft
 
 CPPFLAGS+= -D_STANDALONE