This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

[PATCH] configury cleanup


Hi,

the main purpose of this cleanup is to convert the include style of 
elfos.h/svr4.h/ptx4.h/linux.h to the config.gcc driven $tm_file style. This 
recursively required changing a lot of platforms. So, besides bootstrapping 
the patch on x86-linux and ppc-linux I used the appended script and list of 
platforms to generate files that I could easily compare with diff. So I 
verified the patch produces no differences for the list of platforms.

OK to commit to mainline?

Franz.

Broken platforms I left broken:
	mips*-*-gnu*: circular includes, I couldn't figure out the right thing to do

Broken platforms I fixed:
	i[34567]86-*-netware: circular include (maybe a gcc-3.0 include handling 
bug?)
	i[34567]86-go32-rtems*:  wrong header filename

Platforms I couldn't test (but I did carefully look at my changes):
	ia64*-*-aix*: platform can't be cross-compiled due to missing headers


        * config.gcc (i[34567]86-*-gnu*, mips*-*-gnu*, arc-*-elf*, d30v-*,
        fr30-*-elf, hppa*64*-*-linux*, parisc*64*-*-linux*, hppa*-*-linux*,
        parisc*-*-linux*, i370-*-linux*, i[34567]86-*-chorusos*,
        i[34567]86-*-elf*, i[34567]86-ncr-sysv4*, i[34567]86-*-netware,
        i[34567]86-sequent-ptx4*, i[34567]86-sequent-sysv4*,
        i[34567]86-*-beoself*, i[34567]86-*-beos*, i[34567]86-*-freebsd*,
        i[34567]86-*-netbsdelf*, i[34567]86-*-linux*libc1,
        i[34567]86-*-linux*, i[34567]86-moss-msdos*, i[34567]86-*-moss*,
        i[34567]86-go32-rtems*, i[34567]86-*-rtems*, i[34567]86-*-rtemself*,
        i[34567]86-*-solaris2*, i[34567]86-*-sysv5*, i[34567]86-*-sysv4*,
        i[34567]86-*-udk*, i[34567]86-*-osf1*, i[34567]86-dg-dgux*,
        i860-alliant-*, i860-*-sysv4*, ia64*-*-aix*, ia64*-*-linux*,
        ia64*-*-hpux*, m32r-*-elf*, m88k-dg-dgux*, m88k-*-sysv4*, mcore-*-elf,
        mips*-*-linux*, mn10200-*-*, mn10300-*-*, pj*-linux*, pjl-*,
        powerpc64-*-linux*, powerpc-*-sysv*, powerpc-*-netbsd*,
        powerpc-*-chorusos*, powerpc-*-eabiaix*, powerpc-*-eabisim*,
        powerpc-*-elf*, powerpc-*-eabi*, powerpc-*-rtems*,
        powerpc-*-linux*libc1, powerpc-*-linux*, powerpc-wrs-vxworks*,
        powerpcle-wrs-vxworks*, powerpcle-*-sysv*, powerpcle-*-elf*,
        powerpcle-*-eabisim*, powerpcle-*-eabi*, powerpcle-*-solaris2*,
        rs6000-*-mach*, s390-*-linux*, s390x-*-linux*, sh-*-elf*,
        sh-*-rtemself*, sh-*-rtems*, sh-*-linux*, stormy16-*-elf,
        v850-*-rtems*, v850-*-*): Update ${tmfile} list.
        (c4x-*-rtems*, c4x-*, i[34567]86-go32-rtems*, i[34567]86-*-rtemscoff*,
        i[34567]86-*-rtems*, i[34567]86-*-rtemself*, i[34567]86-*-osf1*,
        mn10200-*-*, mn10300-*-*, powerpc-*-beos*, powerpc-*-darwin*,
        powerpc-wrs-vxworks*, powerpcle-wrs-vxworks*, v850-*-rtems*,
        v850-*-*): Delete superflous $cpu_type setting.
        * config/linux.h: Delete svr4.h include.
        (SET_ASM_OP): Delete.
        * config/netware.h (INT_ASM_OP): Undef before define.
        * config/ptx4.h: Delete elfos.h include.
        (PREFERRED_DEBUGGING_TYPE): Undef instead of wrapping.
        * config/svr4.h: Delete elfos.h include. Update commentary.
        * config/arc/arc.h, config/d30v/d30v.h, config/fr30/fr30.h,
        config/m32r/m32r.h, config/m88k/sysv4.h, config/mn10200/mn10200.h,
        config/mn10200/mn10300.h, config/stormy16/stormy16.h,
        config/v850/v850.h: Delete svr4.h include.
        * config/i370/linux.h, config/i386/osf1elf.h, config/m68k/linux.h,
        config/m68k/m68kv4.h, config/m88k/sysv4.h, config/mips/gnu.h,
        config/sparc/sysv4.h: Update includes.
        * config/i386/beos-elf.h, config/i386/netware.h, config/i386/ptx4-i.h,
        config/i386/rtemself.h, config/i386/sol2.h, config/i386/sysv4.h,
        config/i386/sysv5.h, config/i386/udk.h, config/ia64/linux.h,
        config/m88k/dguxbcs.h: Delete includes.
        * config/i386/dgux.h, config/i386/osf1elfgdb.h: Delete include.
        (PREFERRED_DEBUGGING_TYPE): Undef before defining it.
        * config/i860/fx2800.h (ASM_OUTPUT_SOURCE_LINE): Undef before defining
        it.
        * config/m88k/dgux.h: Delete include.
        (SDB_DEBUGGING_INFO, PREFERRED_DEBUGGING_TYPE):  Undef before
        defining it.
        * config/pj/pj.h (ASM_GENERATE_INTERNAL_LABEL,
        ASM_OUTPUT_INTERNAL_LABEL, ASM_OUTPUT_SKIP): Undef before defining it.
        * config/sh/elf.h: Update include.
        (SDB_DEBUGGING_INFO, DWARF2_DEBUGGING_INFO, PREFERRED_DEBUGGING_TYPE,
        DWARF2_ASM_LINE_DEBUG_INFO): Move behind includes.

Index: gcc/config.gcc
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config.gcc,v
retrieving revision 1.91
diff -u -p -r1.91 config.gcc
--- gcc/config.gcc	2001/09/18 21:51:52	1.91
+++ gcc/config.gcc	2001/09/30 17:06:38
@@ -46,7 +46,15 @@
 #  cpu_type		The name of the cpu, if different from machine.
 #
 #  tm_file		A list of target macro files, if different from
-#			"$cpu_type/$cpu_type.h".
+#			"$cpu_type/$cpu_type.h". Usually it's constructed
+#			per target in a way like this:
+#			tm_file="${tm_file} elfos.h svr4.h ${cpu_type.h}/elf.h"
+#			Note that the preferred order is:
+#			- specific target header "${cpu_type}/${cpu_type.h}"
+#			- generic headers like elfos.h, netware.h, etc.
+#			- specializing target headers like ${cpu_type.h}/elf.h
+#			This helps to keep OS specific stuff out of the CPU
+#			defining header ${cpu_type}/${cpu_type.h}.
 #
 #  tm_p_file		Location of file with declarations for functions
 #			in $out_file.
@@ -277,10 +285,10 @@ case $machine in
 	tmake_file="t-slibgcc-elf-ver t-linux t-gnu"
 	case $machine in
 	i[34567]86-*-*)
-		tm_file="${cpu_type}/${cpu_type}.h i386/att.h linux.h i386/linux.h gnu.h ${tm_file}"
+		tm_file="${cpu_type}/${cpu_type}.h i386/att.h elfos.h svr4.h linux.h i386/linux.h gnu.h ${tm_file}"
 		;;
 	mips*-*-*)
-		tm_file="svr4.h ${cpu_type}/${cpu_type}.h ${tm_file}"
+		tm_file="elfos.h svr4.h ${cpu_type}/${cpu_type}.h ${tm_file} gnu.h"
 		;;
 	esac
 	;;
@@ -528,6 +536,7 @@ alpha*-dec-vms*)
 	tmake_file="alpha/t-alpha alpha/t-vms alpha/t-ieee"
 	;;
 arc-*-elf*)
+	tm_file="elfos.h svr4.h ${tm_file}"
 	extra_parts="crtinit.o crtfini.o"
 	;;
 arm*-*-rtems*)
@@ -638,7 +647,6 @@ c38-convex-*)
 	use_collect2=yes
 	;;
 c4x-*-rtems*)
-	cpu_type=c4x
 	tmake_file="c4x/t-c4x t-rtems"
 	tm_file=c4x/rtems.h
 	if test x$enable_threads = xyes; then
@@ -646,7 +654,6 @@ c4x-*-rtems*)
 	fi
 	;;
 c4x-*)
-	cpu_type=c4x
 	float_format=c4x
 	tmake_file=c4x/t-c4x
 	;;
@@ -658,6 +665,7 @@ clipper-intergraph-clix*)
 	install_headers_dir=install-headers-cpio
 	;;
 d30v-*)
+	tm_file="elfos.h svr4.h ${tm_file}"
 	float_format=i64
 	;;
 dsp16xx-*)
@@ -666,7 +674,7 @@ elxsi-elxsi-*)
 	use_collect2=yes
 	;;
 fr30-*-elf)
-	tm_file="fr30/fr30.h"
+	tm_file="elfos.h svr4.h ${tm_file}"
 	tmake_file=fr30/t-fr30
 	extra_parts="crti.o crtn.o crtbegin.o crtend.o"
 	;;
@@ -688,14 +696,14 @@ h8300-*-*)
 	;;
 hppa*64*-*-linux* | parisc*64*-*-linux*)
 	target_cpu_default="(MASK_PA_11 | MASK_PA_20)"
-	tm_file="pa/pa64-start.h ${tm_file} linux.h pa/pa-linux.h \
+	tm_file="pa/pa64-start.h ${tm_file} elfos.h svr4.h linux.h pa/pa-linux.h \
 		 pa/pa64-regs.h pa/pa-64.h pa/pa64-linux.h"
 	tmake_file=pa/t-linux64
 	gas=yes gnu_ld=yes
 	;;
 hppa*-*-linux* | parisc*-*-linux*)
 	target_cpu_default="MASK_PA_11"
-	tm_file="${tm_file} linux.h pa/pa-linux.h \
+	tm_file="${tm_file} elfos.h svr4.h linux.h pa/pa-linux.h \
 		 pa/pa32-regs.h pa/pa32-linux.h"
 	tmake_file="t-slibgcc-elf-ver t-linux pa/t-linux"
 	extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
@@ -928,7 +936,7 @@ i370-*-mvs*)
 	;;
 i370-*-linux*)
 	xmake_file=x-linux
-	tm_file="i370/linux.h ${tm_file}"
+	tm_file="elfos.h svr4.h linux.h i370/linux.h ${tm_file}"
 	tmake_file="t-slibgcc-elf-ver t-linux"
 	# broken_install=yes
 	extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
@@ -942,7 +950,7 @@ i370-*-linux*)
 	;;
 i[34567]86-*-chorusos*)
 	xm_defines=POSIX
-	tm_file="i386/i386.h i386/att.h elfos.h i386/i386elf.h chorus.h"
+	tm_file="${tm_file} i386/att.h elfos.h i386/i386elf.h chorus.h"
 	tmake_file=i386/t-i386elf
 	xmake_file=x-svr4
 	case x${enable_threads} in
@@ -953,7 +961,7 @@ i[34567]86-*-chorusos*)
 	;;
 i[34567]86-*-elf*)
 	xm_defines=POSIX
-	tm_file="i386/i386.h i386/att.h elfos.h i386/i386elf.h"
+	tm_file="${tm_file} i386/att.h elfos.h i386/i386elf.h"
 	tmake_file=i386/t-i386elf
 	xmake_file=x-svr4
 	;;
@@ -975,7 +983,7 @@ i[34567]86-ncr-sysv4*)		# NCR 3000 - ix8
 	then
 		tm_file=i386/sysv4gdb.h
 	else
-		tm_file=i386/sysv4.h
+		tm_file="${tm_file} i386/att.h elfos.h svr4.h i386/sysv4.h"
 	fi
 	extra_parts="crtbegin.o crtend.o"
 	tmake_file=i386/t-crtpic
@@ -990,7 +998,7 @@ i[34567]86-next-*)
 	fi
 	;;
 i[34567]86-*-netware)		# Intel 80386's running netware
-	tm_file=i386/netware.h
+	tm_file="${tm_file} i386/att.h elfos.h svr4.h i386/sysv4.h netware.h i386/netware.h"
 	tmake_file=i386/t-netware
 	;;
 i[34567]86-sequent-bsd*) 		# 80386 from Sequent
@@ -1023,7 +1031,7 @@ i[34567]86-sequent-ptx4* | i[34567]86-se
 	fi
 	xm_defines="POSIX SMALL_ARG_MAX"
 	xmake_file=x-svr4
-	tm_file=i386/ptx4-i.h
+	tm_file="${tm_file} i386/att.h elfos.h ptx4.h i386/ptx4-i.h"
 	tmake_file=t-svr4
 	extra_parts="crtbegin.o crtend.o"
 	install_headers_dir=install-headers-cpio
@@ -1043,7 +1051,7 @@ i[34567]86-*-aout*)
 i[34567]86-*-beoself* | i[34567]86-*-beos*)
 	xm_defines=POSIX
 	tmake_file='i386/t-beos i386/t-crtpic'
-	tm_file=i386/beos-elf.h
+	tm_file="${tm_file} i386/att.h elfos.h svr4.h i386/beos-elf.h"
 	xmake_file=i386/x-beos
 	extra_parts='crtbegin.o crtend.o'
 	;;
@@ -1062,11 +1070,11 @@ i[34567]86-*-freebsd[12] | i[34567]86-*-
 	tmake_file=t-freebsd
 	;;
 i[34567]86-*-freebsd*)
-	tm_file="${tm_file} i386/att.h svr4.h ${fbsd_tm_file} i386/freebsd.h"
+	tm_file="${tm_file} i386/att.h elfos.h svr4.h ${fbsd_tm_file} i386/freebsd.h"
 	;;
 i[34567]86-*-netbsdelf*)
 	xm_defines=POSIX
-	tm_file="${tm_file} i386/att.h svr4.h i386/netbsd-elf.h"
+	tm_file="${tm_file} i386/att.h elfos.h svr4.h i386/netbsd-elf.h"
 	tmake_file=t-netbsd
 	gnu_ld=yes
 	float_format=i386
@@ -1117,8 +1125,8 @@ i[34567]86-*-linux*aout*)	# Intel 80386'
 i[34567]86-*-linux*libc1)	# Intel 80386's running GNU/Linux
 				# with ELF format using the
 				# GNU/Linux C library 5
-	xmake_file=x-linux
-	tm_file="i386/i386.h i386/att.h linux.h i386/linux.h"
+	xmake_file=x-linux	
+	tm_file="${tm_file} i386/att.h elfos.h svr4.h linux.h i386/linux.h"
 	tmake_file="t-slibgcc-elf-ver t-linux t-linux-gnulibc1 i386/t-crtstuff"
 	extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 	gnu_ld=yes
@@ -1131,7 +1139,7 @@ i[34567]86-*-linux*)	# Intel 80386's run
 			# with ELF format using glibc 2
 			# aka GNU/Linux C library 6
 	xmake_file=x-linux
-	tm_file="i386/i386.h i386/att.h linux.h i386/linux.h"
+	tm_file="${tm_file} i386/att.h elfos.h svr4.h linux.h i386/linux.h"
 	tmake_file="t-slibgcc-elf-ver t-linux i386/t-crtstuff"
 	extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 	gnu_ld=yes
@@ -1161,7 +1169,7 @@ i[34567]86-pc-msdosdjgpp*)
 	esac
 	;;
 i[34567]86-moss-msdos* | i[34567]86-*-moss*)
-	tm_file="i386/i386.h i386/att.h linux.h i386/linux.h i386/moss.h"
+	tm_file="${tm_file} i386/att.h elfos.h svr4.h linux.h i386/linux.h i386/moss.h"
 	tmake_file=t-libc-ok
 	gnu_ld=yes
 	gas=yes
@@ -1192,15 +1200,13 @@ i[34567]86-*-osfrose*)		# 386 using OSF/
 	extra_objs=halfpic.o
 	;;
 i[34567]86-go32-rtems*)
-	cpu_type=i386
-	tm_file=i386/go32-rtems.h
+	tm_file=i386/djgpp-rtems.h
 	tmake_file=t-rtems
 	if test x$enable_threads = xyes; then
 	  thread_file='rtems'
 	fi
 	;;
 i[34567]86-*-rtemscoff*)
-	cpu_type=i386
 	tm_file=i386/rtems.h
 	tmake_file=t-rtems
 	if test x$enable_threads = xyes; then
@@ -1208,8 +1214,7 @@ i[34567]86-*-rtemscoff*)
 	fi
 	;;
 i[34567]86-*-rtems*|i[34567]86-*-rtemself*)
-	cpu_type=i386
-	tm_file=i386/rtemself.h
+	tm_file="${tm_file} i386/att.h elfos.h svr4.h linux.h i386/rtemself.h rtems.h"
 	extra_parts="crtbegin.o crtend.o crti.o crtn.o"
 	tmake_file="i386/t-rtems-i386 i386/t-crtstuff t-rtems"
 	if test x$enable_threads = xyes; then
@@ -1232,7 +1237,7 @@ i[34567]86-*-sco3.2v5*)	# 80386 running 
 	;;
 i[34567]86-*-solaris2*)
 	xm_defines="POSIX SMALL_ARG_MAX"
-	tm_file=i386/sol2.h
+	tm_file="${tm_file} i386/att.h elfos.h svr4.h i386/sysv4.h i386/sol2.h"
 	if test x$gas = xyes; then
 		# Only needed if gas does not support -s
 		tm_file="i386/sol2gas.h ${tm_file}"
@@ -1261,7 +1266,7 @@ i[34567]86-*-solaris2*)
 	;;
 i[34567]86-*-sysv5*)           # Intel x86 on System V Release 5
        xm_defines=POSIX
-       tm_file=i386/sysv5.h
+       tm_file="${tm_file} i386/att.h elfos.h svr4.h i386/sysv4.h i386/sysv5.h"
        if test x$stabs = xyes
        then
                tm_file="${tm_file} dbx.h"
@@ -1275,7 +1280,7 @@ i[34567]86-*-sysv5*)           # Intel x
        ;;
 i[34567]86-*-sysv4*)		# Intel 80386's running system V.4
 	xm_defines="POSIX SMALL_ARG_MAX"
-	tm_file=i386/sysv4.h
+	tm_file="${tm_file} i386/att.h elfos.h svr4.h i386/sysv4.h"
 	if test x$stabs = xyes
 	then
 		tm_file="${tm_file} dbx.h"
@@ -1286,21 +1291,20 @@ i[34567]86-*-sysv4*)		# Intel 80386's ru
 	;;
 i[34567]86-*-udk*)      # Intel x86 on SCO UW/OSR5 Dev Kit
 	xm_defines=POSIX
-	tm_file=i386/udk.h
+	tm_file="${tm_file} i386/att.h elfos.h svr4.h i386/sysv4.h i386/sysv5.h i386/udk.h"
 	tmake_file="i386/t-crtpic i386/t-udk"
 	xmake_file=x-svr4
 	extra_parts="crtbegin.o crtend.o"
 	install_headers_dir=install-headers-cpio
 	;;
 i[34567]86-*-osf1*)		# Intel 80386's running OSF/1 1.3+
-	cpu_type=i386
 	xm_file=i386/xm-osf1elf.h
 	xm_defines='POSIX USE_C_ALLOCA SMALL_ARG_MAX'
 	if test x$stabs = xyes
 	then
-		tm_file=i386/osf1elfgdb.h
+		tm_file="${tm_file} i386/att.h elfos.h svr4.h i386/sysv4.h i386/osf1elf.h i386/osf1elfgdb.h"
 	else
-		tm_file=i386/osf1elf.h
+		tm_file="${tm_file} i386/att.h elfos.h svr4.h i386/sysv4.h i386/osf1elf.h"
 	fi
 	tmake_file=i386/t-osf1elf
 	extra_parts="crti.o crtn.o crtbegin.o crtend.o"
@@ -1403,13 +1407,13 @@ i[34567]86-*-interix*)
 i[34567]86-dg-dgux*)
 	xm_defines=POSIX
 	out_file=i386/dgux.c
-	tm_file=i386/dgux.h
+	tm_file="${tm_file} i386/att.h elfos.h svr4.h i386/sysv4.h i386/dgux.h"
 	tmake_file=i386/t-dgux
 	xmake_file=i386/x-dgux
 	install_headers_dir=install-headers-cpio
       ;;
 i860-alliant-*)		# Alliant FX/2800
-	tm_file="${tm_file} svr4.h i860/sysv4.h i860/fx2800.h"
+	tm_file="${tm_file} elfos.h svr4.h i860/sysv4.h i860/fx2800.h"
 	tmake_file=i860/t-fx2800
 	extra_parts="crtbegin.o crtend.o"
 	;;
@@ -1435,7 +1439,7 @@ i860-*-sysv3*)
 	extra_parts="crtbegin.o crtend.o"
 	;;
 i860-*-sysv4*)
-	tm_file="${tm_file} svr4.h i860/sysv4.h"
+	tm_file="${tm_file} elfos.h svr4.h i860/sysv4.h"
 	xm_defines=POSIX
 	tmake_file=t-svr4
 	extra_parts="crtbegin.o crtend.o"
@@ -1485,7 +1489,7 @@ i960-*-*)			# Default i960 environment.
 	cxx_target_objs="i960-c.o"
 	;;
 ia64*-*-aix*)
-	tm_file="${tm_file} svr4.h ia64/sysv4.h ia64/aix.h"
+	tm_file="${tm_file} elfos.h svr4.h ia64/sysv4.h ia64/aix.h"
 	tmake_file="ia64/t-ia64 ia64/t-aix"
 	target_cpu_default="MASK_GNU_AS|MASK_GNU_LD"
 	;;
@@ -1504,7 +1508,7 @@ ia64*-*-elf*)
 	float_format=i386
 	;;
 ia64*-*-linux*)
-	tm_file=ia64/linux.h
+	tm_file="${tm_file} elfos.h svr4.h linux.h ia64/sysv4.h ia64/linux.h"
 	tmake_file="t-slibgcc-elf-ver t-linux ia64/t-ia64 ia64/t-glibc"
 	target_cpu_default="MASK_GNU_AS|MASK_GNU_LD"
 	if test x$enable_threads = xyes; then
@@ -1513,7 +1517,7 @@ ia64*-*-linux*)
 	float_format=i386
 	;;
 ia64*-*-hpux*)
-	tm_file="ia64/ia64.h svr4.h ia64/sysv4.h ia64/hpux.h ia64/hpux_longdouble.h"
+	tm_file="${tm_file} elfos.h svr4.h ia64/sysv4.h ia64/hpux.h ia64/hpux_longdouble.h"
 	tmake_file="ia64/t-ia64 ia64/t-hpux"
 	target_cpu_default="MASK_GNU_AS"
 	if test x$enable_threads = xyes; then
@@ -1522,6 +1526,7 @@ ia64*-*-hpux*)
 	float_format=i386
 	;;
 m32r-*-elf*)
+	tm_file="elfos.h svr4.h ${tm_file}"
 	extra_parts="crtinit.o crtfini.o"
 	;;
 # m68hc11 and m68hc12 share the same machine description.
@@ -1962,11 +1967,11 @@ m88k-dg-dgux*)
 	xm_defines=POSIX
 	case $machine in
 	  m88k-dg-dguxbcs*)
-	    tm_file=m88k/dguxbcs.h
+	    tm_file="elfos.h svr4.h m88k/dgux.h m88k/dguxbcs.h"
 	    tmake_file=m88k/t-dguxbcs
 	    ;;
 	  *)
-	    tm_file=m88k/dgux.h
+	    tm_file="elfos.h svr4.h m88k/dgux.h"
 	    tmake_file=m88k/t-dgux
 	    ;;
 	esac
@@ -2031,12 +2036,12 @@ m88k-*-sysv3*)
 	;;
 m88k-*-sysv4*)
 	xm_defines=POSIX
-	tm_file=m88k/sysv4.h
+	tm_file="elfos.h svr4.h m88k/sysv4.h"
 	extra_parts="crtbegin.o crtend.o"
 	tmake_file=m88k/t-sysv4
 	;;
 mcore-*-elf)
-	tm_file=mcore/mcore-elf.h
+	tm_file="elfos.h svr4.h ${tm_file} mcore/mcore-elf.h"
 	tmake_file=mcore/t-mcore
 	;;
 mcore-*-pe*)
@@ -2213,13 +2218,13 @@ mipsel-*-netbsd* | mips-dec-netbsd*)    
 	;;
 mips*-*-linux*)				# Linux MIPS, either endian.
 	xmake_file=x-linux
-	tm_file="linux.h mips/linux.h"
+	tm_file="elfos.h svr4.h linux.h mips/linux.h"
 	case $machine in
 		mipsisa32el-*)
-			tm_file="mips/little.h $tm_file mips/isa32-linux.h";;
+			tm_file="mips/little.h ${tm_file} mips/isa32-linux.h";;
                 mipsisa32-*)
-			tm_file="$tm_file mips/isa32-linux.h";;
-	       	mips*el-*)  tm_file="mips/little.h $tm_file" ;;
+			tm_file="${tm_file} mips/isa32-linux.h";;
+	       	mips*el-*)  tm_file="mips/little.h ${tm_file}" ;;
 	esac
 	tmake_file="t-slibgcc-elf-ver t-linux"
 	extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
@@ -2504,8 +2509,7 @@ mips-*-*)				# Default MIPS RISC-OS 4.0.
 	;;
 mn10200-*-*)
 	float_format=i32
-	cpu_type=mn10200
-	tm_file="mn10200/mn10200.h"
+	tm_file="elfos.h svr4.h ${tm_file}"
 	if test x$stabs = xyes
 	then
 		tm_file="${tm_file} dbx.h"
@@ -2513,8 +2517,7 @@ mn10200-*-*)
 	use_collect2=no
 	;;
 mn10300-*-*)
-	cpu_type=mn10300
-	tm_file="mn10300/mn10300.h"
+	tm_file="elfos.h svr4.h ${tm_file}"
 	if test x$stabs = xyes
 	then
 		tm_file="${tm_file} dbx.h"
@@ -2567,12 +2570,12 @@ ns32k-*-openbsd*)
 	# Nothing special
 	;;
 pj*-linux*)
-	tm_file="svr4.h pj/linux.h ${tm_file}"
+	tm_file="elfos.h svr4.h pj/linux.h ${tm_file}"
 	;;
 pj-*)
 	;;
 pjl-*)
-	tm_file="svr4.h pj/pjl.h ${tm_file}"
+	tm_file="elfos.h svr4.h pj/pjl.h ${tm_file}"
 	;;
 
 romp-*-aos*)
@@ -2588,21 +2591,19 @@ powerpc-*-openbsd*)
 	tmake_file="${tmake_file} rs6000/t-rs6000 rs6000/t-openbsd"
 	;;
 powerpc64-*-linux*)
-	tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/linux64.h"
+	tm_file="${tm_file} elfos.h svr4.h rs6000/sysv4.h rs6000/linux64.h"
 	out_file=rs6000/rs6000.c
 	tmake_file="rs6000/t-ppcos t-slibgcc-elf-ver t-linux rs6000/t-ppccomm"
 	xmake_file=x-linux
 	extra_headers=ppc-asm.h
 	;;
 powerpc-*-beos*)
-	cpu_type=rs6000
 	tm_file="${tm_file} rs6000/aix.h rs6000/beos.h rs6000/xcoff.h"
 	xm_defines=POSIX
 	xm_file=rs6000/xm-beos.h
 	tmake_file=rs6000/t-beos
 	;;
 powerpc-*-darwin*)
-	cpu_type=rs6000
 	tm_file="${tm_file} darwin.h rs6000/darwin.h"
 	tm_p_file="${tm_p_file} darwin-protos.h"
 	tmake_file=rs6000/t-darwin
@@ -2618,20 +2619,20 @@ powerpc-*-darwin*)
 	use_collect2=no
 	;;
 powerpc-*-sysv*)
-	tm_file="${tm_file} svr4.h rs6000/sysv4.h"
+	tm_file="${tm_file} elfos.h svr4.h rs6000/sysv4.h"
 	xm_defines=POSIX
 	extra_headers=ppc-asm.h
 	tmake_file="rs6000/t-ppcos rs6000/t-ppccomm"
 	;;
 powerpc-*-netbsd*)
 	xm_defines=POSIX
-	tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/netbsd.h"
+	tm_file="${tm_file} elfos.h svr4.h rs6000/sysv4.h rs6000/netbsd.h"
 	tmake_file="rs6000/t-ppcos rs6000/t-ppccomm"
 	extra_headers=ppc-asm.h
 	;;
 powerpc-*-chorusos*)
 	xm_defines=POSIX
-	tm_file="${tm_file} svr4.h rs6000/sysv4.h chorus.h"
+	tm_file="${tm_file} elfos.h svr4.h rs6000/sysv4.h chorus.h"
 	tmake_file="rs6000/t-ppcos rs6000/t-ppccomm"
 	extra_headers=ppc-asm.h
 	case x${enable_threads} in
@@ -2642,31 +2643,31 @@ powerpc-*-chorusos*)
 	;;
 powerpc-*-eabiaix*)
 	xm_defines=POSIX
-	tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/eabi.h rs6000/eabiaix.h"
+	tm_file="${tm_file} elfos.h svr4.h rs6000/sysv4.h rs6000/eabi.h rs6000/eabiaix.h"
 	tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
 	extra_headers=ppc-asm.h
 	;;
 powerpc-*-eabisim*)
 	xm_defines=POSIX
-	tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/eabi.h rs6000/eabisim.h"
+	tm_file="${tm_file} elfos.h svr4.h rs6000/sysv4.h rs6000/eabi.h rs6000/eabisim.h"
 	tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
 	extra_headers=ppc-asm.h
 	;;
 powerpc-*-elf*)
 	xm_defines=POSIX
-	tm_file="${tm_file} svr4.h rs6000/sysv4.h"
+	tm_file="${tm_file} elfos.h svr4.h rs6000/sysv4.h"
 	tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
 	extra_headers=ppc-asm.h
 	;;
 powerpc-*-eabi*)
 	xm_defines=POSIX
-	tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/eabi.h"
+	tm_file="${tm_file} elfos.h svr4.h rs6000/sysv4.h rs6000/eabi.h"
 	tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
 	extra_headers=ppc-asm.h
 	;;
 powerpc-*-rtems*)
 	xm_defines=POSIX
-	tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/eabi.h rtems.h rs6000/rtems.h"
+	tm_file="${tm_file} elfos.h svr4.h rs6000/sysv4.h rs6000/eabi.h rtems.h rs6000/rtems.h"
 	tmake_file="rs6000/t-ppcgas t-rtems rs6000/t-ppccomm"
 	extra_headers=ppc-asm.h
 	if test x$enable_threads = xyes; then
@@ -2674,7 +2675,7 @@ powerpc-*-rtems*)
 	fi
 	;;
 powerpc-*-linux*libc1)
-	tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/linux.h"
+	tm_file="${tm_file} elfos.h svr4.h rs6000/sysv4.h rs6000/linux.h"
 	out_file=rs6000/rs6000.c
 	tmake_file="rs6000/t-ppcos t-slibgcc-elf-ver t-linux t-linux-gnulibc1 rs6000/t-ppccomm"
 	xmake_file=x-linux
@@ -2684,7 +2685,7 @@ powerpc-*-linux*libc1)
 	fi
 	;;
 powerpc-*-linux*)
-	tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/linux.h"
+	tm_file="${tm_file} elfos.h svr4.h rs6000/sysv4.h rs6000/linux.h"
 	out_file=rs6000/rs6000.c
 	tmake_file="rs6000/t-ppcos t-slibgcc-elf-ver t-linux rs6000/t-ppccomm"
 	xmake_file=x-linux
@@ -2694,47 +2695,45 @@ powerpc-*-linux*)
 	fi
 	;;
 powerpc-wrs-vxworks*)
-        cpu_type=rs6000
 	xm_defines=POSIX
-        tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/vxppc.h"
+        tm_file="${tm_file} elfos.h svr4.h rs6000/sysv4.h rs6000/vxppc.h"
         tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
 	extra_headers=ppc-asm.h
 	thread_file='vxworks'
         ;;
 powerpcle-wrs-vxworks*)
-        cpu_type=rs6000
 	xm_defines=POSIX
-        tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/sysv4le.h rs6000/vxppc.h"
+        tm_file="${tm_file} elfos.h svr4.h rs6000/sysv4.h rs6000/sysv4le.h rs6000/vxppc.h"
         tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
 	extra_headers=ppc-asm.h
 	thread_file='vxworks'
         ;;
 powerpcle-*-sysv*)
-	tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/sysv4le.h"
+	tm_file="${tm_file} elfos.h svr4.h rs6000/sysv4.h rs6000/sysv4le.h"
 	xm_defines=POSIX
 	tmake_file="rs6000/t-ppcos rs6000/t-ppccomm"
 	extra_headers=ppc-asm.h
 	;;
 powerpcle-*-elf*)
 	xm_defines=POSIX
-	tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/sysv4le.h"
+	tm_file="${tm_file} elfos.h svr4.h rs6000/sysv4.h rs6000/sysv4le.h"
 	tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
 	extra_headers=ppc-asm.h
 	;;
 powerpcle-*-eabisim*)
 	xm_defines=POSIX
-	tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/sysv4le.h rs6000/eabi.h rs6000/eabisim.h"
+	tm_file="${tm_file} elfos.h svr4.h rs6000/sysv4.h rs6000/sysv4le.h rs6000/eabi.h rs6000/eabisim.h"
 	tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
 	extra_headers=ppc-asm.h
 	;;
 powerpcle-*-eabi*)
 	xm_defines=POSIX
-	tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/sysv4le.h rs6000/eabi.h"
+	tm_file="${tm_file} elfos.h svr4.h rs6000/sysv4.h rs6000/sysv4le.h rs6000/eabi.h"
 	tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
 	extra_headers=ppc-asm.h
 	;;
 powerpcle-*-solaris2*)
-	tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/sysv4le.h rs6000/sol2.h"
+	tm_file="${tm_file} elfos.h svr4.h rs6000/sysv4.h rs6000/sysv4le.h rs6000/sol2.h"
 	xm_defines=POSIX
 	tmake_file="rs6000/t-ppcos rs6000/t-ppccomm"
 	extra_headers=ppc-asm.h
@@ -2788,7 +2787,7 @@ rs6000-bull-bosx)
 	use_collect2=yes
 	;;
 rs6000-*-mach*)
-	tm_file="rs6000/rs6000.h rs6000/mach.h"
+	tm_file="${tm_file} rs6000/mach.h"
 	xm_defines=POSIX
 	use_collect2=yes
 	;;
@@ -2799,7 +2798,7 @@ rs6000-*-lynxos*)
 	;;
 s390-*-linux*)
 	xmake_file=x-linux
-	tm_file="s390/s390.h linux.h s390/linux.h"
+	tm_file="s390/s390.h elfos.h svr4.h linux.h s390/linux.h"
 	tmake_file="t-slibgcc-elf-ver t-linux s390/t-linux"
 	extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
 	if test x$enable_threads = xyes; then
@@ -2808,7 +2807,7 @@ s390-*-linux*)
 	;;
 s390x-*-linux*)
 	xmake_file=x-linux
-	tm_file="s390/s390.h linux.h s390/linux.h s390/linux64.h"
+	tm_file="s390/s390.h elfos.h svr4.h linux.h s390/linux.h s390/linux64.h"
 	tm_p_file=s390/s390-protos.h
 	md_file=s390/s390.md
 	out_file=s390/s390.c
@@ -2820,12 +2819,12 @@ s390x-*-linux*)
 	;;
 sh-*-elf*)
 	tmake_file="sh/t-sh sh/t-elf"
-	tm_file="sh/sh.h sh/elf.h"
+	tm_file="${tm_file} sh/elf.h"
 	float_format=sh
 	;;
 sh-*-rtemself*)
 	tmake_file="sh/t-sh sh/t-elf t-rtems"
-	tm_file="sh/sh.h sh/elf.h sh/rtemself.h"
+	tm_file="${tm_file} sh/elf.h sh/rtemself.h"
 	float_format=sh
 	if test x$enable_threads = xyes; then
 	  thread_file='rtems'
@@ -2833,14 +2832,14 @@ sh-*-rtemself*)
 	;;
 sh-*-rtems*)
 	tmake_file="sh/t-sh t-rtems"
-	tm_file="sh/sh.h sh/rtems.h"
+	tm_file="${tm_file} sh/rtems.h"
 	float_format=sh
 	if test x$enable_threads = xyes; then
 	  thread_file='rtems'
 	fi
 	;;
 sh-*-linux*)
-	tm_file="sh/sh.h sh/elf.h sh/linux.h"
+	tm_file="${tm_file} sh/elf.h sh/linux.h"
 	tmake_file="sh/t-sh sh/t-elf sh/t-linux"
 	xmake_file=x-linux
 	gas=yes gnu_ld=yes
@@ -3124,6 +3123,7 @@ sparc64-*-linux*)		# 64-bit Sparc's runn
 	float_format=sparc
 	;;
 stormy16-*-elf)
+	tm_file="elfos.h svr4.h ${tm_file}"
 	tmake_file="stormy16/t-stormy16"
 	extra_parts="crtbegin.o crtend.o"
 	;;
@@ -3153,8 +3153,7 @@ thumb*-*-*)
 *** when the -mthumb switch is given to the compiler." 1>&2; exit 1; }
 	;;
 v850-*-rtems*)
-	cpu_type=v850
-	tm_file="v850/rtems.h"
+	tm_file="elfos.h svr4.h ${tm_file} v850/rtems.h"
 	tmake_file="v850/t-v850 t-rtems"
 	if test x$stabs = xyes
 	then
@@ -3166,8 +3165,7 @@ v850-*-rtems*)
 	;;
 v850-*-*)
 	target_cpu_default="TARGET_CPU_generic"
-	cpu_type=v850
-	tm_file="v850/v850.h"
+	tm_file="elfos.h svr4.h ${tm_file}"
 	tmake_file=v850/t-v850
 	if test x$stabs = xyes
 	then
Index: gcc/config/linux.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/linux.h,v
retrieving revision 1.15
diff -u -p -r1.15 linux.h
--- gcc/config/linux.h	2001/07/21 09:42:19	1.15
+++ gcc/config/linux.h	2001/09/30 17:06:56
@@ -37,12 +37,9 @@ Boston, MA 02111-1307, USA.  */
 #undef ASM_APP_OFF
 #define ASM_APP_OFF "#NO_APP\n"
 
-#define SET_ASM_OP	"\t.set\t"
-
 /* Use stabs instead of DWARF debug format.  */
 #undef PREFERRED_DEBUGGING_TYPE
 #define PREFERRED_DEBUGGING_TYPE DBX_DEBUG
-#include "svr4.h"
 
 #undef MD_EXEC_PREFIX
 #undef MD_STARTFILE_PREFIX
Index: gcc/config/netware.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/netware.h,v
retrieving revision 1.3
diff -u -p -r1.3 netware.h
--- gcc/config/netware.h	2001/08/09 22:33:20	1.3
+++ gcc/config/netware.h	2001/09/30 17:06:56
@@ -1,6 +1,6 @@
 /* netware.h -- operating system specific defines to be used when 
    targeting GCC for some generic NetWare 4 system.
-   Copyright (C) 1993, 1994, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 2000, 2001 Free Software Foundation, Inc.
 
    Written by David V. Henkel-Wallace (gumby@cygnus.com)
 
@@ -100,4 +100,5 @@ const_section ()                        
     }                                                                   \
 }
 
+#undef	INT_ASM_OP
 #define INT_ASM_OP ".long"
Index: gcc/config/ptx4.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/ptx4.h,v
retrieving revision 1.13
diff -u -p -r1.13 ptx4.h
--- gcc/config/ptx4.h	2001/04/16 18:30:34	1.13
+++ gcc/config/ptx4.h	2001/09/30 17:06:56
@@ -30,11 +30,9 @@ Boston, MA 02111-1307, USA.
 
 /* Use DWARF debugging info by default.  */
 
-#ifndef PREFERRED_DEBUGGING_TYPE
+#undef PREFERRED_DEBUGGING_TYPE
 #define PREFERRED_DEBUGGING_TYPE DWARF_DEBUG
-#endif
 
-#include "elfos.h"
 
 /* Cpp, assembler, linker, library, and startfile spec's.  */
 
Index: gcc/config/svr4.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/svr4.h,v
retrieving revision 1.24
diff -u -p -r1.24 svr4.h
--- gcc/config/svr4.h	2001/08/13 21:43:41	1.24
+++ gcc/config/svr4.h	2001/09/30 17:06:56
@@ -1,7 +1,7 @@
 /* Operating system specific defines to be used when targeting GCC for some
    generic System V Release 4 system.
    Copyright (C) 1991, 1994, 1995, 1996, 1997, 1998, 1999,
-   2000 Free Software Foundation, Inc.
+   2000, 2001 Free Software Foundation, Inc.
    Contributed by Ron Guilmette (rfg@monkeys.com).
 
 This file is part of GNU CC.
@@ -21,29 +21,22 @@ along with GNU CC; see the file COPYING.
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.
 
-   To use this file, make up a file with a name like:
+   To use this file, make up a line like that in config.gcc:
 
-	?????svr4.h
+	tm_file="$tm_file elfos.h svr4.h MACHINE/svr4.h"
 
-   where ????? is replaced by the name of the basic hardware that you
-   are targeting for.  Then, in the file ?????svr4.h, put something
-   like:
-
-	#include "?????.h"
-	#include "svr4.h"
-
-   followed by any really system-specific defines (or overrides of
-   defines) which you find that you need.  For example, CPP_PREDEFINES
-   is defined here with only the defined -Dunix and -DSVR4.  You should
-   probably override that in your target-specific ?????svr4.h file
-   with a set of defines that includes these, but also contains an
-   appropriate define for the type of hardware that you are targeting.
+   where MACHINE is replaced by the name of the basic hardware that you
+   are targeting for.  Then, in the file MACHINE/svr4.h, put any really
+   system-specific defines (or overrides of defines) which you find that
+   you need.  For example, CPP_PREDEFINES is defined here with only the
+   defined -Dunix and -DSVR4.  You should probably override that in your
+   target-specific MACHINE/svr4.h file with a set of defines that
+   includes these, but also contains an appropriate define for the type
+   of hardware that you are targeting.
 */
 
 /* Define a symbol indicating that we are using svr4.h.  */
 #define USING_SVR4_H
-
-#include "elfos.h"
 
 /* Cpp, assembler, linker, library, and startfile spec's.  */
 
Index: gcc/config/arc/arc.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/arc/arc.h,v
retrieving revision 1.32
diff -u -p -r1.32 arc.h
--- gcc/config/arc/arc.h	2001/08/09 22:33:21	1.32
+++ gcc/config/arc/arc.h	2001/09/30 17:06:58
@@ -28,8 +28,6 @@ Boston, MA 02111-1307, USA.  */
    - print active compiler options in assembler output
 */
 
-/* ??? Create elf.h and have svr4.h include it.  */
-#include "svr4.h"
 
 #undef ASM_SPEC
 #undef LINK_SPEC
Index: gcc/config/d30v/d30v.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/d30v/d30v.h,v
retrieving revision 1.33
diff -u -p -r1.33 d30v.h
--- gcc/config/d30v/d30v.h	2001/09/21 01:27:04	1.33
+++ gcc/config/d30v/d30v.h	2001/09/30 17:07:07
@@ -28,10 +28,6 @@
 #define D30V_ALIGN(addr,align) (((addr) + (align) - 1) & ~((align) - 1))
 
 
-/* Set up System V.4 (aka ELF) defaults.  */
-#include "svr4.h"
-
-
 /* Driver configuration */
 
 /* A C expression which determines whether the option `-CHAR' takes arguments.
Index: gcc/config/fr30/fr30.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/fr30/fr30.h,v
retrieving revision 1.19
diff -u -p -r1.19 fr30.h
--- gcc/config/fr30/fr30.h	2001/09/21 01:27:04	1.19
+++ gcc/config/fr30/fr30.h	2001/09/30 17:07:16
@@ -22,12 +22,6 @@ the Free Software Foundation, 59 Temple 
 Boston, MA 02111-1307, USA.  */
 
 /*}}}*/ 
-/*{{{  Includes.  */ 
-
-/* Set up System V.4 (aka ELF) defaults.  */
-#include "svr4.h"
-
-/*}}}*/ 
 /*{{{  Driver configuration.  */ 
 
 /* A C expression which determines whether the option `-CHAR' takes arguments.
Index: gcc/config/i370/linux.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/i370/linux.h,v
retrieving revision 1.3
diff -u -p -r1.3 linux.h
--- gcc/config/i370/linux.h	2000/11/02 23:29:09	1.3
+++ gcc/config/i370/linux.h	2001/09/30 17:07:16
@@ -37,9 +37,8 @@ Boston, MA 02111-1307, USA.  */
 #define REAL_ARITHMETIC
 
 /* Include system common definitions */
-
-#include "config/linux.h"
-#include "config/i370/i370.h"
+/* TODO: convert include to ${tm_file} list in config.gcc.  */
+#include "i370/i370.h"
 
 /* Names to predefine in the preprocessor for this target machine.  */
 
Index: gcc/config/i386/beos-elf.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/i386/beos-elf.h,v
retrieving revision 1.9
diff -u -p -r1.9 beos-elf.h
--- gcc/config/i386/beos-elf.h	2001/05/17 03:15:56	1.9
+++ gcc/config/i386/beos-elf.h	2001/09/30 17:07:16
@@ -1,5 +1,5 @@
 /* Definitions for Intel x86 running BeOS
-   Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -18,9 +18,6 @@ along with GNU CC; see the file COPYING.
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-#include <i386/i386.h>	/* Base i386 target machine definitions */
-#include <i386/att.h>	/* Use the i386 AT&T assembler syntax */
-#include <svr4.h>	/* some common stuff */
 
 #undef TARGET_VERSION
 #define TARGET_VERSION fprintf (stderr, " (i386 BeOS/ELF)");
Index: gcc/config/i386/dgux.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/i386/dgux.h,v
retrieving revision 1.14
diff -u -p -r1.14 dgux.h
--- gcc/config/i386/dgux.h	2001/09/11 16:49:58	1.14
+++ gcc/config/i386/dgux.h	2001/09/30 17:07:17
@@ -1,5 +1,5 @@
 /* Target definitions for GNU compiler for Intel 80x86 running DG/ux
-   Copyright (C) 1993, 1995, 1996, 1997, 1998, 2000
+   Copyright (C) 1993, 1995, 1996, 1997, 1998, 2000, 2001
    Free Software Foundation, Inc.
    Currently maintained by gcc@dg-rtp.dg.com.
 
@@ -24,8 +24,6 @@ Boston, MA 02111-1307, USA.  */
    few hacks
 */
 
-#include "i386/sysv4.h"
-
 #ifndef VERSION_INFO2
 #define VERSION_INFO2   "$Revision: 1.14 $"
 #endif
@@ -80,6 +78,7 @@ Boston, MA 02111-1307, USA.  */
 #undef  DBX_DEBUGGING_INFO
 #define DBX_DEBUGGING_INFO
 
+#undef  PREFERRED_DEBUGGING_TYPE
 #define PREFERRED_DEBUGGING_TYPE DWARF_DEBUG
 
 /* Override svr[34].h.  */
Index: gcc/config/i386/netware.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/i386/netware.h,v
retrieving revision 1.2
diff -u -p -r1.2 netware.h
--- gcc/config/i386/netware.h	2000/11/02 23:29:10	1.2
+++ gcc/config/i386/netware.h	2001/09/30 17:07:17
@@ -20,9 +20,6 @@ You should have received a copy of the G
 along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
-#include "i386/sysv4.h"		/* Build on the base i386 SVR4 configuration */
-#include "netware.h"		/* Then add netware-specific goo. */
-
 #undef TARGET_VERSION
 #define TARGET_VERSION fprintf (stderr, " (i386 Netware 4)");
 
Index: gcc/config/i386/osf1elf.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/i386/osf1elf.h,v
retrieving revision 1.10
diff -u -p -r1.10 osf1elf.h
--- gcc/config/i386/osf1elf.h	2001/07/06 18:40:11	1.10
+++ gcc/config/i386/osf1elf.h	2001/09/30 17:07:17
@@ -3,7 +3,6 @@
    Copyright (C) 2000 Free Software Foundation, Inc. */
 
 #include <stdio.h>
-#include "i386/sysv4.h"	/* Base i386 target machine definitions */
 
 #undef TARGET_VERSION
 #define TARGET_VERSION fprintf (stderr, " (i386 OSF/1)");
Index: gcc/config/i386/osf1elfgdb.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/i386/osf1elfgdb.h,v
retrieving revision 1.2
diff -u -p -r1.2 osf1elfgdb.h
--- gcc/config/i386/osf1elfgdb.h	1998/12/16 21:03:50	1.2
+++ gcc/config/i386/osf1elfgdb.h	2001/09/30 17:07:17
@@ -2,6 +2,6 @@
    with gas and gdb.  */
 
 /* Use stabs instead of DWARF debug format.  */
+#undef PREFERRED_DEBUGGING_TYPE
 #define PREFERRED_DEBUGGING_TYPE DBX_DEBUG
 
-#include "i386/osf1elf.h"
Index: gcc/config/i386/ptx4-i.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/i386/ptx4-i.h,v
retrieving revision 1.12
diff -u -p -r1.12 ptx4-i.h
--- gcc/config/i386/ptx4-i.h	2001/05/20 19:54:04	1.12
+++ gcc/config/i386/ptx4-i.h	2001/09/30 17:07:17
@@ -22,9 +22,6 @@ along with GNU CC; see the file COPYING.
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-#include "i386/i386.h"	/* Base i386 target machine definitions */
-#include "i386/att.h"	/* Use the i386 AT&T assembler syntax */
-#include "ptx4.h"	/* Rest of definitions (non architecture dependent) */
 
 #undef TARGET_VERSION
 #define TARGET_VERSION fprintf (stderr, " (i386 Sequent Dynix/ptx Version 4)");
Index: gcc/config/i386/rtemself.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/i386/rtemself.h,v
retrieving revision 1.10
diff -u -p -r1.10 rtemself.h
--- gcc/config/i386/rtemself.h	2001/05/17 03:15:56	1.10
+++ gcc/config/i386/rtemself.h	2001/09/30 17:07:17
@@ -23,13 +23,6 @@ Boston, MA 02111-1307, USA.  */
 
 #define LINUX_DEFAULT_ELF
 
-/* A lie, I guess, but the general idea behind linux/ELF is that we are
-   supposed to be outputting something that will assemble under SVr4.
-   This gets us pretty close.  */
-#include <i386/i386.h>	/* Base i386 target machine definitions */
-#include <i386/att.h>	/* Use the i386 AT&T assembler syntax */
-#include <linux.h>	/* some common stuff */
-
 #undef TARGET_VERSION
 #define TARGET_VERSION fprintf (stderr, " (i386 RTEMS with ELF)");
 
@@ -99,8 +92,5 @@ Boston, MA 02111-1307, USA.  */
 
 #undef ENDFILE_SPEC
 #define ENDFILE_SPEC   "crtend.o%s crtn.o%s"
-
-/* Get machine-independent configuration parameters for RTEMS.  */
-#include <rtems.h>
 
 /* end of i386/rtemself.h */
Index: gcc/config/i386/sol2.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/i386/sol2.h,v
retrieving revision 1.13
diff -u -p -r1.13 sol2.h
--- gcc/config/i386/sol2.h	2001/09/28 21:35:06	1.13
+++ gcc/config/i386/sol2.h	2001/09/30 17:07:17
@@ -20,7 +20,6 @@ along with GNU CC; see the file COPYING.
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-#include "i386/sysv4.h"
 
 /* We use stabs-in-elf for debugging, because that is what the native
    toolchain uses.  */
Index: gcc/config/i386/sysv4.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/i386/sysv4.h,v
retrieving revision 1.13
diff -u -p -r1.13 sysv4.h
--- gcc/config/i386/sysv4.h	2001/05/22 16:57:40	1.13
+++ gcc/config/i386/sysv4.h	2001/09/30 17:07:19
@@ -1,5 +1,5 @@
 /* Target definitions for GNU compiler for Intel 80386 running System V.4
-   Copyright (C) 1991 Free Software Foundation, Inc.
+   Copyright (C) 1991, 2001 Free Software Foundation, Inc.
 
    Written by Ron Guilmette (rfg@netcom.com).
 
@@ -20,9 +20,6 @@ along with GNU CC; see the file COPYING.
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-#include "i386/i386.h"	/* Base i386 target machine definitions */
-#include "i386/att.h"	/* Use the i386 AT&T assembler syntax */
-#include "svr4.h"	/* Definitions common to all SVR4 targets */
 
 #undef TARGET_VERSION
 #define TARGET_VERSION fprintf (stderr, " (i386 System V Release 4)");
Index: gcc/config/i386/sysv5.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/i386/sysv5.h,v
retrieving revision 1.4
diff -u -p -r1.4 sysv5.h
--- gcc/config/i386/sysv5.h	2000/01/31 07:28:05	1.4
+++ gcc/config/i386/sysv5.h	2001/09/30 17:07:19
@@ -20,8 +20,6 @@ the Free Software Foundation, 59 Temple 
 Boston, MA 02111-1307, USA.  */
 
 
-#include "i386/sysv4.h"
-
 /* Dwarf2 is supported by native debuggers  */
 
 #undef PREFERRED_DEBUGGING_TYPE
Index: gcc/config/i386/udk.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/i386/udk.h,v
retrieving revision 1.4
diff -u -p -r1.4 udk.h
--- gcc/config/i386/udk.h	1999/06/03 21:27:41	1.4
+++ gcc/config/i386/udk.h	2001/09/30 17:07:19
@@ -6,8 +6,6 @@
 /* We're very much the SVR4 target with "/udk" prepended to everything that's
    interesting */
 
-#include "i386/sysv5.h"
-
 #undef MD_EXEC_PREFIX
 #define MD_EXEC_PREFIX 		"/udk/usr/ccs/bin/" 
 
Index: gcc/config/i860/fx2800.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/i860/fx2800.h,v
retrieving revision 1.8
diff -u -p -r1.8 fx2800.h
--- gcc/config/i860/fx2800.h	2001/05/17 03:15:57	1.8
+++ gcc/config/i860/fx2800.h	2001/09/30 17:07:19
@@ -157,6 +157,7 @@ Boston, MA 02111-1307, USA.  */
 #define DBX_MEMPARM_STABS_LETTER 'k'
 #define DBX_REGPARM_STABS_LETTER 'r'
 
+#undef  ASM_OUTPUT_SOURCE_LINE
 #define ASM_OUTPUT_SOURCE_LINE(file,num)		\
 	fprintf (file, "\t.stab \"\",.,0x%x,0,%d\n",	\
 		N_SLINE,num)
Index: gcc/config/ia64/elf.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/ia64/elf.h,v
retrieving revision 1.1
diff -u -p -r1.1 elf.h
--- gcc/config/ia64/elf.h	2000/03/09 00:26:04	1.1
+++ gcc/config/ia64/elf.h	2001/09/30 17:07:19
@@ -1,5 +1,6 @@
 /* Definitions for embedded ia64-elf target.  */
 
+/* TODO: convert includes to ${tm_file} list in config.gcc.  */
 #include "ia64/ia64.h"
 #include "elfos.h"
 #include "sysv4.h"
Index: gcc/config/ia64/linux.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/ia64/linux.h,v
retrieving revision 1.10
diff -u -p -r1.10 linux.h
--- gcc/config/ia64/linux.h	2001/06/22 21:35:25	1.10
+++ gcc/config/ia64/linux.h	2001/09/30 17:07:19
@@ -1,7 +1,4 @@
 /* Definitions for ia64-linux target.  */
-#include "ia64/ia64.h"
-#include <linux.h>
-#include "sysv4.h"
 
 /* This is for -profile to use -lc_p instead of -lc. */
 #undef CC1_SPEC
Index: gcc/config/m32r/m32r.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/m32r/m32r.h,v
retrieving revision 1.46
diff -u -p -r1.46 m32r.h
--- gcc/config/m32r/m32r.h	2001/09/11 16:49:58	1.46
+++ gcc/config/m32r/m32r.h	2001/09/30 17:07:46
@@ -23,9 +23,6 @@ Boston, MA 02111-1307, USA.  */
 - longlong.h?
 */
 
-/* ??? Create elf.h and have svr4.h include it.  */
-#include "svr4.h"
-
 #undef SWITCH_TAKES_ARG
 #undef WORD_SWITCH_TAKES_ARG
 #undef HANDLE_SYSV_PRAGMA
Index: gcc/config/m68k/linux.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/m68k/linux.h,v
retrieving revision 1.14
diff -u -p -r1.14 linux.h
--- gcc/config/m68k/linux.h	2001/07/30 21:30:39	1.14
+++ gcc/config/m68k/linux.h	2001/09/30 17:08:03
@@ -23,12 +23,15 @@ Boston, MA 02111-1307, USA.  */
 #define MOTOROLA		/* Use Motorola syntax */
 #define USE_GAS			/* But GAS wants jbsr instead of jsr */
 
+/* TODO: convert includes to ${tm_file} list in config.gcc.  */
 #include <m68k/m68k.h>
 
 /* Make sure CC1 is undefined. */
 #undef CC1_SPEC
 
-#include <linux.h>		/* some common stuff */
+#include "elfos.h"
+#include "svr4.h"
+#include "linux.h"		/* some common stuff */
 
 #undef TARGET_VERSION
 #define TARGET_VERSION fprintf (stderr, " (68k GNU/Linux with ELF)");
Index: gcc/config/m68k/m68kv4.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/m68k/m68kv4.h,v
retrieving revision 1.11
diff -u -p -r1.11 m68kv4.h
--- gcc/config/m68k/m68kv4.h	2001/04/16 18:30:41	1.11
+++ gcc/config/m68k/m68kv4.h	2001/09/30 17:08:03
@@ -25,8 +25,10 @@ Boston, MA 02111-1307, USA.  */
 
 #define SGS_SWITCH_TABLES	/* Different switch table handling */
 
+/* TODO: convert includes to ${tm_file} list in config.gcc.  */
 #include "m68k/sgs.h"		/* The m68k/SVR4 assembler is SGS based */
 
+#include "elfos.h"
 #include "svr4.h"		/* Pick up the generic SVR4 macros */
 
 /* See m68k.h.  7 means 68020 with 68881.  */
Index: gcc/config/m88k/dgux.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/m88k/dgux.h,v
retrieving revision 1.10
diff -u -p -r1.10 dgux.h
--- gcc/config/m88k/dgux.h	2001/09/11 16:49:59	1.10
+++ gcc/config/m88k/dgux.h	2001/09/30 17:08:05
@@ -1,6 +1,6 @@
 /* Definitions of target machine for GNU compiler.
    Motorola m88100 running DG/UX.
-   Copyright (C) 1988, 1992, 1993, 1994, 1995, 1996, 1997, 2000
+   Copyright (C) 1988, 1992, 1993, 1994, 1995, 1996, 1997, 2000, 2001
    Free Software Foundation, Inc.
    Contributed by Michael Tiemann (tiemann@mcc.com)
    Currently maintained by (gcc@dg-rtp.dg.com)
@@ -26,7 +26,9 @@ Boston, MA 02111-1307, USA.  */
    supported.  The option -msvr4 specifies elf.  With these combinations, 
    -g means dwarf.  */
 /* DWARF_DEBUGGING_INFO defined in svr4.h.  */
+#undef SDB_DEBUGGING_INFO
 #define SDB_DEBUGGING_INFO
+#undef PREFERRED_DEBUGGING_TYPE
 #define PREFERRED_DEBUGGING_TYPE \
   (TARGET_SVR4 ? DWARF_DEBUG : SDB_DEBUG)
 
@@ -36,7 +38,7 @@ Boston, MA 02111-1307, USA.  */
 #define AS_BUG_FLDCR
 #endif
 
-#include "svr4.h"
+/* TODO: convert includes to ${tm_file} list in config.gcc.  */
 #include "m88k/m88k.h"
 
 /* Augment TARGET_SWITCHES with the MXDB options.  */
Index: gcc/config/m88k/dguxbcs.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/m88k/dguxbcs.h,v
retrieving revision 1.4
diff -u -p -r1.4 dguxbcs.h
--- gcc/config/m88k/dguxbcs.h	2000/12/07 02:01:22	1.4
+++ gcc/config/m88k/dguxbcs.h	2001/09/30 17:08:05
@@ -1,6 +1,6 @@
 /* Definitions of target machine for GNU compiler.
    Motorola m88100 running DG/UX.
-   Copyright (C) 1988, 1992, 1993, 1994, 1995, 1996
+   Copyright (C) 1988, 1992, 1993, 1994, 1995, 1996, 2001
    Free Software Foundation, Inc.
    Contributed by Michael Tiemann (tiemann@mcc.com)
    Currently maintained by (gcc@dg-rtp.dg.com)
@@ -22,7 +22,6 @@ along with GNU CC; see the file COPYING.
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-#include "m88k/dgux.h"
 
 /* dgux.h builds an elf gcc which compiles elf objects by default.
    dguxbcs.h builds a bcs gcc which compiles bcs objects by default.
Index: gcc/config/m88k/sysv4.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/m88k/sysv4.h,v
retrieving revision 1.5
diff -u -p -r1.5 sysv4.h
--- gcc/config/m88k/sysv4.h	2000/11/02 23:29:11	1.5
+++ gcc/config/m88k/sysv4.h	2001/09/30 17:08:05
@@ -1,6 +1,6 @@
 /* Definitions of target machine for GNU compiler.
    Motorola 88100 in an 88open ABI environment.
-   Copyright (C) 1990, 1991, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1991, 2000, 2001 Free Software Foundation, Inc.
 
    Written by Ron Guilmette (rfg@netcom.com).
    Contributed to FSF by Network Computing Devices.
@@ -33,7 +33,7 @@ Boston, MA 02111-1307, USA.  */
 #define AS_BUG_POUND_TYPE
 #endif
 
-#include "svr4.h"
+/* TODO: convert includes to ${tm_file} list in config.gcc.  */
 #include "m88k/m88k.h"
 
 /* Identify the compiler.  */
Index: gcc/config/mcore/mcore-elf.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/mcore/mcore-elf.h,v
retrieving revision 1.5
diff -u -p -r1.5 mcore-elf.h
--- gcc/config/mcore/mcore-elf.h	2001/04/16 18:30:43	1.5
+++ gcc/config/mcore/mcore-elf.h	2001/09/30 17:08:05
@@ -1,5 +1,5 @@
 /* Definitions of MCore target. 
-   Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
    Contributed by Cygnus Solutions.
 
 This file is part of GNU CC.
@@ -26,9 +26,6 @@ Boston, MA 02111-1307, USA.  */
 #define TARGET_VERSION fputs (" (Motorola MCORE/elf)", stderr)
 
 #define SUBTARGET_CPP_PREDEFINES " -D__ELF__"
-
-#include "svr4.h"
-#include "mcore/mcore.h"
 
 /* Use DWARF2 debugging info.  */
 #ifndef DWARF2_DEBUGGING_INFO
Index: gcc/config/mips/gnu.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/mips/gnu.h,v
retrieving revision 1.6
diff -u -p -r1.6 gnu.h
--- gcc/config/mips/gnu.h	2001/04/16 18:30:44	1.6
+++ gcc/config/mips/gnu.h	2001/09/30 17:08:05
@@ -1,5 +1,5 @@
 /* Definitions of target machine for GNU compiler.  MIPS GNU Hurd version.
-   Copyright (C) 1995, 1996, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1999, 2000, 2001 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -20,6 +20,7 @@ Boston, MA 02111-1307, USA.  */
 
 #define TARGET_DEFAULT MASK_GAS
 
+/* TODO: convert includes to ${tm_file} list in config.gcc.  */
 #include <mips/mips.h>
 
 #undef SWITCH_TAKES_ARG
@@ -32,7 +33,8 @@ Boston, MA 02111-1307, USA.  */
 #undef ASM_DECLARE_OBJECT_NAME
 /* #undef PREFERRED_DEBUGGING_TYPE */
 
-#include <svr4.h>
+#include "elfos.h"
+#include "svr4.h"
 
 #undef MD_EXEC_PREFIX
 #undef MD_STARTFILE_PREFIX
@@ -107,6 +109,3 @@ Boston, MA 02111-1307, USA.  */
 #define DWARF_DEBUGGING_INFO
 
 #define NO_MIPS_SELECT_SECTION
-
-/* Get machine-independent configuration parameters for the GNU system.  */
-#include <gnu.h>
Index: gcc/config/mn10200/mn10200.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/mn10200/mn10200.h,v
retrieving revision 1.27
diff -u -p -r1.27 mn10200.h
--- gcc/config/mn10200/mn10200.h	2001/08/03 01:19:18	1.27
+++ gcc/config/mn10200/mn10200.h	2001/09/30 17:08:08
@@ -21,7 +21,6 @@ along with GNU CC; see the file COPYING.
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-#include "svr4.h"
 
 /* Get rid of svr4.h stuff we don't want/need.  */
 #undef ASM_SPEC
Index: gcc/config/mn10300/mn10300.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/mn10300/mn10300.h,v
retrieving revision 1.48
diff -u -p -r1.48 mn10300.h
--- gcc/config/mn10300/mn10300.h	2001/08/03 23:53:56	1.48
+++ gcc/config/mn10300/mn10300.h	2001/09/30 17:08:10
@@ -21,7 +21,6 @@ along with GNU CC; see the file COPYING.
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-#include "svr4.h"
 
 #undef ASM_SPEC
 #undef ASM_FINAL_SPEC
Index: gcc/config/pj/pj.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/pj/pj.h,v
retrieving revision 1.12
diff -u -p -r1.12 pj.h
--- gcc/config/pj/pj.h	2001/07/21 09:42:20	1.12
+++ gcc/config/pj/pj.h	2001/09/30 17:08:13
@@ -1162,10 +1162,12 @@ do { fputs (current_function_varargs || 
 #define LOCAL_LABEL_PREFIX "."
 
 /* Make an internal label into a string.  */
+#undef  ASM_GENERATE_INTERNAL_LABEL
 #define ASM_GENERATE_INTERNAL_LABEL(STRING, PREFIX, NUM) \
   sprintf ((STRING), "*%s%s%ld", LOCAL_LABEL_PREFIX, (PREFIX), (long)(NUM))
 
 /* Output an internal label definition.  */
+#undef  ASM_OUTPUT_INTERNAL_LABEL
 #define ASM_OUTPUT_INTERNAL_LABEL(FILE,PREFIX,NUM) \
   asm_fprintf ((FILE), "%L%s%d:\n", (PREFIX), (NUM))
 
@@ -1220,6 +1222,7 @@ do { char dstr[30];                     
 /* This is how to output an assembler line
    that says to advance the location counter by SIZE bytes.  */
 
+#undef  ASM_OUTPUT_SKIP
 #define ASM_OUTPUT_SKIP(FILE,SIZE) \
   fprintf ((FILE), "\t.space %d\n", (SIZE))
 
Index: gcc/config/sh/elf.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/sh/elf.h,v
retrieving revision 1.15
diff -u -p -r1.15 elf.h
--- gcc/config/sh/elf.h	2001/08/09 22:33:29	1.15
+++ gcc/config/sh/elf.h	2001/09/30 17:08:27
@@ -1,5 +1,5 @@
 /* Definitions of target machine for gcc for Hitachi Super-H using ELF.
-   Copyright (C) 1996, 1997, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
    Contributed by Ian Lance Taylor <ian@cygnus.com>.
 
 This file is part of GNU CC.
@@ -19,18 +19,6 @@ along with GNU CC; see the file COPYING.
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-/* No SDB debugging info.  */
-#undef SDB_DEBUGGING_INFO
-
-/* Generate DWARF2 debugging information and make it the default */
-#define DWARF2_DEBUGGING_INFO
-
-#undef PREFERRED_DEBUGGING_TYPE
-#define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG
-
-/* use a more compact format for line information */
-#define DWARF2_ASM_LINE_DEBUG_INFO 1
-
 /* Undefine some macros defined in both sh.h and svr4.h.  */
 #undef IDENT_ASM_OP
 #undef ASM_FILE_END
@@ -41,7 +29,22 @@ Boston, MA 02111-1307, USA.  */
 #undef MAX_OFILE_ALIGNMENT
 
 /* Be ELF-like.  */
+/* TODO: convert includes to ${tm_file} list in config.gcc.  */
+#include "elfos.h"
 #include "svr4.h"
+
+/* No SDB debugging info.  */
+#undef SDB_DEBUGGING_INFO
+
+/* Generate DWARF2 debugging information and make it the default */
+#undef DWARF2_DEBUGGING_INFO
+#define DWARF2_DEBUGGING_INFO 1
+
+#undef PREFERRED_DEBUGGING_TYPE
+#define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG
+
+/* use a more compact format for line information */
+#define DWARF2_ASM_LINE_DEBUG_INFO 1
 
 /* The prefix to add to user-visible assembler symbols.
    Note that svr4.h redefined it from the original value (that we want)
Index: gcc/config/sparc/sysv4.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/sparc/sysv4.h,v
retrieving revision 1.18
diff -u -p -r1.18 sysv4.h
--- gcc/config/sparc/sysv4.h	2001/09/11 16:50:01	1.18
+++ gcc/config/sparc/sysv4.h	2001/09/30 17:08:27
@@ -20,6 +20,7 @@ along with GNU CC; see the file COPYING.
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
+/* TODO: convert includes to ${tm_file} list in config.gcc.  */
 #include "sparc/sparc.h"
 
 /* Undefine some symbols which are defined in "sparc.h" but which are
@@ -32,6 +33,7 @@ Boston, MA 02111-1307, USA.  */
 #undef TEXT_SECTION_ASM_OP
 #undef DATA_SECTION_ASM_OP
 
+#include "elfos.h"
 #include "svr4.h"
 
 /* ??? Put back the SIZE_TYPE/PTRDIFF_TYPE definitions set by sparc.h.
Index: gcc/config/stormy16/stormy16.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/stormy16/stormy16.h,v
retrieving revision 1.9
diff -u -p -r1.9 stormy16.h
--- gcc/config/stormy16/stormy16.h	2001/09/21 20:26:44	1.9
+++ gcc/config/stormy16/stormy16.h	2001/09/30 17:08:41
@@ -21,10 +21,6 @@ the Free Software Foundation, 59 Temple 
 Boston, MA 02111-1307, USA.  */
 
 
-/* Set up System V.4 (aka ELF) defaults.  */
-#include "svr4.h"
-
-
 /* Driver configuration */
 
 /* A C expression which determines whether the option `-CHAR' takes arguments.
Index: gcc/config/v850/v850.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/v850/v850.h,v
retrieving revision 1.46
diff -u -p -r1.46 v850.h
--- gcc/config/v850/v850.h	2001/09/11 16:50:03	1.46
+++ gcc/config/v850/v850.h	2001/09/30 17:08:44
@@ -22,8 +22,6 @@ Boston, MA 02111-1307, USA.  */
 #ifndef GCC_V850_H
 #define GCC_V850_H
 
-#include "svr4.h"	/* Automatically does #undef CPP_PREDEFINES */
-
 /* These are defiend in svr4.h but we want to override them.  */
 #undef ASM_FINAL_SPEC
 #undef LIB_SPEC

cmp_config

arc-unknown-elf
c4x-unknown-rtems
c4x-unknown-elf
d30v-unknown-elf
fr30-unknown-elf
hppa-unknown-linux
hppa64-unknown-linux
i370-unknown-linux
i386-chorusos
i386-unknown-elf
i386-unknown-gnu
i386-ncr-sysv4
i386-unknown-netware
i386-sequent-ptx4
i386-unknown-beos
i386-unknown-freebsd6
i386-unknown-netbsdelf
i386-unknown-linux-gnulibc1
i386-unknown-linux
i386-moss-msdos
i386-go32-rtems
i386-unknown-rtemscoff
i386-unknown-rtemself
i386-unknown-solaris2
i386-unknown-sysv5
i386-unknown-sysv4
i386-unknown-udk
i386-unknown-osf1
i386-dg-dgux
i860-alliant-elf
i860-unknown-sysv4
ia64-unknown-aix
ia64-unknown-linux
ia64-unknown-hpux
m32r-unknown-elf
m88k-dg-dguxbcs
m88k-dg-dgux
m88k-unknown-sysv4
mcore-unknown-elf
mips-unknown-gnu
mips-unknown-linux
mipsisa32el-unknown-linux
mipsisa32-unknown-linux
mipsel-unknown-linux
mn10200-unknown-elf
mn10300-unknown-elf
pj-unknown-linux
pjl-unknown-elf
powerpc64-unknown-linux
powerpc-unknown-beos
powerpc-unknown-darwin
powerpc-unknown-sysv
powerpc-unknown-netbsd
powerpc-chorusos
powerpc-unknown-eabiaix
powerpc-unknown-eabisim
powerpc-unknown-elf
powerpc-unknown-eabi
powerpc-unknown-rtems
powerpc-unknown-linux-gnulibc1
powerpc-unknown-linux
powerpc-wrs-vxworks
powerpcle-wrs-vxworks
powerpcle-unknown-sysv
powerpcle-unknown-elf
powerpcle-unknown-eabisim
powerpcle-unknown-eabi
powerpcle-unknown-solaris2
rs6000-unknown-mach
s390-unknown-linux
s390x-unknown-linux
sh-unknown-elf
sh-unknown-rtemself
sh-unknown-rtems
sh-unknown-linux
stormy16-unknown-elf
v850-unknown-rtems
v850-unknown-elf

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]