A newer branch for fixinclude work.

Tag: fixincl-branch
 	ChangeLog Makefile.in configure.in


git-svn-id: https://gcc.gnu.org/svn/gcc/branches/fixincl-branch@24487 138bc75d-0d04-0410-961f-82ee72b054a4

3 files changed, 140 insertions, 144 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cc6eb67026c..8c5aa80e6cc 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -2193,6 +2193,108 @@ Fri Nov 13 11:02:11 1998  Stan Cox  <scox@cygnus.com>
 	* sparc.c (sparc_flat_compute_frame_size): Correctly calc args_size
 	in a leaf function.  Clarify total_size/extra_size relationship.
 
+=======
+I'm intentionally leaving the ChangeLogs conflicted during the merge.  robertl
+
+
+Mon Jan  4 11:19:58 PST 1999   Robert Lipe <robertlipe@usa.net>
+
+	* fixinc/Makefile.in : Remove RCS ident strings
+	* fixinc/fixincl.c: Likewise.
+	* fixinc/regex.h: Likewise.
+	* fixinc/hackshell.tpl: Likewise.
+	* fixinc/inclhack.tpl : Likewise.
+	* fixinc/regex.c: Likewise.
+	* fixinc/inclhack.def: Likewise.
+
+Tue Dec 15 07:26:00 1998  Bruce Korb <korb@datadesign.com>
+
+	* fixinc/server.[ch]: lowercased variable names and
+	switched the copyright holder name to the FSF.
+
+1998-12-10  Manfred Hollstein  <manfred@s-direktnet.de>
+
+	* configure.in: Add new configure var. "fixinc_defs"; set it to
+	force usage of the fixincl.sh shell script on m68k-motorola-sysv
+	and m88k-motorola-sysv3.
+	* configure: Regenerate.
+	* fixinc/Makefile.in (FIXINC_DEFS): Add new macro to be defined
+	by gcc's configure script.
+	(.c.o): Add $(FIXINC_DEFS) for compilation.
+	(regex.o): Likewise.
+
+	* fixinc/fixincl.c: #include <sys/types.h> before any other file
+	from sys/.
+	(FIXINC_BROKEN): Add code to force a compile error triggered by
+	the new FIXINC_DEFS/fixinc_defs macros.
+
+Tue Dec  1 12:40:00 1998  Bruce Korb <korb@datadesign.com>
+
+	* fixinc/fixincl.c (main): added retry count limit (10).
+	Also reduced BOGUS_LIMIT to 128.
+
+1998-11-25  Manfred Hollstein  <manfred@s-direktnet.de>
+
+	* fixinc/mkfixinc.sh (SHELL): Pass SHELL on the command line
+	when invoking $MAKE; this fixes a bug with SunOS' /bin/sh
+	not handling I/O redirection properly.
+
+	* fixinc/Makefile.in (LIBERTY): New macro where to find
+	libiberty.a.
+	(fixincl): Pass $(LIBERTY).
+
+Mon Nov 23 08:04:00 1998  Bruce Korb <korb@datadesign.com>
+
+	* Makefile.in (fixinc.sh): corrected "srcdir" that gets passed
+	to fixinc/mkfixinc.sh;  dropped unnecessary "mkdir" code.
+
+	* configure.in & configure & Makefile.in & fixinc/*: restored
+	clobbered updates.
+
+	* fixinc/fixincl.c (main): added test to ensure the program can
+	talk to a server shell before exiting successfully on a
+	"-v"ersion option invocation.
+
+1998-11-20  Manfred Hollstein  <manfred@s-direktnet.de>
+
+	* Makefile.in (fixinc.sh): Add dependency upon $(srcdir)/fixinc/mkfixinc.sh;
+	add appropriate code to use the fixinc/* files in gcc instead
+	of the old ones in contrib.
+	(stmp-fixinc): Comment non fast-fixinc version and provide
+	a suitable one for using fast-fixinc.
+
+	* fixinc/fixinc.dgux (INSTALL_ASSERT_H): Remove trailing ';'; add error
+	exit if copying assert.h fails.
+	* fixinc/fixinc.irix (INSTALL_ASSERT_H): Likewise.
+	* fixinc/fixinc.ptx (INSTALL_ASSERT_H): Likewise.
+	* fixinc/fixinc.sco (INSTALL_ASSERT_H): Likewise.
+	* fixinc/fixinc.svr4 (INSTALL_ASSERT_H): Likewise.
+	* fixinc/fixinc.winnt (INSTALL_ASSERT_H): Likewise.
+	* fixinc/fixinc.wrap (INSTALL_ASSERT_H): Likewise.
+	* fixinc/fixincl.sh (INSTALL_ASSERT_H): Likewise.
+	* fixinc/inclhack.tpl (INSTALL_ASSERT_H): Likewise.
+	* fixinc/inclhack.sh: Regenerate using autogen.
+
+1998-11-20  Bruce Korb <korb@datadesign.com>
+
+	* fixinc/mkfixinc.sh (srcdir): Look for source files in ${srcdir}
+	only; prefer "inclhack.sh" in the builddir over the srcdir
+	version.
+
+	* fixinc/fixincl.c (MINIMUM_MAXIMUM_LINES): Add definition.
+	(MAXPATHLEN): Add fallback definition for those systems that
+	don't define it.
+	(NAME_TABLE_SIZE): Add definition.
+	(pzFileNameBuf): Renamed from zFileNameBuf change it to
+	be a dynamically allocated pointer instead of a static array;
+	change all occurences of zFileNameBuf accordingly.
+	(main): Use BOGUS_LIMIT as an alias for MINIMUM_MAXIMUM_LINES.
+	* server.c (MAXPATHLEN): Add fallback definition for those systems
+	that don't define it.
+	(defArgs): Remove "-p" flag.
+
+### end fixinc hunk ###
+
 Thu Nov 12 19:20:57 1998  Geoffrey Noer  <noer@cygnus.com>
 
 	* i386/cygwin32.asm: Delete.
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index feb47dd41ba..7612b39e9af 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -411,10 +411,6 @@ INSTALL_HEADERS=install-headers
 # Options for tar when copying trees.  So HPUX can override it.
 TAROUTOPTS = xpBf
 
-# Select which version of fixincludes to use (I.E. regular versus SVR4)
-# This value is overridden directly by configure.
-FIXINCLUDES = @fixincludes@
-
 # Additional directories of header files to run fixincludes on.
 # These should be directories searched automatically by default
 # just as /usr/include is.
@@ -2057,33 +2053,37 @@ stmp-int-hdrs: stmp-fixinc $(USER_H) xlimits.h gfloat.h
 stmp-headers:
 	touch $@
 
-fixinc.sh :
-	DEST=`cd $(srcdir) ; pwd`/$@ CC=$(CC) MAKE=$(MAKE) CFLAGS="$(CFLAGS)" \
-	export DEST CC MAKE CFLAGS ; \
-	echo DEST=$$DEST CC=$$CC MAKE=$$MAKE CFLAGS=$$CFLAGS ; \
-	cd ../contrib/fixinc ;  \
-	$(SHELL) mkfixinc.sh $(target) $$DEST
+fixinc.sh: $(srcdir)/fixinc/mkfixinc.sh
+	MAKE="$(MAKE)"; srcdir=`cd $(srcdir)/fixinc; pwd` ; \
+	export MAKE srcdir ; \
+	cd ./fixinc; $(SHELL) $${srcdir}/mkfixinc.sh $(target)
+##stmp-fixinc: $(FIXINCLUDES) gsyslimits.h
+##	rm -rf include
+##	mkdir include
+##	if [ x$(FIXINCLUDES) != xMakefile.in ]; \
+##	then \
+##	  for dir in $(SYSTEM_HEADER_DIR) $(OTHER_FIXINCLUDES_DIRS); do \
+##	    if [ -d $$dir ]; \
+##	    then \
+##	      $(SHELL) $(srcdir)/$(FIXINCLUDES) include $$dir; \
+##	    else true; fi; \
+##	  done; \
+##	  if [ x$(INSTALL_ASSERT_H) != x ] ; \
+##	  then \
+##	    rm -f include/assert.h; \
+##	    cp $(srcdir)/assert.h include/assert.h; \
+##	    chmod a+r include/assert.h; \
+##	  fi \
+##	else true; \
+##	fi
 
 # Build fixed copies of system files.
-stmp-fixinc: $(FIXINCLUDES) gsyslimits.h
-	rm -rf include
-	mkdir include
-	if [ x$(FIXINCLUDES) != xMakefile.in ]; \
-	then \
-	  for dir in $(SYSTEM_HEADER_DIR) $(OTHER_FIXINCLUDES_DIRS); do \
-	    if [ -d $$dir ]; \
-	    then \
-	      $(SHELL) $(srcdir)/$(FIXINCLUDES) include $$dir; \
-	    else true; fi; \
-	  done; \
-	  if [ x$(INSTALL_ASSERT_H) != x ] ; \
-	  then \
-	    rm -f include/assert.h; \
-	    cp $(srcdir)/assert.h include/assert.h; \
-	    chmod a+r include/assert.h; \
-	  fi \
-	else true; \
-	fi
+stmp-fixinc: fixinc.sh gsyslimits.h
+	rm -rf include; mkdir include
+	TARGET_MACHINE=$(target); srcdir=`cd $(srcdir); pwd`; \
+	INSTALL_ASSERT_H=$(INSTALL_ASSERT_H); \
+	export TARGET_MACHINE srcdir INSTALL_ASSERT_H; \
+	$(SHELL) ./fixinc.sh `pwd`/include $(SYSTEM_HEADER_DIR) $(OTHER_FIXINCLUDES_DIRS)
 	rm -f include/syslimits.h
 	if [ -f include/limits.h ]; then \
 	  mv include/limits.h include/syslimits.h; \
diff --git a/gcc/configure.in b/gcc/configure.in
index 7dc6b29d876..1610ea80e29 100644
--- a/gcc/configure.in
+++ b/gcc/configure.in
@@ -211,13 +211,6 @@ AC_ARG_ENABLE(haifa,
 [  --enable-haifa          use the experimental scheduler.
   --disable-haifa         don't use the experimental scheduler for the
                           targets which normally enable it.])
-# Fast fixincludes
-#
-# This is a work in progress...
-AC_ARG_WITH(fast-fixincludes,
-[  --with-fast-fixincludes use a faster fixinclude program (experimental)],
-fast_fixinc="$with_fast_fixincludes",
-fast_fixinc=no)
 
 # Enable init_priority.
 AC_ARG_ENABLE(init-priority,
@@ -410,6 +403,11 @@ host_xmake_file=
 host_truncate_target=
 host_exeext=
 
+# Each system that is known to be uncapable of running the fixincl program
+# properly should initialize fixinc_defs='-DFIXINC_BROKEN' in the case
+# block below; see m68k-motorola-sysv as an example.
+fixinc_defs=
+
 # Decode the host machine, then the target machine.
 # For the host machine, we save the xm_file variable as host_xm_file;
 # then we decode the target machine and forget everything else
@@ -432,10 +430,6 @@ for machine in $build $host $target; do
 	use_collect2=
 	# Set this to override the default target model.
 	target_cpu_default=
-	# Set this to control which fixincludes program to use.
-	if test x$fast_fixinc != xyes; then
-		fixincludes=fixincludes
-	else fixincludes=fixinc.sh ; fi
 	# Set this to control how the header file directory is installed.
 	install_headers_dir=install-headers-tar
 	# Set this to a non-empty list of args to pass to cpp if the target
@@ -553,7 +547,6 @@ changequote([,])dnl
 		target_cpu_default="MASK_GAS"
 		tmake_file="t-linux t-linux-gnulibc1 alpha/t-linux alpha/t-crtbe"
 		extra_parts="crtbegin.o crtend.o"
-		fixincludes=fixinc.wrap
 		xmake_file=none
 		gas=yes gnu_ld=yes
  		if test x$enable_threads = xyes; then
@@ -566,7 +559,6 @@ changequote([,])dnl
 		tmake_file="t-linux alpha/t-linux alpha/t-crtbe"
 		extra_parts="crtbegin.o crtend.o"
 		xmake_file=none
-		fixincludes=Makefile.in
 		gas=yes gnu_ld=yes
  		if test x$enable_threads = xyes; then
  			thread_file='posix'
@@ -578,7 +570,6 @@ changequote([,])dnl
 		tmake_file="alpha/t-crtbe"
 		extra_parts="crtbegin.o crtend.o"
 		xmake_file=none
-		fixincludes=fixinc.wrap
 		gas=yes gnu_ld=yes
 		;;
 		
@@ -631,7 +622,6 @@ changequote([,])dnl
 		xmake_file=winnt/x-winnt
 		extra_host_objs=oldnames.o
 		extra_gcc_objs="spawnv.o oldnames.o"
-		fixincludes=fixinc.winnt
 		if test x$gnu_ld != xyes
 		then
 			extra_programs=ld.exe
@@ -644,7 +634,6 @@ changequote([,])dnl
 		tm_file=alpha/vms.h
 		xm_file="${xm_file} alpha/xm-vms.h"
 		tmake_file=alpha/t-vms
-		fixincludes=Makefile.in
 		;;
 	arc-*-elf*)
 		extra_parts="crtinit.o crtfini.o"
@@ -673,26 +662,21 @@ changequote([,])dnl
 	arm-semi-aout | armel-semi-aout)
 		tm_file=arm/semi.h
 		tmake_file=arm/t-semi
-		fixincludes=Makefile.in # There is nothing to fix
 		;;
 	arm-semi-aof | armel-semi-aof)
 		tm_file=arm/semiaof.h
 		tmake_file=arm/t-semiaof
-		fixincludes=Makefile.in # There is nothing to fix
 		;;
 	arm*-*-netbsd*)
 		tm_file=arm/netbsd.h
 		xm_file="arm/xm-netbsd.h ${xm_file}"
 		tmake_file="t-netbsd arm/t-netbsd"
-		# On NetBSD, the headers are already okay, except for math.h.
-		fixincludes=fixinc.wrap
 		;;
 	arm*-*-linux-gnuaout*)		# ARM GNU/Linux with a.out
 		cpu_type=arm
 		xmake_file=x-linux
 		tm_file=arm/linux-aout.h
 		tmake_file=arm/t-linux
-		fixincludes=Makefile.in
 		gnu_ld=yes
 		;;
 	arm*-*-linux-gnu*)		# ARM GNU/Linux with ELF
@@ -708,7 +692,6 @@ changequote([,])dnl
 		esac
 		tmake_file="t-linux arm/t-linux"
 		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-		fixincludes=Makefile.in		# Nothing to fix
 		gnu_ld=yes
 		;;
 	arm*-*-aout)
@@ -726,27 +709,22 @@ changequote([,])dnl
 	c1-convex-*)			# Convex C1
 		target_cpu_default=1
 		use_collect2=yes
-		fixincludes=Makefile.in
 		;;
 	c2-convex-*)			# Convex C2
 		target_cpu_default=2
 		use_collect2=yes
-		fixincludes=Makefile.in
 		;;
 	c32-convex-*)
 		target_cpu_default=4
 		use_collect2=yes
-		fixincludes=Makefile.in
 		;;
 	c34-convex-*)
 		target_cpu_default=8
 		use_collect2=yes
-		fixincludes=Makefile.in
 		;;
 	c38-convex-*)
 		target_cpu_default=16		
 		use_collect2=yes
-		fixincludes=Makefile.in
 		;;
  	c4x-*)
  		cpu_type=c4x
@@ -780,7 +758,6 @@ changequote([,])dnl
 		target_cpu_default=1
 		tm_file="${tm_file} pa/pa-osf.h"
 		use_collect2=yes
-		fixincludes=Makefile.in
 		;;
 	hppa1.1-*-rtems*)
 		tm_file="pa/pa-pro.h ${tm_file} pa/pa-pro-end.h libgloss.h pa/rtems.h"
@@ -790,16 +767,13 @@ changequote([,])dnl
 	hppa1.0-*-osf*)
 		tm_file="${tm_file} pa/pa-osf.h"
 		use_collect2=yes
-		fixincludes=Makefile.in
 		;;
 	hppa1.1-*-bsd*)
 		target_cpu_default=1
 		use_collect2=yes
-		fixincludes=Makefile.in
 		;;
 	hppa1.0-*-bsd*)
 		use_collect2=yes
-		fixincludes=Makefile.in
 		;;
 	hppa1.0-*-hpux7*)
 		tm_file="pa/pa-oldas.h ${tm_file} pa/pa-hpux7.h"
@@ -953,7 +927,6 @@ changequote([,])dnl
 	hppa*-*-lites*)
 		target_cpu_default=1
 		use_collect2=yes
-		fixincludes=Makefile.in
 		;;
 	i370-*-mvs*)
 		;;
@@ -1019,7 +992,6 @@ changequote([,])dnl
 		xmake_file=i386/x-sysv3
 		tm_file=i386/seq-sysv3.h
 		tmake_file=i386/t-crtstuff
-		fixincludes=fixinc.ptx
 		extra_parts="crtbegin.o crtend.o"
 		install_headers_dir=install-headers-cpio
 		;;
@@ -1031,7 +1003,6 @@ changequote([,])dnl
 		tm_file=i386/seq2-sysv3.h
 		tmake_file=i386/t-crtstuff
 		extra_parts="crtbegin.o crtend.o"
-		fixincludes=fixinc.ptx
 		install_headers_dir=install-headers-cpio
 		;;
 changequote(,)dnl
@@ -1043,7 +1014,6 @@ changequote([,])dnl
 		tm_file=i386/ptx4-i.h
 		tmake_file=t-svr4
 		extra_parts="crtbegin.o crtend.o"
-		fixincludes=fixinc.ptx
 		install_headers_dir=install-headers-cpio
 		;;
 	i386-sun-sunos*)		# Sun i386 roadrunner
@@ -1093,8 +1063,6 @@ changequote(,)dnl
 	i[34567]86-*-freebsd*)
 changequote([,])dnl
 		tm_file=i386/freebsd.h
-		# On FreeBSD, the headers are already ok, except for math.h.
-		fixincludes=fixinc.wrap
 		tmake_file=i386/t-freebsd
 		;;
 	# We are hoping OpenBSD is still close enough to NetBSD that we can
@@ -1103,8 +1071,6 @@ changequote(,)dnl
 	i[34567]86-*-netbsd* | i[34567]86-*-openbsd*)
 changequote([,])dnl
 		tm_file=i386/netbsd.h
-		# On NetBSD, the headers are already okay, except for math.h.
-		fixincludes=fixinc.wrap
 		tmake_file=t-netbsd
 		;;
 changequote(,)dnl
@@ -1147,7 +1113,6 @@ changequote([,])dnl			# with a.out format using
 		xmake_file=x-linux-aout
 		tmake_file="t-linux-aout i386/t-crtstuff"
 		tm_file=i386/linux-oldld.h
-		fixincludes=Makefile.in #On Linux, the headers are ok already.
 		gnu_ld=yes
 		float_format=i386
 		;;
@@ -1157,7 +1122,6 @@ changequote([,])dnl			# with a.out format
 		xmake_file=x-linux-aout
 		tmake_file="t-linux-aout i386/t-crtstuff"
 		tm_file=i386/linux-aout.h
-		fixincludes=Makefile.in #On Linux, the headers are ok already.
 		gnu_ld=yes
 		float_format=i386
 		;;
@@ -1169,7 +1133,6 @@ changequote([,])dnl			# with ELF format using the
 		tm_file=i386/linux.h	
 		tmake_file="t-linux t-linux-gnulibc1 i386/t-crtstuff"
 		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-		fixincludes=Makefile.in #On Linux, the headers are ok already.
 		gnu_ld=yes
 		float_format=i386
  		if test x$enable_threads = xyes; then
@@ -1184,7 +1147,6 @@ changequote([,])dnl			# with ELF format using glibc 2
 		tm_file=i386/linux.h
 		tmake_file="t-linux i386/t-crtstuff"
 		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-		fixincludes=Makefile.in #On Linux, the headers are ok already.
 		gnu_ld=yes
 		float_format=i386
  		if test x$enable_threads = xyes; then
@@ -1222,7 +1184,6 @@ changequote(,)dnl
 changequote([,])dnl
 		tm_file=i386/moss.h
 		tmake_file=t-libc-ok
-		fixincludes=Makefile.in
 		gnu_ld=yes
 		gas=yes
 		;;
@@ -1291,7 +1252,6 @@ changequote([,])dnl
 		xm_defines="USG SVR3"
 		xmake_file=i386/x-sco5
 		fixincludes=fixinc.sco
-		install_headers_dir=install-headers-cpio
 		tm_file=i386/sco5.h
 		if test x$gas = xyes
 		then
@@ -1308,7 +1268,6 @@ changequote([,])dnl
 		xm_file="${xm_file} i386/xm-sco.h"
 		xm_defines="USG SVR3 BROKEN_LDEXP SMALL_ARG_MAX NO_SYS_SIGLIST"
 		xmake_file=i386/x-sco4
-		fixincludes=fixinc.sco
 		install_headers_dir=install-headers-cpio
                 if test x$stabs = xyes
 		then
@@ -1354,14 +1313,6 @@ changequote([,])dnl
 		tmake_file=i386/t-sol2
 		extra_parts="crt1.o crti.o crtn.o gcrt1.o gmon.o crtbegin.o crtend.o"
 		xmake_file=x-svr4
-		case $machine in
-changequote(,)dnl
-		*-*-solaris2.[0-4])
-changequote([,])dnl
-			fixincludes=fixinc.svr4;;
-		*)
-			fixincludes=fixinc.wrap;;
-		esac
  		if test x$enable_threads = xyes; then
 			thread_file='solaris'
 		fi
@@ -1379,7 +1330,6 @@ changequote([,])dnl
                tmake_file=i386/t-crtpic
                xmake_file=x-svr4
                extra_parts="crtbegin.o crtend.o"
-               fixincludes=fixinc.svr4
                ;;
 changequote(,)dnl
 	i[34567]86-*-sysv4*)		# Intel 80386's running system V.4
@@ -1404,7 +1354,6 @@ changequote([,])dnl
 		tmake_file="i386/t-crtpic i386/t-udk"
 		xmake_file=x-svr4
 		extra_parts="crtbegin.o crtend.o"
-		fixincludes="fixinc.svr4"
 		;;
 changequote(,)dnl
 	i[34567]86-*-osf1*)		# Intel 80386's running OSF/1 1.3+
@@ -1412,7 +1361,6 @@ changequote([,])dnl
 		cpu_type=i386
 		xm_file="${xm_file} xm-svr4.h i386/xm-sysv4.h i386/xm-osf1elf.h"
 		xm_defines="USE_C_ALLOCA SMALL_ARG_MAX"
-		fixincludes=Makefile.in #Don't do it on OSF/1
 		if test x$stabs = xyes
 		then
 			tm_file=i386/osf1elfgdb.h
@@ -1460,7 +1408,6 @@ changequote([,])dnl
 		tm_file=i386/win32.h
 		xmake_file=i386/x-cygwin
 		extra_objs=winnt.o
-		fixincludes=Makefile.in
  		if test x$enable_threads = xyes; then
 			thread_file='win32'
 		fi
@@ -1474,7 +1421,6 @@ changequote([,])dnl
 		tm_file=i386/cygwin.h
 		xmake_file=i386/x-cygwin
 		extra_objs=winnt.o
-		fixincludes=Makefile.in
  		if test x$enable_threads = xyes; then
 			thread_file='win32'
 		fi
@@ -1488,7 +1434,6 @@ changequote([,])dnl
 		tmake_file="i386/t-cygwin i386/t-mingw32"
 		extra_objs=winnt.o
 		xmake_file=i386/x-cygwin
-		fixincludes=Makefile.in
  		if test x$enable_threads = xyes; then
 			thread_file='win32'
 		fi
@@ -1511,7 +1456,6 @@ changequote([,])dnl
 		tmake_file=i386/t-winnt
 		extra_host_objs="winnt.o oldnames.o"
 		extra_gcc_objs="spawnv.o oldnames.o"
-		fixincludes=fixinc.winnt
 		if test x$gnu_ld != xyes
 		then
 			extra_programs=ld.exe
@@ -1529,7 +1473,6 @@ changequote([,])dnl
 		tm_file=i386/dgux.h
 		tmake_file=i386/t-dgux
 		xmake_file=i386/x-dgux
-		fixincludes=fixinc.dgux
 		install_headers_dir=install-headers-cpio
               ;;
 	i860-alliant-*)		# Alliant FX/2800
@@ -1748,6 +1691,7 @@ changequote([,])dnl
 		extra_parts="crt0.o mcrt0.o"
 		extra_headers=math-68881.h
 		float_format=m68k
+		fixinc_defs='-DFIXINC_BROKEN'
 		;;
 	m68k-ncr-sysv*)			# NCR Tower 32 SVR3
 		tm_file=m68k/tower-as.h
@@ -1963,8 +1907,6 @@ changequote([,])dnl
 		;;
 	m68k*-*-netbsd*)
 		tm_file=m68k/netbsd.h
-		# On NetBSD, the headers are already okay, except for math.h.
-		fixincludes=fixinc.wrap
 		tmake_file=t-netbsd
 		float_format=m68k
 		;;
@@ -1990,7 +1932,6 @@ changequote([,])dnl
 		xmake_file=x-linux
 		tm_file=m68k/linux-aout.h
 		tmake_file="t-linux-aout m68k/t-linux-aout"
-		fixincludes=Makefile.in # The headers are ok already.
 		extra_headers=math-68881.h
 		float_format=m68k
 		gnu_ld=yes
@@ -2002,7 +1943,6 @@ changequote([,])dnl
 		tm_file=m68k/linux.h
 		tmake_file="t-linux t-linux-gnulibc1 m68k/t-linux"
 		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-		fixincludes=Makefile.in # The headers are ok already.
 		extra_headers=math-68881.h
 		float_format=m68k
 		gnu_ld=yes
@@ -2014,7 +1954,6 @@ changequote([,])dnl
 		tm_file=m68k/linux.h
 		tmake_file="t-linux m68k/t-linux"
 		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-		fixincludes=Makefile.in # The headers are ok already.
 		extra_headers=math-68881.h
 		float_format=m68k
 		gnu_ld=yes
@@ -2052,7 +1991,6 @@ changequote([,])dnl
 		then
 			tmake_file=m88k/t-dgux-gas
 		fi
-		fixincludes=fixinc.dgux
 		;;
 	m88k-dolphin-sysv3*)
 		tm_file=m88k/dolph.h
@@ -2100,6 +2038,7 @@ changequote([,])dnl
 		then
 			tmake_file=m88k/t-m88k-gas
 		fi
+		fixinc_defs='-DFIXINC_BROKEN'
 		;;
 	m88k-*-sysv4*)
 		tm_file=m88k/sysv4.h
@@ -2110,7 +2049,6 @@ changequote([,])dnl
 	mips-sgi-irix6*)		# SGI System V.4., IRIX 6
 		tm_file=mips/iris6.h
 		xm_file=mips/xm-iris6.h
-		fixincludes=fixinc.irix
 		xmake_file=mips/x-iris6
 		tmake_file=mips/t-iris6
 # 		if test x$enable_threads = xyes; then
@@ -2129,7 +2067,6 @@ changequote([,])dnl
 		tm_file="mips/iris6.h mips/cross64.h"
 		xm_defines=USG
 		xm_file="mips/xm-iris5.h"
-		fixincludes=Makefile.in
 		xmake_file=mips/x-iris
 		tmake_file=mips/t-cross64
 		# See comment in mips/iris[56].h files.
@@ -2171,7 +2108,6 @@ changequote([,])dnl
 		fi
 		xm_defines=USG
 		xm_file="mips/xm-iris5.h"
-		fixincludes=fixinc.irix
 		xmake_file=mips/x-iris
 		# mips-tfile doesn't work yet
 		tmake_file=mips/t-mips-gas
@@ -2268,7 +2204,6 @@ changequote([,])dnl
 		;;
 	mips-dec-bsd*)                  # Decstation running 4.4 BSD
               tm_file=mips/dec-bsd.h
-              fixincludes=
 	      if test x$gas = xyes
 	      then
 		   	tmake_file=mips/t-mips-gas
@@ -2284,7 +2219,6 @@ changequote([,])dnl
 	mipsel-*-netbsd* | mips-dec-netbsd*)    # Decstation running NetBSD
 		tm_file=mips/netbsd.h
 		# On NetBSD, the headers are already okay, except for math.h.
-		fixincludes=fixinc.wrap
 		tmake_file=t-netbsd
 		;;
        mips*-*-linux*)                         # Linux MIPS, either endian.
@@ -2641,7 +2575,6 @@ changequote([,])dnl
 		tm_file=ns32k/netbsd.h
 		xm_file="ns32k/xm-netbsd.h ${xm_file}"
 		# On NetBSD, the headers are already okay, except for math.h.
-		fixincludes=fixinc.wrap
 		tmake_file=t-netbsd
 		;;
         pdp11-*-bsd)
@@ -2684,13 +2617,11 @@ changequote([,])dnl
 	powerpc-*-eabiaix*)
 		tm_file=rs6000/eabiaix.h
 		tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
-		fixincludes=Makefile.in
 		extra_headers=ppc-asm.h
 		;;
 	powerpc-*-eabisim*)
 		tm_file=rs6000/eabisim.h
 		tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
-		fixincludes=Makefile.in
 		extra_headers=ppc-asm.h
 		;;
 	powerpc-*-eabi*)
@@ -2701,7 +2632,6 @@ changequote([,])dnl
 		else
 			tmake_file="rs6000/t-ppc rs6000/t-ppccomm"
 		fi
-		fixincludes=Makefile.in
 		extra_headers=ppc-asm.h
 		;;
 	powerpc-*-rtems*)
@@ -2712,7 +2642,6 @@ changequote([,])dnl
 		else
 		     tmake_file="rs6000/t-ppc t-rtems rs6000/t-ppccomm"
 		fi
-		fixincludes=Makefile.in
 		extra_headers=ppc-asm.h
 		;;
 	powerpc-*-linux-gnulibc1)
@@ -2726,7 +2655,6 @@ changequote([,])dnl
 			tmake_file="rs6000/t-ppc t-linux t-linux-gnulibc1 rs6000/t-ppccomm"
 		fi
 		xmake_file=x-linux
-		fixincludes=Makefile.in
 		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 		extra_headers=ppc-asm.h
 		if test x$enable_threads = xyes; then
@@ -2745,7 +2673,6 @@ changequote([,])dnl
 			tmake_file="rs6000/t-ppc t-linux rs6000/t-ppccomm"
 		fi
 		xmake_file=x-linux
-		fixincludes=Makefile.in
 		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 		extra_headers=ppc-asm.h
 		if test x$enable_threads = xyes; then
@@ -2777,7 +2704,6 @@ changequote([,])dnl
 	powerpcle-*-eabisim*)
 		tm_file=rs6000/eabilesim.h
 		tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
-		fixincludes=Makefile.in
 		extra_headers=ppc-asm.h
 		;;
 	powerpcle-*-eabi*)
@@ -2788,14 +2714,12 @@ changequote([,])dnl
 		else
 			tmake_file="rs6000/t-ppc rs6000/t-ppccomm"
 		fi
-		fixincludes=Makefile.in
 		extra_headers=ppc-asm.h
 		;;
         powerpcle-*-winnt* )
                 tm_file=rs6000/win-nt.h
                 tmake_file=rs6000/t-winnt
 #               extra_objs=pe.o
-		fixincludes=Makefile.in
  		if test x$enable_threads = xyes; then
 			thread_file='win32'
 		fi
@@ -2807,7 +2731,6 @@ changequote([,])dnl
 		tmake_file=rs6000/t-winnt
 		xmake_file=rs6000/x-cygwin
 #		extra_objs=pe.o
-		fixincludes=Makefile.in
  		if test x$enable_threads = xyes; then
 			thread_file='win32'
 		fi
@@ -2825,14 +2748,6 @@ changequote([,])dnl
 			tmake_file="rs6000/t-ppc rs6000/t-ppccomm"
 		fi
 		xmake_file=rs6000/x-sysv4
-		case $machine in
-changequote(,)dnl
-		*-*-solaris2.[0-4])
-changequote([,])dnl
-			fixincludes=fixinc.svr4;;
-		*)
-			fixincludes=fixinc.wrap;;
-		esac
 		extra_headers=ppc-asm.h
 		;;
 changequote(,)dnl
@@ -2946,8 +2861,6 @@ changequote([,])dnl
 		;;
 	sparc-*-netbsd*)
 		tm_file=sparc/netbsd.h
-		# On NetBSD, the headers are already okay, except for math.h.
-		fixincludes=fixinc.wrap
 		tmake_file=t-netbsd
 		;;
 	sparc-*-bsd*)
@@ -2964,7 +2877,6 @@ changequote([,])dnl
 		xm_file="${xm_file} sparc/xm-linux.h"
 		tm_file=sparc/linux-aout.h
 		xmake_file=x-linux
-		fixincludes=Makefile.in #On Linux, the headers are ok already.
 		gnu_ld=yes
 		;;
 	sparc-*-linux-gnulibc1*)	# Sparc's running GNU/Linux, libc5
@@ -2973,7 +2885,6 @@ changequote([,])dnl
 		tm_file=sparc/linux.h
 		tmake_file="t-linux t-linux-gnulibc1"
 		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-		fixincludes=Makefile.in #On Linux, the headers are ok already.
 		gnu_ld=yes
 		;;
 	sparc-*-linux-gnu*)		# Sparc's running GNU/Linux, libc6
@@ -2982,7 +2893,6 @@ changequote([,])dnl
 		tm_file=sparc/linux.h
 		tmake_file="t-linux"
 		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-		fixincludes=Makefile.in #On Linux, the headers are ok already.
 		gnu_ld=yes
  		if test x$enable_threads = xyes; then
  			thread_file='posix'
@@ -3010,7 +2920,6 @@ changequote([,])dnl
 		tmake_file="sparc/t-sol2 sparc/t-sol2-64"
 		xmake_file=sparc/x-sysv4
 		extra_parts="crt1.o crti.o crtn.o gcrt1.o crtbegin.o crtend.o"
-		fixincludes=fixinc.wrap
 		float_format=i128
 		if test x${enable_threads} = x ; then
 		    enable_threads=$have_pthread_h
@@ -3038,14 +2947,6 @@ changequote([,])dnl
 		tmake_file=sparc/t-sol2
 		xmake_file=sparc/x-sysv4
 		extra_parts="crt1.o crti.o crtn.o gcrt1.o gmon.o crtbegin.o crtend.o"
-		case $machine in
-changequote(,)dnl
-		*-*-solaris2.[0-4])
-changequote([,])dnl
-			fixincludes=fixinc.svr4;;
-		*)
-			fixincludes=fixinc.wrap;;
-		esac
 		float_format=i128
 		if test x${enable_threads} = x; then
 		    enable_threads=$have_pthread_h
@@ -3119,7 +3020,6 @@ changequote([,])dnl
 		xm_file="sparc/xm-sp64.h sparc/xm-linux.h"
 		tm_file=sparc/linux64.h
 		xmake_file=x-linux
-		fixincludes=Makefile.in	# The headers are ok already.
 		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 		gnu_ld=yes
 		;;
@@ -3135,7 +3035,6 @@ changequote([,])dnl
 		xm_file=arm/xm-thumb.h
 		md_file=arm/thumb.md
 		tmake_file=arm/t-thumb
-		fixincludes=Makefile.in # There is nothing to fix
 		;;
 # This hasn't been upgraded to GCC 2.
 #	tron-*-*)
@@ -3164,8 +3063,6 @@ changequote([,])dnl
 		;;
 	vax-*-netbsd*)
 		tm_file="${tm_file} netbsd.h vax/netbsd.h"
-		# On NetBSD, the headers are already okay, except for math.h.
-		fixincludes=fixinc.wrap
 		tmake_file=t-netbsd
 		float_format=vax
 		;;
@@ -3207,13 +3104,10 @@ changequote([,])dnl
 		# GNU tools are the only tools.
 		gnu_ld=yes
 		gas=yes
-		# On GNU, the headers are already okay.
-		fixincludes=Makefile.in
 		xmake_file=x-linux	# These details are the same as Linux.
 		tmake_file=t-gnu	# These are not.
 		;;
 	*-*-sysv4*)
-		fixincludes=fixinc.svr4
 		xmake_try_sysv=x-sysv
 		install_headers_dir=install-headers-cpio
 		;;
@@ -3945,7 +3839,7 @@ all_boot_languages=
 all_compilers=
 all_stagestuff=
 all_diff_excludes=
-all_outputs=Makefile
+all_outputs="Makefile fixinc/Makefile"
 # List of language makefile fragments.
 all_lang_makefiles=
 all_headers=
@@ -4135,7 +4029,6 @@ AC_SUBST(gcc_version)
 AC_SUBST(gcc_version_trigger)
 AC_SUBST(local_prefix)
 AC_SUBST(gxx_include_dir)
-AC_SUBST(fixincludes)
 AC_SUBST(build_install_headers_dir)
 AC_SUBST(build_exeext)
 AC_SUBST(host_exeext)
@@ -4146,6 +4039,7 @@ AC_SUBST(cc_set_by_configure)
 AC_SUBST(stage_prefix_set_by_configure)
 AC_SUBST(install)
 AC_SUBST(symbolic_link)
+AC_SUBST(fixinc_defs)
 
 AC_SUBST_FILE(target_overrides)
 AC_SUBST_FILE(host_overrides)