? aix.diff
? apollo.diff
? p1.patch
? p2.patch
? p3.patch
? p4.patch
Index: configure
===================================================================
RCS file: /cvs/gcc/gcc/configure,v
retrieving revision 1.46.6.3
diff -u -r1.46.6.3 configure
--- configure	10 Nov 2002 21:14:18 -0000	1.46.6.3
+++ configure	10 Nov 2002 21:22:26 -0000
@@ -1037,7 +1037,8 @@
   AR_FOR_TARGET=${AR_FOR_TARGET}${extra_arflags_for_target}
   AS=as
   AS_FOR_TARGET='\$(USUAL_AS_FOR_TARGET)'
-  BISON='$(USUAL_BISON)'
+  # default to previously set bison: workaround for m68k-apollo-bsd
+  BISON=${BISON-'\$(USUAL_BISON)'}
   CC_FOR_BUILD='\$(CC)'
   DLLTOOL=dlltool
   DLLTOOL_FOR_TARGET='\$(USUAL_DLLTOOL_FOR_TARGET)'
Index: configure.in
===================================================================
RCS file: /cvs/gcc/gcc/configure.in,v
retrieving revision 1.177.4.5
diff -u -r1.177.4.5 configure.in
--- configure.in	10 Nov 2002 21:14:18 -0000	1.177.4.5
+++ configure.in	10 Nov 2002 21:22:32 -0000
@@ -103,6 +103,12 @@
 
 # per-target:
 
+# This is a irritating workaround for m68k-apollo-bsd,
+# which wants to use yacc for bison.
+case ${build} in
+  m68k-apollo-bsd*) BISON=yacc ;;
+esac
+
 # Define is_cross_compiler to save on calls to 'test'.
 is_cross_compiler=
 if test x"${host}" = x"${target}" ; then