6 files changed, 62 insertions, 18 deletions
diff --git a/cross/m68k-netbsd/Makefile b/cross/m68k-netbsd/Makefile
index 59b1f3d7924..1f3d8f0d940 100644
--- a/cross/m68k-netbsd/Makefile
+++ b/cross/m68k-netbsd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/16 14:05:01 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/05/27 15:17:36 dmcmahill Exp $
 #
 
 DISTVERSION=		1.3.0.0
@@ -18,4 +18,6 @@ EGCS_FAKE_RUNTIME=	yes
 
 TARGET_ARCH=		m68k-netbsd
 
+MAKE_ENV+=		MACHINE_ARCH=${MACHINE_ARCH}
+
 .include "../COMMON/cross.mk"
diff --git a/cross/m68k-netbsd/distinfo b/cross/m68k-netbsd/distinfo
index fc3113b4050..6d8ce99a1fd 100644
--- a/cross/m68k-netbsd/distinfo
+++ b/cross/m68k-netbsd/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 09:36:25 skrll Exp $
+$NetBSD: distinfo,v 1.3 2001/05/27 15:17:36 dmcmahill Exp $
 
 SHA1 (binutils-2.9.1.tar.gz) = 9df3cdcd34f81118ee403f8794b277ad28a57e14
 Size (binutils-2.9.1.tar.gz) = 5694541 bytes
@@ -6,4 +6,4 @@ SHA1 (egcs-1.1.1.tar.gz) = 381f6c15ab042a4d3605490c29620ea5ad5592a6
 Size (egcs-1.1.1.tar.gz) = 11604853 bytes
 SHA1 (egcs-1.1.1-NetBSD-19980104.diff.gz) = 85ebc334bf9472b9595c4348a6bc440e836b922a
 Size (egcs-1.1.1-NetBSD-19980104.diff.gz) = 59770 bytes
-SHA1 (patch-aa) = 1f1626fa45e904971b87725d7f8ca650d8220cba
+SHA1 (patch-aa) = 3537031f77c5921c4331fd5f7a79dbf237466566
diff --git a/cross/m68k-netbsd/patches/patch-aa b/cross/m68k-netbsd/patches/patch-aa
index 28aaa95c9da..f17316da744 100644
--- a/cross/m68k-netbsd/patches/patch-aa
+++ b/cross/m68k-netbsd/patches/patch-aa
@@ -1,13 +1,33 @@
-$NetBSD: patch-aa,v 1.1 2000/09/29 00:36:41 fredb Exp $
+$NetBSD: patch-aa,v 1.2 2001/05/27 15:17:37 dmcmahill Exp $
 
---- gas/Makefile.in.orig	Fri May  1 10:45:03 1998
-+++ gas/Makefile.in	Thu Sep 28 18:44:51 2000
-@@ -87,7 +87,7 @@
- 
+work around a compiler bug (shocked i know) when building the
+m68k cross assembler on alpha.  Without optimization gas gives
+the same results as on a real m68k box (NetBSD/mac68k).  With
+optimization, gas crashes.
+
+--- gas/Makefile.in.orig	Fri May 18 18:00:52 2001
++++ gas/Makefile.in	Fri May 18 22:18:04 2001
+@@ -88,5 +88,5 @@
  tooldir = $(exec_prefix)/$(target_alias)
  
 -YACC = `if [ -f ../bison/bison ] ; then echo ../bison/bison -y -L../bison/bison ; else echo bison -y ; fi`
 +YACC = @YACC@
  LEX = `if [ -f ../flex/flex ] ; then echo ../flex/flex ;  else echo flex ; fi`
  
- DEP = mkdep
+@@ -1220,5 +1220,15 @@
+ LEXLIB = @LEXLIB@
+ YLWRAP = $(top_srcdir)/../ylwrap
+-CFLAGS = @CFLAGS@
++ALLCFLAGS = @CFLAGS@
++ifeq (${MACHINE_ARCH},alpha)
++ifeq (${TARG_CPU},m68k)
++CFLAGS=${ALLCFLAGS:-O%=}
++else
++CFLAGS=${ALLCFLAGS}
++endif
++else
++CFLAGS=${ALLCFLAGS}
++endif
++
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
diff --git a/cross/m68k-netbsdelf/Makefile b/cross/m68k-netbsdelf/Makefile
index 7778d0ca4f6..66ae8db45ef 100644
--- a/cross/m68k-netbsdelf/Makefile
+++ b/cross/m68k-netbsdelf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/16 14:05:02 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/05/27 15:17:37 dmcmahill Exp $
 #
 
 DISTVERSION=		1.3.0.0
@@ -18,4 +18,6 @@ EGCS_FAKE_RUNTIME=	yes
 
 TARGET_ARCH=		m68k-netbsdelf
 
+MAKE_ENV+=		MACHINE_ARCH=${MACHINE_ARCH}
+
 .include "../COMMON/cross.mk"
diff --git a/cross/m68k-netbsdelf/distinfo b/cross/m68k-netbsdelf/distinfo
index 7baf01e2325..099ef90f65a 100644
--- a/cross/m68k-netbsdelf/distinfo
+++ b/cross/m68k-netbsdelf/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 09:36:25 skrll Exp $
+$NetBSD: distinfo,v 1.3 2001/05/27 15:17:37 dmcmahill Exp $
 
 SHA1 (binutils-2.9.1.tar.gz) = 9df3cdcd34f81118ee403f8794b277ad28a57e14
 Size (binutils-2.9.1.tar.gz) = 5694541 bytes
@@ -6,7 +6,7 @@ SHA1 (egcs-1.1.1.tar.gz) = 381f6c15ab042a4d3605490c29620ea5ad5592a6
 Size (egcs-1.1.1.tar.gz) = 11604853 bytes
 SHA1 (egcs-1.1.1-NetBSD-19980104.diff.gz) = 85ebc334bf9472b9595c4348a6bc440e836b922a
 Size (egcs-1.1.1-NetBSD-19980104.diff.gz) = 59770 bytes
-SHA1 (patch-aa) = 1f1626fa45e904971b87725d7f8ca650d8220cba
+SHA1 (patch-aa) = 3537031f77c5921c4331fd5f7a79dbf237466566
 SHA1 (patch-ab) = 8091aaf43bfe0a167e1696bc68c0453d51867ff9
 SHA1 (patch-ac) = 050731c930f36db5afb961353b073b41783c5972
 SHA1 (patch-ad) = 52b7a7f0cdbca1a6e93cf5e65a49f4d08dee4bfe
diff --git a/cross/m68k-netbsdelf/patches/patch-aa b/cross/m68k-netbsdelf/patches/patch-aa
index 9b2ec54d060..4ff6e3f9456 100644
--- a/cross/m68k-netbsdelf/patches/patch-aa
+++ b/cross/m68k-netbsdelf/patches/patch-aa
@@ -1,13 +1,33 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/01/24 12:03:04 tsutsui Exp $
+$NetBSD: patch-aa,v 1.2 2001/05/27 15:17:38 dmcmahill Exp $
 
---- gas/Makefile.in.orig	Fri May  1 10:45:03 1998
-+++ gas/Makefile.in	Thu Sep 28 18:44:51 2000
-@@ -87,7 +87,7 @@
- 
+work around a compiler bug (shocked i know) when building the
+m68k cross assembler on alpha.  Without optimization gas gives
+the same results as on a real m68k box (NetBSD/mac68k).  With
+optimization, gas crashes.
+
+--- gas/Makefile.in.orig	Fri May 18 18:00:52 2001
++++ gas/Makefile.in	Fri May 18 22:18:04 2001
+@@ -88,5 +88,5 @@
  tooldir = $(exec_prefix)/$(target_alias)
  
 -YACC = `if [ -f ../bison/bison ] ; then echo ../bison/bison -y -L../bison/bison ; else echo bison -y ; fi`
 +YACC = @YACC@
  LEX = `if [ -f ../flex/flex ] ; then echo ../flex/flex ;  else echo flex ; fi`
  
- DEP = mkdep
+@@ -1220,5 +1220,15 @@
+ LEXLIB = @LEXLIB@
+ YLWRAP = $(top_srcdir)/../ylwrap
+-CFLAGS = @CFLAGS@
++ALLCFLAGS = @CFLAGS@
++ifeq (${MACHINE_ARCH},alpha)
++ifeq (${TARG_CPU},m68k)
++CFLAGS=${ALLCFLAGS:-O%=}
++else
++CFLAGS=${ALLCFLAGS}
++endif
++else
++CFLAGS=${ALLCFLAGS}
++endif
++
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)