Module Name: src
Committed By: mlelstv
Date: Sat Mar 29 12:52:56 UTC 2014
Modified Files:
src/sys/arch/amiga/stand/bootblock/boot: Makefile
src/sys/arch/amiga/stand/bootblock/bootxx_ffs: Makefile
src/sys/arch/amiga/stand/bootblock/ppcboot: Makefile
Log Message:
Use different option (-mcpu=68030) to select target cpu for the assembler.
The old option (-m68030) causes it to complain about features used that
are not provided by the target cpu.
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/amiga/stand/bootblock/boot/Makefile
cvs rdiff -u -r1.20 -r1.21 \
src/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile
cvs rdiff -u -r1.11 -r1.12 \
src/sys/arch/amiga/stand/bootblock/ppcboot/Makefile
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/amiga/stand/bootblock/boot/Makefile
diff -u src/sys/arch/amiga/stand/bootblock/boot/Makefile:1.49 src/sys/arch/amiga/stand/bootblock/boot/Makefile:1.50
--- src/sys/arch/amiga/stand/bootblock/boot/Makefile:1.49 Wed Aug 21 08:04:50 2013
+++ src/sys/arch/amiga/stand/bootblock/boot/Makefile Sat Mar 29 12:52:56 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2013/08/21 08:04:50 matt Exp $
+# $NetBSD: Makefile,v 1.50 2014/03/29 12:52:56 mlelstv Exp $
.include <bsd.own.mk>
.include <bsd.sys.mk> # for HOST_SH
@@ -81,11 +81,11 @@ INCPATH += -I${.CURDIR}
INCPATH += -I${.CURDIR}/../../.. -I${.OBJDIR}
INCPATH += -I${.CURDIR}/../elf2bb
-AFLAGS += -m68030 -l
-CAFLAGS += -Wa,-l -Wa,-m68030 ${INCPATH}
+AFLAGS += -mcpu=68030 -l
+CAFLAGS += -Wa,-l -Wa,-mcpu=68030 ${INCPATH}
COPTIM= -Os -fomit-frame-pointer -fcse-follow-jumps -fcse-skip-blocks
-COPTIM+= -Wa,-l -m68060 -Wa,-m68030 -fno-unwind-tables
+COPTIM+= -Wa,-l -m68060 -Wa,-mcpu=68030 -fno-unwind-tables
CFLAGS= -ffreestanding ${COPTIM} ${INCPATH} ${DEFS}
CFLAGS+= -Werror
CFLAGS+= -Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith
Index: src/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile
diff -u src/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile:1.20 src/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile:1.21
--- src/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile:1.20 Wed Aug 21 08:04:50 2013
+++ src/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile Sat Mar 29 12:52:56 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2013/08/21 08:04:50 matt Exp $
+# $NetBSD: Makefile,v 1.21 2014/03/29 12:52:56 mlelstv Exp $
### what we need:
@@ -53,10 +53,10 @@ INCPATH += -I${.CURDIR}/../boot -I${.CUR
INCPATH += -I${.CURDIR}/../elf2bb -I${.OBJDIR}
AFLAGS += -m68030 -l
-CAFLAGS += -Wa,-l -Wa,-m68030 ${INCPATH} -D_PRIMARY_BOOT
+CAFLAGS += -Wa,-l -Wa,-mcpu=68030 ${INCPATH} -D_PRIMARY_BOOT
COPTIM= -Os -fomit-frame-pointer -fcse-follow-jumps -fcse-skip-blocks
-COPTIM+= -Wa,-l -m68060 -Wa,-m68030 -fno-unwind-tables
+COPTIM+= -Wa,-l -m68060 -Wa,-mcpu=68030 -fno-unwind-tables
CFLAGS= -ffreestanding ${COPTIM} ${INCPATH} ${DEFS} -Wall #-Wstrict-prototypes
NETBSD_VERS!= ${HOST_SH} ${.CURDIR}/../../../../../conf/osrelease.sh
Index: src/sys/arch/amiga/stand/bootblock/ppcboot/Makefile
diff -u src/sys/arch/amiga/stand/bootblock/ppcboot/Makefile:1.11 src/sys/arch/amiga/stand/bootblock/ppcboot/Makefile:1.12
--- src/sys/arch/amiga/stand/bootblock/ppcboot/Makefile:1.11 Tue Mar 18 18:20:40 2014
+++ src/sys/arch/amiga/stand/bootblock/ppcboot/Makefile Sat Mar 29 12:52:56 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2014/03/18 18:20:40 riastradh Exp $
+# $NetBSD: Makefile,v 1.12 2014/03/29 12:52:56 mlelstv Exp $
### what we need:
@@ -41,10 +41,10 @@ all: ${FILES}
INCPATH = -I${DIR_TOP} -I${DIR_TOP}/lib/libsa -I${DIR_BOOT} -I${.CURDIR} -I${.CURDIR}/../../.. -I${.CURDIR}/../elf2bb -I${.OBJDIR}
AFLAGS += -m68030 -l
-CAFLAGS += -Wa,-l -Wa,-m68030 ${INCPATH}
+CAFLAGS += -Wa,-l -Wa,-mcpu=68030 ${INCPATH}
COPTIM= -Os -fomit-frame-pointer -fcse-follow-jumps -fcse-skip-blocks
-COPTIM+= -Wa,-l -m68060 -Wa,-m68030 -fno-unwind-tables
+COPTIM+= -Wa,-l -m68060 -Wa,-mcpu=68030 -fno-unwind-tables
CFLAGS= -ffreestanding ${COPTIM} ${INCPATH} ${DEFS} -Wall #-Wstrict-prototypes
.c.o:
