Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/amiga/stand/bootblock/boot unbreak gcc4.5



details:   https://anonhg.NetBSD.org/src/rev/8c868f31d88e
branches:  trunk
changeset: 795573:8c868f31d88e
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Apr 19 00:04:12 2014 +0000

description:
unbreak gcc4.5

diffstat:

 sys/arch/amiga/stand/bootblock/boot/Makefile |  9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diffs (27 lines):

diff -r 0b8d568a473c -r 8c868f31d88e sys/arch/amiga/stand/bootblock/boot/Makefile
--- a/sys/arch/amiga/stand/bootblock/boot/Makefile      Fri Apr 18 23:50:59 2014 +0000
+++ b/sys/arch/amiga/stand/bootblock/boot/Makefile      Sat Apr 19 00:04:12 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.50 2014/03/29 12:52:56 mlelstv Exp $
+#      $NetBSD: Makefile,v 1.51 2014/04/19 00:04:12 christos Exp $
 
 .include <bsd.own.mk>
 .include <bsd.sys.mk>          # for HOST_SH
@@ -81,11 +81,16 @@
 INCPATH += -I${.CURDIR}/../../.. -I${.OBJDIR}
 INCPATH += -I${.CURDIR}/../elf2bb
 
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 48
 AFLAGS += -mcpu=68030 -l
 CAFLAGS += -Wa,-l -Wa,-mcpu=68030 ${INCPATH}
+.else
+AFLAGS += -m68030 -l
+CAFLAGS += -Wa,-l -Wa,-m68030 ${INCPATH}
+.endif
 
 COPTIM= -Os -fomit-frame-pointer -fcse-follow-jumps -fcse-skip-blocks
-COPTIM+= -Wa,-l -m68060 -Wa,-mcpu=68030 -fno-unwind-tables
+COPTIM+= -m68060 ${CAFLAGS} -fno-unwind-tables
 CFLAGS= -ffreestanding ${COPTIM} ${INCPATH} ${DEFS}
 CFLAGS+= -Werror
 CFLAGS+= -Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith



Home | Main Index | Thread Index | Old Index