Patch to activate fast-fixincl
Bruce Korb
korb@datadesign.com
Wed Nov 11 12:07:00 GMT 1998
--- egcs/gcc/ChangeLog.sav Mon Nov 9 09:45:24 1998
+++ egcs/gcc/ChangeLog.new Mon Nov 9 10:18:09 1998
@@ -1,3 +1,8 @@
+Mon Nov 9 09:14:14 PST 1998 Bruce Korb (korb@datadesign.com)
+
+ * Makefile.in, configure.in
+ Activate fast-fixincludes as the default include fixer.
+
Mon Nov 9 02:14:14 PST 1998 Jeff Law (law@cygnus.com)
* version.c: Bump for snapshot.
--- egcs/gcc/Makefile.in.sav Mon Nov 9 09:45:25 1998
+++ egcs/gcc/Makefile.in.new Mon Nov 9 12:06:23 1998
@@ -403,10 +403,6 @@
# 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.
@@ -2040,32 +2036,34 @@
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
+ @- $(LNS) $(srcdir)/fixinc/[a-z]* fixinc > /dev/null 2>&1 || :
+ cd ../contrib/fixinc ; MAKE="$(MAKE)" \
+ $(SHELL) 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
+stmp-fixinc: fixinc.sh 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
+ $(SHELL) ./fixinc.sh $(SYSTEM_HEADER_DIR) $(OTHER_FIXINCLUDES_DIRS)
rm -f include/syslimits.h
if [ -f include/limits.h ]; then \
mv include/limits.h include/syslimits.h; \
--- egcs/gcc/configure.in.sav Sat Nov 7 05:00:02 1998
+++ egcs/gcc/configure.in.new Mon Nov 9 10:03:32 1998
@@ -210,14 +210,6 @@
[ --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,
[ --enable-init-priority use attributes to assign initialization order
@@ -422,10 +414,6 @@
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
@@ -543,7 +531,6 @@
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
@@ -556,7 +543,6 @@
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'
@@ -568,7 +554,6 @@
tmake_file="alpha/t-crtbe"
extra_parts="crtbegin.o crtend.o"
xmake_file=none
- fixincludes=fixinc.wrap
gas=yes gnu_ld=yes
;;
@@ -621,7 +606,6 @@
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
@@ -634,7 +618,6 @@
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"
@@ -663,26 +646,22 @@
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
@@ -698,7 +677,6 @@
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)
@@ -712,27 +690,22 @@
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
@@ -766,7 +739,6 @@
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"
@@ -776,16 +748,13 @@
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"
@@ -939,7 +908,6 @@
hppa*-*-lites*)
target_cpu_default=1
use_collect2=yes
- fixincludes=Makefile.in
;;
i370-*-mvs*)
;;
@@ -1005,7 +973,6 @@
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
;;
@@ -1017,7 +984,6 @@
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
@@ -1029,7 +995,6 @@
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
@@ -1068,7 +1033,6 @@
changequote([,])dnl
tm_file="i386/i386.h i386/att.h linux.h i386/freebsd-elf.h i386/perform.h"
# On FreeBSD, the headers are already ok, except for math.h.
- fixincludes=fixinc.wrap
tmake_file=i386/t-freebsd
gas=yes
gnu_ld=yes
@@ -1079,7 +1043,6 @@
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
@@ -1089,7 +1052,6 @@
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
@@ -1132,7 +1094,6 @@
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
;;
@@ -1142,7 +1103,6 @@
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
;;
@@ -1154,7 +1114,6 @@
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
@@ -1169,7 +1128,6 @@
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
@@ -1207,7 +1165,6 @@
changequote([,])dnl
tm_file=i386/moss.h
tmake_file=t-libc-ok
- fixincludes=Makefile.in
gnu_ld=yes
gas=yes
;;
@@ -1275,7 +1232,6 @@
xm_file="xm-siglist.h xm-alloca.h ${xm_file} i386/xm-sco5.h"
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
@@ -1293,7 +1249,6 @@
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
@@ -1339,14 +1294,6 @@
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
@@ -1364,7 +1311,6 @@
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
@@ -1389,7 +1335,6 @@
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+
@@ -1397,7 +1342,6 @@
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
@@ -1445,7 +1389,6 @@
tm_file=i386/win32.h
xmake_file=i386/x-cygwin32
extra_objs=winnt.o
- fixincludes=Makefile.in
if test x$enable_threads = xyes; then
thread_file='win32'
fi
@@ -1459,7 +1402,6 @@
tm_file=i386/cygwin32.h
xmake_file=i386/x-cygwin32
extra_objs=winnt.o
- fixincludes=Makefile.in
if test x$enable_threads = xyes; then
thread_file='win32'
fi
@@ -1473,7 +1415,6 @@
tmake_file="i386/t-cygwin32 i386/t-mingw32"
extra_objs=winnt.o
xmake_file=i386/x-cygwin32
- fixincludes=Makefile.in
if test x$enable_threads = xyes; then
thread_file='win32'
fi
@@ -1496,7 +1437,6 @@
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
@@ -1514,7 +1454,6 @@
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
@@ -1943,7 +1882,6 @@
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
;;
@@ -1969,7 +1907,6 @@
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
@@ -1981,7 +1918,6 @@
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
@@ -1993,7 +1929,6 @@
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
@@ -2031,7 +1966,6 @@
then
tmake_file=m88k/t-dgux-gas
fi
- fixincludes=fixinc.dgux
;;
m88k-dolphin-sysv3*)
tm_file=m88k/dolph.h
@@ -2089,7 +2023,6 @@
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
@@ -2108,7 +2041,6 @@
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.
@@ -2150,7 +2082,6 @@
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
@@ -2247,7 +2178,6 @@
;;
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
@@ -2263,7 +2193,6 @@
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-sony-bsd* | mips-sony-newsos*) # Sony NEWS 3600 or risc/news.
@@ -2608,7 +2537,6 @@
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)
@@ -2651,13 +2579,11 @@
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*)
@@ -2668,7 +2594,6 @@
else
tmake_file="rs6000/t-ppc rs6000/t-ppccomm"
fi
- fixincludes=Makefile.in
extra_headers=ppc-asm.h
;;
powerpc-*-rtems*)
@@ -2679,7 +2604,6 @@
else
tmake_file="rs6000/t-ppc t-rtems rs6000/t-ppccomm"
fi
- fixincludes=Makefile.in
extra_headers=ppc-asm.h
;;
powerpc-*-linux-gnulibc1)
@@ -2693,7 +2617,6 @@
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
@@ -2712,7 +2635,6 @@
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
@@ -2744,7 +2666,6 @@
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*)
@@ -2755,14 +2676,12 @@
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
@@ -2774,7 +2693,6 @@
tmake_file=rs6000/t-winnt
xmake_file=rs6000/x-cygwin32
# extra_objs=pe.o
- fixincludes=Makefile.in
if test x$enable_threads = xyes; then
thread_file='win32'
fi
@@ -2792,14 +2710,6 @@
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
@@ -2914,7 +2824,6 @@
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*)
@@ -2931,7 +2840,6 @@
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
@@ -2940,7 +2848,6 @@
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
@@ -2949,7 +2856,6 @@
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'
@@ -2977,7 +2883,6 @@
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
@@ -3005,14 +2910,6 @@
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
@@ -3086,7 +2983,6 @@
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
;;
@@ -3102,7 +2998,6 @@
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-*-*)
@@ -3132,7 +3027,6 @@
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
;;
@@ -3175,12 +3069,10 @@
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
;;
@@ -3876,7 +3768,7 @@
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=
@@ -4065,7 +3957,6 @@
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)
More information about the Gcc-bugs
mailing list