Ticket #3298: buildtools_gcc2_misc.patch

legacy/gcc/Makefile.in

@@ -141 +141 @@
     then echo $$r/m4/m4 ; \
     else echo ${DEFAULT_M4} ; fi`
 
-MAKEINFO = `if [ -f $$r/texinfo/makeinfo/Makefile ] ; \
-    then echo $$r/texinfo/makeinfo/makeinfo ; \
-    else echo makeinfo ; fi`
+MAKEINFO = `if [ -x /usr/bin/makeinfo ] ; \
+    then echo makeinfo ; \
+    else echo $$r/texinfo/makeinfo/makeinfo ; fi`
 
 # This just becomes part of the MAKEINFO definition passed down to
 # sub-makes.  It lets flags be given on the command line while still

legacy/gcc/gcc/configure

@@ -3597 +3597 @@
         tm_file=i386/freebsd.h
         tmake_file=t-freebsd
         ;;
+    i[34567]86-*-darwin*)
+        tm_file=i386/freebsd.h
+        tmake_file=t-freebsd
+        ;;
     i[34567]86-*-netbsd*)
         tm_file=i386/netbsd.h
         tmake_file=t-netbsd

legacy/gcc/gcc/configure.in

@@ -1206 +1206 @@
         tmake_file=t-freebsd
         ;;
 changequote(,)dnl
+    i[34567]86-*-darwin*)
+changequote([,])dnl
+        tm_file=i386/freebsd.h
+        tmake_file=t-freebsd
+        ;;
+changequote(,)dnl
     i[34567]86-*-netbsd*)
 changequote([,])dnl
         tm_file=i386/netbsd.h

legacy/gcc/gcc/config/i386/i386.c

@@ -139 +139 @@
 #define AT_BP(mode) (gen_rtx_MEM ((mode), frame_pointer_rtx))
 
 extern FILE *asm_out_file;
+#ifndef __APPLE__
 extern char *strcat ();
+#endif
 
 static void ix86_epilogue PROTO((int));
 static void ix86_prologue PROTO((int));