[src/netbsd-7]: src/sys/arch/amiga/conf Pull up following revision(s) (reques...

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

details:   https://anonhg.NetBSD.org/src/rev/cf241863932c
branches:  netbsd-7
changeset: 799376:cf241863932c
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Tue May 26 02:22:00 2015 +0000

description:
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.

diffstat:

 sys/arch/amiga/conf/Makefile.amiga |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r 20021d2b559a -r cf241863932c sys/arch/amiga/conf/Makefile.amiga
--- a/sys/arch/amiga/conf/Makefile.amiga        Tue May 26 01:37:06 2015 +0000
+++ b/sys/arch/amiga/conf/Makefile.amiga        Tue May 26 02:22:00 2015 +0000
@@ -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 @@
 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