Module Name: src
Committed By: msaitoh
Date: Tue May 26 02:22:00 UTC 2015
Modified Files:
src/sys/arch/amiga/conf [netbsd-7]: Makefile.amiga
Log Message:
Pull up following revision(s) (requested by mlelstv in ticket #804):
sys/arch/amiga/conf/Makefile.amiga: revision 1.108
Don't use conflicting parameters for compiler and assembler.
To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.107.30.1 src/sys/arch/amiga/conf/Makefile.amiga
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/conf/Makefile.amiga
diff -u src/sys/arch/amiga/conf/Makefile.amiga:1.107 src/sys/arch/amiga/conf/Makefile.amiga:1.107.30.1
--- src/sys/arch/amiga/conf/Makefile.amiga:1.107 Fri Jan 21 15:59:05 2011
+++ src/sys/arch/amiga/conf/Makefile.amiga Tue May 26 02:22:00 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.amiga,v 1.107 2011/01/21 15:59:05 joerg Exp $
+# $NetBSD: Makefile.amiga,v 1.107.30.1 2015/05/26 02:22:00 msaitoh Exp $
# Makefile for NetBSD
#
@@ -34,7 +34,7 @@ GENASSYM_CONF= ${AMIGA}/amiga/genassym.c
CPPFLAGS+= -Damiga -DFPCOPROC
.if !defined(CMACHFLAGS)
.include "$S/arch/m68k/Makefile.cmachflags"
-CMACHFLAGS+= -Wa,-m68030 -Wa,-m68851
+CMACHFLAGS+= -Wa,-mcpu=68030 -Wa,-m68851
.endif
CFLAGS+= ${CMACHFLAGS} -msoft-float
AFLAGS+= -x assembler-with-cpp
