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]
Other format: [Raw text]

RFC: conversion to config.gcc lists, revised


This patch is a revision of my earlier patch to eliminate the
remaining "incestuous" includes in gcc/config.  Changes from the
previous: the machine independent bits were committed earlier (with
the exception of the final Makefile tweak); Richard Earnshaw's
suggestions for mips-openbsd have been incorporated; and I went back
and used tm_defines a bit more aggressively, allowing the removal of
several m68k/ headers.

I'm still looking for review on this from CPU port maintainers,
especially the m68k changes.  I know it's hard to care about HPUX 7 ;-)
I will probably go ahead and check this in in a couple of days if no
one finds any holes in it.

zw

        * Makefile.in (INCLUDES): Remove -I$(srcdir)/config.
        * config.gcc (*-*-openbsd): Don't set tm_file.
        (alpha*-*-openbsd, arm*-*-coff*, arm*-wince-pe*,
        arm-*-pe*, avr-*-*, h8300-*-rtems*, h8300-*-elf*,
        h8300-*-*, hppa*-*-osf*, hppa*-*-bsd*, hppa*-*-hpux*,
        i370-*-opened*, i370-*-mvs*, i370-*-linux*, i?86-*-openbsd*,
        i?86-*-lynxos, i?86-*-nto-qnx*, iq2000*-*-elf*, m68000-hp-hpux*,
        m68k-hp-hpux*, m68k-*-aout*, m68k-*-coff*, m68020-*-elf*,
        m68k-*-elf*, m68k*-*-netbsd*, m68k*-*-openbsd*, m68k-*-sysv4*,
        m68k-*-linux*, m68k-*-rtems*, mcore-*-pe*, mips*-*-netbsd*,
        mips*-*-openbsd*, rs6000-*-lynxos*, sh*-*-elf*, sh*-*-ka,
        sh-*-rtemself, sparc-*-openbsd*, strongarm-*-pe, vax-*-openbsd*,
        xscale-*-coff): Use explicit and complete lists of target headers
        to include.  Move definitions to tm_defines where appropriate.
        (hppa*-*-openbsd*, powerpc-*-openbsd*): Comment out stanza for
        not-yet-contributed configuration.

        * config/lynx.h, config/alpha/openbsd.h, config/arm/coff.h
        * config/avr/avr.h, config/frv/frv.h, config/h8300/elf.h
        * config/i370/linux.h, config/i370/mvs.h, config/i370/oe.h
        * config/i386/nto.h, config/iq2000/iq2000.h,
        * config/m68k/coff.h, config/m68k/hp310.h, config/m68k/hp320.h
        * config/m68k/linux.h, config/m68k/m68k-aout.h
        * config/m68k/m68k-none.h, config/m68k/m68kv4.h
        * config/m68k/netbsd.h, config/m68k/openbsd.h
        * config/m68k/sgs.h, config/mcore/mcore-pe.h,
        * config/mips/netbsd.h, config/mips/openbsd.h, config/pa/pa.h,
        * config/rs6000/lynx.h, config/sh/embed-elf.h, config/sparc/openbsd.h:
        Remove includes of other target config headers, and
        definitions of macros moved to tm_defines lists.  Add #undefs
        where now necessary to prevent redefinition warnings.

        * config/h8300/coff.h: New file split out of...
        * config/h8300/elf.h: ...here.
        * config/m68k/hp320base.h: New file split out of...
        * config/m68k/hp320.h: ...here.
        * config/rs6000/lynxbase.h: New file split out of...
        * config/rs6000/lynx.h: ...here.

        * config/m68k/hp310g.h, config/m68k/hp320g.h, config/m68k/hpux7.h
        * config/m68k/m68k-coff.h, config/mips/openbsd-be.h: Delete file.

        * config/sol2.h: Remove #if 0-ed #include of sys/mman.h.
        * config/m68k/m68kelf.h: Remove commented out #include of m68k/sgs.h.
        * config/mcore/mcore.h: Don't include hwint.h nor machmode.h.
        Remove unnecessary #ifndef.
        * config/s390/s390.h: Prefix #include of s390/fixdfdi.h
        [under IN_LIBGCC2] with config/.

===================================================================
Index: Makefile.in
--- Makefile.in	14 Aug 2003 20:25:12 -0000	1.1139
+++ Makefile.in	14 Aug 2003 23:39:59 -0000
@@ -726,9 +726,8 @@ BUILD_VARRAY = $(BUILD_PREFIX)varray.o
 # currently being compiled, in both source trees, to be examined as well.
 # libintl.h will be found in ../intl if we are using the included libintl.
 INCLUDES = -I. -I$(@D) -I$(srcdir) -I$(srcdir)/$(@D) \
-	   -I$(srcdir)/config -I$(srcdir)/../include @INCINTL@
+	   -I$(srcdir)/../include @INCINTL@
 
-# Always use -I$(srcdir)/config when compiling.
 .c.o:
 	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION)
 
===================================================================
Index: config.gcc
--- config.gcc	14 Aug 2003 04:18:10 -0000	1.342
+++ config.gcc	14 Aug 2003 23:39:59 -0000
@@ -412,7 +412,6 @@ case $machine in
 	esac
 	;;
 *-*-openbsd*)
-	tm_file=${cpu_type}/openbsd.h
 	tmake_file="t-libc-ok t-openbsd t-libgcc-pic"
 	if test x$enable_threads = xyes; then
 		thread_file='posix'
@@ -578,7 +577,8 @@ alpha*-*-netbsd*)
 	;;
 
 alpha*-*-openbsd*)
-	tm_file="${cpu_type}/${cpu_type}.h ${tm_file}"
+	tm_defines="OBSD_NO_DYNAMIC_LIBRARIES OBSD_HAS_DECLARE_FUNCTION_NAME OBSD_HAS_DECLARE_FUNCTION_SIZE OBSD_HAS_DECLARE_OBJECT"
+	tm_file="alpha/alpha.h openbsd.h alpha/openbsd.h"
 	# default x-alpha is only appropriate for dec-osf.
 	target_cpu_default="MASK_GAS"
 	tmake_file="alpha/t-alpha alpha/t-ieee"
@@ -659,7 +659,7 @@ arc-*-elf*)
 	extra_parts="crtinit.o crtfini.o"
 	;;
 arm-*-coff* | armel-*-coff*)
-	tm_file="arm/semi.h arm/aout.h arm/arm.h arm/coff.h"
+	tm_file="arm/semi.h arm/aout.h arm/arm.h arm/coff.h dbxcoff.h"
 	tmake_file=arm/t-arm-coff
 	;;
 arm-semi-aof | armel-semi-aof)
@@ -711,12 +711,12 @@ arm*-*-elf | ep9312-*-elf)
 	tmake_file=arm/t-arm-elf
 	;;
 arm*-wince-pe*)
-	tm_file="arm/semi.h arm/aout.h arm/arm.h arm/coff.h arm/pe.h arm/wince-pe.h"
+	tm_file="arm/semi.h arm/aout.h arm/arm.h arm/coff.h dbxcoff.h arm/pe.h arm/wince-pe.h"
 	tmake_file=arm/t-wince-pe
 	extra_objs="pe.o"
 	;;
 arm-*-pe*)
-	tm_file="arm/semi.h arm/aout.h arm/arm.h arm/coff.h arm/pe.h"
+	tm_file="arm/semi.h arm/aout.h arm/arm.h arm/coff.h dbxcoff.h arm/pe.h"
 	tmake_file=arm/t-pe
 	extra_objs="pe.o"
 	;;
@@ -725,6 +725,7 @@ arm*-*-kaos*)
 	tmake_file=arm/t-arm-elf
 	;;
 avr-*-*)
+	tm_file="avr/avr.h dbxelf.h"
 	;;
 c4x-*-rtems* | tic4x-*-rtems*)
 	tmake_file="c4x/t-c4x t-rtems"
@@ -770,16 +771,17 @@ frv-*-elf)
 	;;
 h8300-*-rtems*)
 	tmake_file="h8300/t-h8300 t-rtems"
-	tm_file="h8300/h8300.h h8300/rtems.h rtems.h"
+	tm_file="h8300/h8300.h dbxcoff.h h8300/coff.h h8300/rtems.h rtems.h"
 	if test x$enable_threads = xyes; then
 	  thread_file='rtems'
 	fi
 	;;
 h8300-*-elf*)
 	tmake_file="h8300/t-h8300 h8300/t-elf"
-	tm_file="h8300/h8300.h h8300/elf.h"
+	tm_file="h8300/h8300.h dbxelf.h elfos.h h8300/elf.h"
 	;;
 h8300-*-*)
+	tm_file="h8300/h8300.h dbxcoff.h h8300/coff.h"
 	;;
 hppa*64*-*-linux* | parisc*64*-*-linux*)
 	target_cpu_default="(MASK_PA_11 | MASK_PA_20)"
@@ -795,10 +797,11 @@ hppa*-*-linux* | parisc*-*-linux*)
 		 pa/pa32-regs.h pa/pa32-linux.h"
 	tmake_file="t-slibgcc-elf-ver t-linux pa/t-linux"
 	;;
-hppa*-*-openbsd*)
-	target_cpu_default="MASK_PA_11"
-	tmake_file=pa/t-bsd
-	;;
+# port not yet contributed.
+#hppa*-*-openbsd*)
+#	target_cpu_default="MASK_PA_11"
+#	tmake_file=pa/t-bsd
+#	;;
 hppa1.1-*-pro*)
 	target_cpu_default="(MASK_JUMP_IN_DELAY | MASK_PORTABLE_RUNTIME | MASK_GAS | MASK_NO_SPACE_REGS | MASK_SOFT_FLOAT)"
 	tm_file="${tm_file} pa/pa32-regs.h dbxelf.h elfos.h pa/elf.h pa/pa-pro-end.h libgloss.h"
@@ -807,7 +810,7 @@ hppa1.1-*-pro*)
 	;;
 hppa1.1-*-osf*)
 	target_cpu_default="MASK_PA_11"
-	tm_file="${tm_file} pa/pa32-regs.h pa/som.h pa/pa-osf.h"
+	tm_file="${tm_file} pa/pa32-regs.h dbxelf.h pa/som.h pa/pa-osf.h"
 	tmake_file="pa/t-bsd pa/t-pa"
 	xmake_file="pa/x-ada"
 	use_collect2=yes
@@ -822,7 +825,7 @@ hppa1.1-*-rtems*)
 	fi
 	;;
 hppa1.1-*-bsd*)
-	tm_file="${tm_file} pa/pa32-regs.h pa/som.h"
+	tm_file="${tm_file} pa/pa32-regs.h dbxelf.h pa/som.h"
 	target_cpu_default="MASK_PA_11"
 	tmake_file="pa/t-bsd pa/t-pa"
 	xmake_file="pa/x-ada"
@@ -830,7 +833,7 @@ hppa1.1-*-bsd*)
 	;;
 hppa1.1-*-hpux10* | hppa2*-*-hpux10*)
 	target_cpu_default="MASK_PA_11"
-	tm_file="${tm_file} pa/pa32-regs.h pa/long_double.h pa/som.h pa/pa-hpux.h pa/pa-hpux10.h"
+	tm_file="${tm_file} pa/pa32-regs.h pa/long_double.h dbxelf.h pa/som.h pa/pa-hpux.h pa/pa-hpux10.h"
 	tmake_file="pa/t-pa pa/t-pa-hpux pa/t-hpux-shlib"
 	xmake_file="pa/x-ada"
 	if test x$enable_threads = x; then
@@ -845,7 +848,7 @@ hppa1.1-*-hpux10* | hppa2*-*-hpux10*)
 	use_collect2=yes
 	;;
 hppa1.0-*-hpux10*)
-	tm_file="${tm_file} pa/pa32-regs.h pa/long_double.h pa/som.h pa/pa-hpux.h pa/pa-hpux10.h"
+	tm_file="${tm_file} pa/pa32-regs.h pa/long_double.h dbxelf.h pa/som.h pa/pa-hpux.h pa/pa-hpux10.h"
 	tmake_file="pa/t-pa pa/t-pa-hpux pa/t-hpux-shlib"
 	xmake_file="pa/x-ada"
 	if test x$enable_threads = x; then
@@ -890,7 +893,7 @@ hppa*64*-*-hpux11*)
 	;;
 hppa1.1-*-hpux11* | hppa2*-*-hpux11*)
 	target_cpu_default="MASK_PA_11"
-	tm_file="${tm_file} pa/pa32-regs.h pa/long_double.h pa/som.h pa/pa-hpux.h pa/pa-hpux11.h"
+	tm_file="${tm_file} pa/pa32-regs.h pa/long_double.h dbxelf.h pa/som.h pa/pa-hpux.h pa/pa-hpux11.h"
 	tmake_file="pa/t-pa pa/t-pa-hpux pa/t-hpux-shlib"
 	xmake_file="pa/x-ada"
 #	if test x$enable_threads = x; then
@@ -904,7 +907,7 @@ hppa1.1-*-hpux11* | hppa2*-*-hpux11*)
 	use_collect2=yes
 	;;
 hppa1.0-*-hpux11*)
-	tm_file="${tm_file} pa/pa32-regs.h pa/long_double.h pa/som.h pa/pa-hpux.h pa/pa-hpux11.h"
+	tm_file="${tm_file} pa/pa32-regs.h pa/long_double.h dbxelf.h pa/som.h pa/pa-hpux.h pa/pa-hpux11.h"
 	tmake_file="pa/t-pa pa/t-pa-hpux pa/t-hpux-shlib"
 	xmake_file="pa/x-ada"
 #	if test x$enable_threads = x; then
@@ -919,20 +922,20 @@ hppa1.0-*-hpux11*)
 	;;
 i370-*-opened*)			 # IBM 360/370/390 Architecture
 	xm_defines='FATAL_EXIT_CODE=12'
-	tm_file=i370/oe.h
+	tm_file="i370/oe.h i370/i370.h"
 	tmake_file="i370/t-oe i370/t-i370"
 	c_target_objs="i370-c.o"
 	cxx_target_objs="i370-c.o"
 	;;
 i370-*-mvs*)
 	xm_defines='FATAL_EXIT_CODE=12'
-	tm_file=i370/mvs.h
+	tm_file="i370/mvs.h i370/i370.h"
 	tmake_file="i370/t-i370"
 	c_target_objs="i370-c.o"
 	cxx_target_objs="i370-c.o"
 	;;
 i370-*-linux*)
-	tm_file="dbxelf.h elfos.h svr4.h linux.h i370/linux.h ${tm_file}"
+	tm_file="dbxelf.h elfos.h svr4.h linux.h i370/linux.h i370/i370.h"
 	tmake_file="t-slibgcc-elf-ver t-linux"
 	# broken_install=yes
 	elf=yes
@@ -996,7 +999,7 @@ x86_64-*-netbsd*)
 	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h netbsd.h netbsd-elf.h i386/x86-64.h i386/netbsd64.h"
 	;;
 i[34567]86-*-openbsd*)
-	tm_file="${cpu_type}/${cpu_type}.h i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h openbsd-oldgas.h openbsd.h ${tm_file}"
+	tm_file="i386/i386.h i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h openbsd-oldgas.h openbsd.h i386/openbsd.h"
 	# needed to unconfuse gdb
 	tmake_file="t-libc-ok t-openbsd i386/t-openbsd"
 	# we need collect2 until our bug is fixed...
@@ -1056,7 +1059,7 @@ i[34567]86-moss-msdos* | i[34567]86-*-mo
 i[34567]86-*-lynxos*)
 	if test x$gas = xyes
 	then
-		tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h lynx.h i386/lynx.h"
+		tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h svr3.h lynx.h i386/lynx.h"
 	else
 		tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h lynx-ng.h i386/lynx-ng.h"
 	fi
@@ -1067,7 +1070,7 @@ i[34567]86-*-mach*)
 	use_collect2=yes
 	;;
 i[34567]86-*-nto-qnx*)
-	tm_file="${tm_file} i386/att.h dbxelf.h tm-dwarf2.h elfos.h svr4.h i386/nto.h"
+	tm_file="${tm_file} i386/att.h dbxelf.h tm-dwarf2.h elfos.h svr4.h i386/unix.h i386/nto.h"
 	tmake_file=i386/t-nto
 	gnu_ld=yes
 	gas=yes
@@ -1297,7 +1300,7 @@ ip2k-*-elf)
 	tm_file="elfos.h ${tm_file}"
 	;;
 iq2000*-*-elf*)
-        tm_file="iq2000/iq2000.h"
+        tm_file="svr4.h elfos.h iq2000/iq2000.h"
         tmake_file=iq2000/t-iq2000
         out_file=iq2000/iq2000.c
         md_file=iq2000/iq2000.md
@@ -1322,46 +1325,47 @@ m68hc12-*-*|m6812-*-*)
 	tmake_file="m68hc11/t-m68hc11-gas"
         ;;
 m68000-hp-hpux*)		# HP 9000 series 300
+	tm_file="m68k/hp320base.h m68k/m68k.h m68k/hp320.h m68k/hp310.h"
+	tm_defines="TARGET_DEFAULT=0" # 68000, no 68881, no bitfield ops
 	if test x$gas = xyes
 	then
-		tm_file=m68k/hp310g.h
-	else
-		tm_file=m68k/hp310.h
+		tm_defines="${tm_defines} DBX_DEBUGGING_INFO=1 USE_GAS"
 	fi
 	tmake_file=m68k/t-hp320
 	install_headers_dir=install-headers-cpio
 	use_collect2=yes
 	;;
 m68k-hp-hpux7*)	# HP 9000 series 300 running HPUX version 7.
+	tm_file="m68k/hp320base.h m68k/m68k.h m68k/hp320.h"
 	if test x$gas = xyes
 	then
-		tm_file=m68k/hp320g.h
+		tm_defines="DBX_DEBUGGING_INFO=1 USE_GAS"
 	else
-		tm_file=m68k/hpux7.h
+		tm_defines="NO_DOT_IN_LABEL NO_BUGS"
 	fi
 	install_headers_dir=install-headers-cpio
 	use_collect2=yes
 	;;
 m68k-hp-hpux*)	# HP 9000 series 300
+	tm_file="m68k/hp320base.h m68k/m68k.h m68k/hp320.h"
 	if test x$gas = xyes
 	then
-		tm_file=m68k/hp320g.h
-	else
-		tm_file=m68k/hp320.h
+		tm_defines="DBX_DEBUGGING_INFO=1 USE_GAS"
 	fi
 	install_headers_dir=install-headers-cpio
 	use_collect2=yes
 	;;
 m68k-*-aout*)
 	tmake_file=m68k/t-m68kbare
-	tm_file="m68k/m68k-aout.h libgloss.h"
+	tm_file="m68k/m68k.h m68k/m68k-none.h m68k/m68kemb.h m68k/m68k-aout.h libgloss.h"
 	;;
 m68k-*-coff*)
 	tmake_file=m68k/t-m68kbare
-	tm_file="m68k/m68k-coff.h dbx.h"
+	tm_defines="MOTOROLA USE_GAS"
+	tm_file="m68k/m68k.h m68k/m68k-none.h m68k/m68kemb.h dbxcoff.h m68k/coff.h dbx.h"
 	;;
 m68020-*-elf* | m68k-*-elf*)
-	tm_file="m68k/m68k-none.h m68k/m68kelf.h dbxelf.h elfos.h m68k/m68kemb.h m68k/m68020-elf.h"
+	tm_file="m68k/m68k.h m68k/m68k-none.h m68k/m68kelf.h dbxelf.h elfos.h m68k/m68kemb.h m68k/m68020-elf.h"
 	tmake_file=m68k/t-m68kelf
 	extra_parts="crtbegin.o crtend.o"
 	;;
@@ -1377,31 +1381,35 @@ m68010-*-netbsdelf* | m68k*-*-netbsdelf*
 	esac
 	;;
 m68k*-*-netbsd*)
-	tm_file=m68k/netbsd.h
+	tm_file="m68k/m68k.h netbsd.h netbsd-aout.h m68k/netbsd.h"
 	tmake_file=t-netbsd
 	extra_parts=""
 	use_collect2=yes
 	;;
 m68k*-*-openbsd*)
 	# needed to unconfuse gdb
+	tm_defines="OBSD_OLD_GAS TARGET_DEFAULT=(MASK_68020|MASK_68881|MASK_BITFIELD)"
+	tm_file="m68k/m68k.h openbsd.h m68k/openbsd.h"
 	tmake_file="t-libc-ok t-openbsd m68k/t-openbsd"
 	# we need collect2 until our bug is fixed...
 	use_collect2=yes
 	;;
 m68k-*-sysv4*)			# Motorola m68k's running system V.4
-	tm_file=m68k/m68kv4.h
+	tm_file="m68k/m68k.h m68k/sgs.h dbxelf.h elfos.h svr4.h m68k/m68kv4.h"
+	tm_defines="MOTOROLA SGS SGS_CMP_ORDER SGS_SWITCH_TABLES"
 	tmake_file=t-svr4
 	extra_parts="crtbegin.o crtend.o"
 	;;
 m68k-*-linux*)		# Motorola m68k's running GNU/Linux
 				# with ELF format using glibc 2
 				# aka the GNU/Linux C library 6.
-	tm_file=m68k/linux.h
+	tm_file="m68k/m68k.h dbxelf.h elfos.h svr4.h linux.h m68k/linux.h"
+	tm_defines="MOTOROLA USE_GAS LINUX_DEFAULT_ELF"
 	tmake_file="t-slibgcc-elf-ver t-linux"
 	;;
 m68k-*-rtems*)
 	tmake_file="m68k/t-m68kbare t-rtems m68k/t-crtstuff"
-	tm_file="m68k/m68k-none.h m68k/m68kelf.h dbxelf.h elfos.h m68k/m68kemb.h m68k/m68020-elf.h m68k/rtemself.h rtems.h"
+	tm_file="m68k/m68k.h m68k/m68k-none.h m68k/m68kelf.h dbxelf.h elfos.h m68k/m68kemb.h m68k/m68020-elf.h m68k/rtemself.h rtems.h"
 	extra_parts="crtbegin.o crtend.o"
 	if test x$enable_threads = xyes; then
 	  thread_file='rtems'
@@ -1412,7 +1420,7 @@ mcore-*-elf)
 	tmake_file=mcore/t-mcore
 	;;
 mcore-*-pe*)
-	tm_file=mcore/mcore-pe.h
+	tm_file="svr3.h dbxcoff.h ${tm_file} mcore/mcore-pe.h"
 	tmake_file=mcore/t-mcore-pe
 	;;
 mips-sgi-irix6*o32)		# SGI System V.4., IRIX 6, O32 ABI
@@ -1490,7 +1498,7 @@ mips-sgi-irix5*)		# SGI System V.4., IRI
 	;;
 mips*-*-netbsd*)			# NetBSD/mips, either endian.
 	target_cpu_default="MASK_GAS|MASK_ABICALLS"
-	tm_file="elfos.h ${tm_file} mips/netbsd.h"
+	tm_file="elfos.h ${tm_file} mips/elf.h netbsd.h netbsd-elf.h mips/netbsd.h"
 	tmake_file="${tmake_file}"
 	;;
 mips64*-*-linux*)
@@ -1521,13 +1529,15 @@ mips*-*-linux*)				# Linux MIPS, either 
         esac
 	tmake_file="t-slibgcc-elf-ver t-linux"
 	;;
-mips*el-*-openbsd*)	# mips little endian
-	target_cpu_default="MASK_GAS|MASK_ABICALLS"
-	tm_file="${tm_file} mips/sdb.h"
-	;;
-mips*-*-openbsd*)		# mips big endian
+mips*-*-openbsd*)
+	tm_defines="OBSD_HAS_DECLARE_FUNCTION_NAME OBSD_HAS_DECLARE_OBJECT OBSD_HAS_CORRECT_SPECS"
 	target_cpu_default="MASK_GAS|MASK_ABICALLS"
-	tm_file="mips/openbsd-be.h ${tm_file} mips/sdb.h"
+	tm_file="mips/mips.h openbsd.h mips/openbsd.h mips/sdb.h"
+	case $machine in
+	mips*el-*-openbsd*) 
+	    tm_defines="${tm_defines} TARGET_ENDIAN_DEFAULT=0";;
+	*)  tm_defines="${tm_defines} TARGET_ENDIAN_DEFAULT=MASK_BIG_ENDIAN";;
+        esac
 	;;
 mipsisa32-*-elf* | mipsisa32el-*-elf*)
 	tm_file="${tm_file} mips/elf.h"
@@ -1618,10 +1628,11 @@ pdp11-*-*)
 	;;
 avr-*-*)
 	;;
-powerpc-*-openbsd*)
-	tmake_file="${tmake_file} rs6000/t-fprules "
-	extra_headers=
-	;;
+# port not yet contributed
+#powerpc-*-openbsd*)
+#	tmake_file="${tmake_file} rs6000/t-fprules "
+#	extra_headers=
+#	;;
 powerpc64-*-linux*)
 	tm_file="rs6000/biarch64.h ${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h"
 	case x$with_cpu in
@@ -1788,7 +1799,7 @@ rs6000-ibm-aix[56789].* | powerpc-ibm-ai
 	extra_headers=
 	;;
 rs6000-*-lynxos*)
-	tm_file="lynx.h rs6000/lynx.h"
+	tm_file="svr3.h lynx.h rs6000/lynxbase.h rs6000/rs6000.h rs6000/lynx.h"
 	tmake_file=rs6000/t-fprules
 	use_collect2=yes
 	;;
@@ -1812,7 +1823,7 @@ sh-*-elf* | sh[2346l]*-*-elf* | sh*-*-ka
 		tmake_file="${tmake_file} sh/t-le"
 		;;
 	esac
-	tm_file="${tm_file} dbxelf.h elfos.h svr4.h sh/embed-elf.h"
+	tm_file="${tm_file} dbxelf.h elfos.h svr4.h sh/elf.h sh/embed-elf.h"
 	case $machine in
 	sh64*)
 		tmake_file="${tmake_file} sh/t-sh64"
@@ -1835,7 +1846,7 @@ sh-*-elf* | sh[2346l]*-*-elf* | sh*-*-ka
 	;;
 sh-*-rtemself*)
 	tmake_file="sh/t-sh sh/t-elf t-rtems"
-	tm_file="${tm_file} dbxelf.h elfos.h svr4.h sh/embed-elf.h sh/rtemself.h rtems.h"
+	tm_file="${tm_file} dbxelf.h elfos.h svr4.h sh/elf.h sh/embed-elf.h sh/rtemself.h rtems.h"
 	if test x$enable_threads = xyes; then
 	  thread_file='rtems'
 	fi
@@ -1920,7 +1931,8 @@ sparc-*-netbsdelf*)
 	tm_file="${tm_file} elfos.h svr4.h sparc/sysv4.h netbsd.h netbsd-elf.h sparc/netbsd-elf.h"
 	;;
 sparc-*-openbsd*)
-	tm_file="sparc/sparc.h ${tm_file}"
+	tm_defines=OBSD_OLD_GAS
+	tm_file="sparc/sparc.h openbsd.h sparc/openbsd.h"
 	# needed to unconfuse gdb
 	tmake_file="t-libc-ok t-openbsd sparc/t-openbsd"
 	# we need collect2 until our bug is fixed...
@@ -2077,7 +2089,7 @@ strongarm-*-elf*)
 	extra_modes=arm/arm-modes.def
 	;;
 strongarm-*-pe)
-	tm_file="arm/semi.h arm/aout.h arm/coff.h arm/strongarm-coff.h arm/arm.h arm/pe.h arm/strongarm-pe.h"
+	tm_file="arm/semi.h arm/aout.h arm/coff.h dbxcoff.h arm/strongarm-coff.h arm/arm.h arm/pe.h arm/strongarm-pe.h"
 	tmake_file=arm/t-strongarm-pe
 	out_file=arm/arm.c
 	md_file=arm/arm.md
@@ -2135,7 +2147,7 @@ vax-*-netbsd*)
 	use_collect2=yes
 	;;
 vax-*-openbsd*)
-	tm_file="vax/vax.h vax/openbsd1.h openbsd.h ${tm_file}"
+	tm_file="vax/vax.h vax/openbsd1.h openbsd.h vax/openbsd.h"
 	use_collect2=yes
 	;;
 vax-*-ultrix*)			# VAXen running ultrix
@@ -2155,7 +2167,7 @@ xscale-*-elf)
 	extra_modes=arm/arm-modes.def
 	;;
 xscale-*-coff)
-	tm_file="arm/semi.h arm/aout.h arm/coff.h arm/xscale-coff.h arm/arm.h"
+	tm_file="arm/semi.h arm/aout.h arm/coff.h dbxcoff.h arm/xscale-coff.h arm/arm.h"
 	tmake_file=arm/t-xscale-coff
 	out_file=arm/arm.c
 	md_file=arm/arm.md
===================================================================
Index: config/lynx.h
--- config/lynx.h	17 Jun 2003 08:06:52 -0000	1.13
+++ config/lynx.h	14 Aug 2003 23:39:59 -0000
@@ -1,5 +1,5 @@
 /* Target independent definitions for LynxOS using gas and gnu ld.
-   Copyright (C) 1993, 1994, 1995, 1996, 1999, 2000, 2002
+   Copyright (C) 1993, 1994, 1995, 1996, 1999, 2000, 2002, 2003
    Free Software Foundation, Inc.
 
 This file is part of GCC.
@@ -19,10 +19,7 @@ along with GCC; see the file COPYING.  I
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-/* LynxOS is a multi-platform Unix, similar to SVR3, but not identical.
-   We can get quite a bit from generic svr3, but have to do some overrides.  */
-
-#include "svr3.h"
+/* LynxOS is a multi-platform Unix, similar to SVR3, but not identical.  */
 
 /* Define various macros, depending on the combination of flags.  */
 
===================================================================
Index: config/sol2.h
--- config/sol2.h	1 Jul 2003 05:45:15 -0000	1.5
+++ config/sol2.h	14 Aug 2003 23:39:59 -0000
@@ -1,6 +1,6 @@
 /* Operating system specific defines to be used when targeting GCC for any
    Solaris 2 system.
-   Copyright 2002 Free Software Foundation, Inc.
+   Copyright 2002, 2003 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -166,13 +166,9 @@ Boston, MA 02111-1307, USA.  */
  *
  */
 
-/* This declares mprotect (used in TRANSFER_FROM_TRAMPOLINE) for
-   libgcc2.c.  */
-/* We don't want to include this because sys/mman.h is not present on
-   some non-Solaris configurations that use sol2.h.  */
-#if 0 /* def L_trampoline */
-#include <sys/mman.h>
-#endif
+/* sys/mman.h is not present on some non-Solaris configurations
+   that use sol2.h, so TRANSFER_FROM_TRAMPOLINE must use a magic
+   number instead of the appropriate PROT_* flags.  */
 
 #define TRANSFER_FROM_TRAMPOLINE					\
 									\
===================================================================
Index: config/alpha/openbsd.h
--- config/alpha/openbsd.h	19 Jun 2003 21:47:03 -0000	1.8
+++ config/alpha/openbsd.h	14 Aug 2003 23:39:59 -0000
@@ -1,5 +1,5 @@
 /* Configuration file for an alpha OpenBSD target.
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2003 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -21,16 +21,6 @@ Boston, MA 02111-1307, USA.  */
 /* We settle for little endian for now.  */
 #define TARGET_ENDIAN_DEFAULT 0
 
-#define OBSD_NO_DYNAMIC_LIBRARIES
-#define OBSD_HAS_DECLARE_FUNCTION_NAME
-#define OBSD_HAS_DECLARE_FUNCTION_SIZE
-#define OBSD_HAS_DECLARE_OBJECT
-
-/* alpha ecoff supports only weak aliases, see below.  */
-#define ASM_WEAKEN_LABEL(FILE,NAME) ASM_OUTPUT_WEAK_ALIAS (FILE,NAME,0)
-
-#include <openbsd.h>
-
 /* Controlling the compilation driver.  */
 
 /* alpha needs __start.  */
@@ -89,6 +79,10 @@ Boston, MA 02111-1307, USA.  */
 #endif
 
 /* Assembler format: label output.  */
+
+/* alpha ecoff supports only weak aliases.  */
+#undef ASM_WEAKEN_LABEL
+#define ASM_WEAKEN_LABEL(FILE,NAME) ASM_OUTPUT_WEAK_ALIAS (FILE,NAME,0)
 
 #define ASM_OUTPUT_WEAK_ALIAS(FILE,NAME,VALUE)	\
  do {						\
===================================================================
Index: config/arm/coff.h
--- config/arm/coff.h	19 Jun 2003 21:47:05 -0000	1.31
+++ config/arm/coff.h	14 Aug 2003 23:39:59 -0000
@@ -1,6 +1,6 @@
 /* Definitions of target machine for GNU compiler.
    For ARM with COFF object format.
-   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002
+   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003
    Free Software Foundation, Inc.
    Contributed by Doug Evans (devans@cygnus.com).
    
@@ -43,7 +43,6 @@
 
 #define PREFERRED_DEBUGGING_TYPE DBX_DEBUG
 
-#include "dbxcoff.h"
 
 #define TARGET_ASM_FILE_START_APP_OFF true
 
===================================================================
Index: config/avr/avr.h
--- config/avr/avr.h	1 Jul 2003 23:26:43 -0000	1.88
+++ config/avr/avr.h	14 Aug 2003 23:40:00 -0000
@@ -2499,6 +2499,3 @@ extern struct rtx_def *zero_reg_rtx;
 extern struct rtx_def *ldi_reg_rtx;
 
 #define PREFERRED_DEBUGGING_TYPE DBX_DEBUG
-
-/* Get the standard ELF stabs definitions.  */
-#include "dbxelf.h"
===================================================================
Index: config/frv/frv.h
--- config/frv/frv.h	15 Jun 2003 21:25:46 -0000	1.25
+++ config/frv/frv.h	14 Aug 2003 23:40:00 -0000
@@ -1,5 +1,5 @@
 /* Target macros for the FRV port of GCC.
-   Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
    Contributed by Red Hat Inc.
 
    This file is part of GCC.
@@ -22,10 +22,6 @@
 #ifndef __FRV_H__
 #define __FRV_H__
 
-/* Set up System V.4 (aka ELF) defaults.  */
-#include "svr4.h"
-
-
 /* Frv general purpose macros.  */
 /* Align an address.  */
 #define ADDR_ALIGN(addr,align) (((addr) + (align) - 1) & ~((align) - 1))
===================================================================
Index: config/h8300/coff.h
--- config/h8300/coff.h	1 Jan 1970 00:00:00 -0000
+++ config/h8300/coff.h	14 Aug 2003 23:40:00 -0000
@@ -0,0 +1,56 @@
+/* Definitions of target machine for GNU compiler.
+   Hitachi H8/300 version generating coff
+   Copyright (C) 2003 Free Software Foundation, Inc.
+   Contributed by Steve Chamberlain (sac@cygnus.com),
+   Jim Wilson (wilson@cygnus.com), and Doug Evans (dje@cygnus.com).
+
+This file is part of GCC.
+
+GCC is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GCC is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GCC; see the file COPYING.  If not, write to
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
+
+#ifndef GCC_H8300_COFF_H
+#define GCC_H8300_COFF_H
+
+#define SDB_DEBUGGING_INFO 1
+#define SDB_DELIM	"\n"
+
+/* Override definition in dbxcoff.h.  */
+/* Generate a blank trailing N_SO to mark the end of the .o file, since
+   we can't depend upon the linker to mark .o file boundaries with
+   embedded stabs.  */
+
+#undef DBX_OUTPUT_MAIN_SOURCE_FILE_END
+#define DBX_OUTPUT_MAIN_SOURCE_FILE_END(FILE, FILENAME)			\
+  fprintf (FILE,							\
+	   "\t.text\n.stabs \"\",%d,0,0,.Letext\n.Letext:\n", N_SO)
+
+/* This is how to output an assembler line
+   that says to advance the location counter by SIZE bytes.  */
+
+#define ASM_OUTPUT_IDENT(FILE, NAME)			\
+  fprintf (FILE, "%s\"%s\"\n", IDENT_ASM_OP, NAME)
+
+#define IDENT_ASM_OP "\t.ident\t"
+#define INIT_SECTION_ASM_OP "\t.section .init"
+#define READONLY_DATA_SECTION_ASM_OP "\t.section .rodata"
+
+/* Switch into a generic section.  */
+#define TARGET_ASM_NAMED_SECTION h8300_asm_named_section
+
+/* A bit-field declared as `int' forces `int' alignment for the struct.  */
+#define PCC_BITFIELD_TYPE_MATTERS  0
+
+#endif /* h8300/coff.h */
===================================================================
Index: config/h8300/elf.h
--- config/h8300/elf.h	19 Jun 2003 21:47:09 -0000	1.11
+++ config/h8300/elf.h	14 Aug 2003 23:40:00 -0000
@@ -1,25 +1,28 @@
-/* Undefine some macros defined in h8300 that conflict with elfos.h .  */
-#undef SDB_DEBUGGING_INFO
-#undef DBX_DEBUGGING_INFO
-#undef ASM_OUTPUT_IDENT
-#undef IDENT_ASM_OP
-#undef CTORS_SECTION_ASM_OP
-#undef DTORS_SECTION_ASM_OP
-#undef INIT_SECTION_ASM_OP
-#undef READONLY_DATA_SECTION_ASM_OP
-#undef TARGET_ASM_NAMED_SECTION
-#undef TARGET_MEM_FUNCTIONS
-#undef PREFERRED_DEBUGGING_TYPE
-/* ??? h8300.h defines PCC_BITFIELD_TYPE_MATTERS to 0, but it
-   doesn't define STRUCTURE_SIZE_BOUNDARY, nor does h8300.md
-   have a full set of bit field instructions.  */
-#undef PCC_BITFIELD_TYPE_MATTERS
-
-#define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG
-
-#include "dbxelf.h"
-#include "elfos.h"
+/* Definitions of target machine for GNU compiler.
+   Hitachi H8/300 version generating elf
+   Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+   Contributed by Steve Chamberlain (sac@cygnus.com),
+   Jim Wilson (wilson@cygnus.com), and Doug Evans (dje@cygnus.com).
+
+This file is part of GCC.
+
+GCC is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GCC is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GCC; see the file COPYING.  If not, write to
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
+#ifndef GCC_H8300_ELF_H
+#define GCC_H8300_ELF_H
 
 #undef  ENDFILE_SPEC
 #define ENDFILE_SPEC "crtend.o%s %{pg:gcrtn.o%s}%{!pg:crtn.o%s}"
@@ -38,3 +41,5 @@
 
 #undef LINK_SPEC
 #define LINK_SPEC "%{mh:%{mn:-m h8300hnelf}} %{mh:%{!mn:-m h8300helf}} %{ms:%{mn:-m h8300snelf}} %{ms:%{!mn:-m h8300self}}"
+
+#endif /* h8300/elf.h */
===================================================================
Index: config/h8300/h8300.h
--- config/h8300/h8300.h	2 Jul 2003 20:48:04 -0000	1.151
+++ config/h8300/h8300.h	14 Aug 2003 23:40:00 -0000
@@ -1,5 +1,5 @@
 /* Definitions of target machine for GNU compiler.
-   Hitachi H8/300 version generating coff
+   Hitachi H8/300 (generic)
    Copyright (C) 1992, 1993, 1994, 1995, 1996, 1996, 1997, 1998, 1999,
    2000, 2001, 2002, 2003 Free Software Foundation, Inc.
    Contributed by Steve Chamberlain (sac@cygnus.com),
@@ -257,9 +257,6 @@ extern int target_flags;
    structure layouts.  */
 #define EMPTY_FIELD_BOUNDARY 16
 
-/* A bit-field declared as `int' forces `int' alignment for the struct.  */
-#define PCC_BITFIELD_TYPE_MATTERS  0
-
 /* No data type wants to be aligned rounder than this.
    32 bit values are aligned as such on the H8/300H and H8S for speed.  */
 #define BIGGEST_ALIGNMENT \
@@ -1038,7 +1035,6 @@ struct cum_arg
 #define ASM_APP_OFF "; #NO_APP\n"
 
 #define FILE_ASM_OP "\t.file\n"
-#define IDENT_ASM_OP "\t.ident\t"
 
 /* The assembler op to get a word, 2 bytes for the H8/300, 4 for H8/300H.  */
 #define ASM_WORD_OP							\
@@ -1047,8 +1043,6 @@ struct cum_arg
 #define TEXT_SECTION_ASM_OP "\t.section .text"
 #define DATA_SECTION_ASM_OP "\t.section .data"
 #define BSS_SECTION_ASM_OP "\t.section .bss"
-#define INIT_SECTION_ASM_OP "\t.section .init"
-#define READONLY_DATA_SECTION_ASM_OP "\t.section .rodata"
 
 #undef DO_GLOBAL_CTORS_BODY
 #define DO_GLOBAL_CTORS_BODY			\
@@ -1086,26 +1080,6 @@ struct cum_arg
 { {"er0", 0}, {"er1", 1}, {"er2", 2}, {"er3", 3}, {"er4", 4}, \
   {"er5", 5}, {"er6", 6}, {"er7", 7}, {"r7", 7} }
 
-#define SDB_DEBUGGING_INFO 1
-#define SDB_DELIM	"\n"
-
-/* Support -gstabs.  */
-
-#include "dbxcoff.h"
-
-/* Override definition in dbxcoff.h.  */
-/* Generate a blank trailing N_SO to mark the end of the .o file, since
-   we can't depend upon the linker to mark .o file boundaries with
-   embedded stabs.  */
-
-#undef DBX_OUTPUT_MAIN_SOURCE_FILE_END
-#define DBX_OUTPUT_MAIN_SOURCE_FILE_END(FILE, FILENAME)			\
-  fprintf (FILE,							\
-	   "\t.text\n.stabs \"\",%d,0,0,.Letext\n.Letext:\n", N_SO)
-
-/* Switch into a generic section.  */
-#define TARGET_ASM_NAMED_SECTION h8300_asm_named_section
-
 #define ASM_OUTPUT_EXTERNAL(FILE, DECL, NAME)
 
 /* Globalizing directive for a label.  */
@@ -1158,12 +1132,6 @@ struct cum_arg
   if ((LOG) != 0)				\
     fprintf (FILE, "\t.align %d\n", (LOG))
 
-/* This is how to output an assembler line
-   that says to advance the location counter by SIZE bytes.  */
-
-#define ASM_OUTPUT_IDENT(FILE, NAME)			\
-  fprintf (FILE, "%s\"%s\"\n", IDENT_ASM_OP, NAME)
-
 #define ASM_OUTPUT_SKIP(FILE, SIZE) \
   fprintf (FILE, "\t.space %d\n", (int)(SIZE))
 
@@ -1221,7 +1189,7 @@ struct cum_arg
    (and ANSI C) library functions `memcpy' and `memset' rather than
    the BSD functions `bcopy' and `bzero'.  */
 
-#define TARGET_MEM_FUNCTIONS 1
+#define TARGET_MEM_FUNCTIONS
 
 #define MULHI3_LIBCALL	"__mulhi3"
 #define DIVHI3_LIBCALL	"__divhi3"
===================================================================
Index: config/i370/linux.h
--- config/i370/linux.h	18 May 2003 09:46:11 -0000	1.11
+++ config/i370/linux.h	14 Aug 2003 23:40:00 -0000
@@ -1,5 +1,6 @@
 /* Definitions of target machine for GNU compiler.  System/370 version.
-   Copyright (C) 1989, 1993, 1995, 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1989, 1993, 1995, 1996, 1997, 2003
+   Free Software Foundation, Inc.
    Contributed by Jan Stein (jan@cd.chalmers.se).
    Modified for Linux/390 by Linas Vepstas (linas@linas.org)
 
@@ -27,10 +28,6 @@ Boston, MA 02111-1307, USA.  */
 
 #define TARGET_ELF_ABI
 #define LINUX_DEFAULT_ELF
-
-/* Include system common definitions */
-/* TODO: convert include to ${tm_file} list in config.gcc.  */
-#include "i370/i370.h"
 
 /* Target OS preprocessor built-ins.  */
 #define TARGET_OS_CPP_BUILTINS()		\
===================================================================
Index: config/i370/mvs.h
--- config/i370/mvs.h	12 Aug 2002 03:10:43 -0000	1.5
+++ config/i370/mvs.h	14 Aug 2003 23:40:00 -0000
@@ -1,5 +1,6 @@
 /* Definitions of target machine for GNU compiler.  System/370 version.
-   Copyright (C) 1989, 1993, 1995, 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1989, 1993, 1995, 1996, 1997, 2003
+   Free Software Foundation, Inc.
    Contributed by Jan Stein (jan@cd.chalmers.se).
    Modified for OS/390 LanguageEnvironment C by Dave Pitts (dpitts@cozx.com)
 
@@ -46,8 +47,3 @@ Boston, MA 02111-1307, USA.  */
 #else
 # define MAYBE_LE370_MACROS()
 #endif
-
-/* Include system common definitions */
-
-#include "config/i370/i370.h"
-
===================================================================
Index: config/i370/oe.h
--- config/i370/oe.h	12 Aug 2002 03:10:43 -0000	1.6
+++ config/i370/oe.h	14 Aug 2003 23:40:00 -0000
@@ -1,5 +1,6 @@
 /* Definitions of target machine for GNU compiler.  System/370 version.
-   Copyright (C) 1989, 1993, 1995, 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1989, 1993, 1995, 1996, 1997, 2003
+   Free Software Foundation, Inc.
    Contributed by Jan Stein (jan@cd.chalmers.se).
    Modified for OS/390 OpenEdition by Dave Pitts (dpitts@cozx.com)
 
@@ -49,8 +50,4 @@ Boston, MA 02111-1307, USA.  */
 	builtin_assert ("system=openedition");	\
 	builtin_assert ("system=unix");		\
     } while (0)
-
-/* Include system common definitions */
-
-#include "config/i370/i370.h"
 
===================================================================
Index: config/i386/nto.h
--- config/i386/nto.h	6 Aug 2003 17:04:39 -0000	1.1
+++ config/i386/nto.h	14 Aug 2003 23:40:00 -0000
@@ -1,5 +1,5 @@
 /* Definitions for Intel 386 running QNX/Neutrino.
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -17,8 +17,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, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
-
-#include "i386/unix.h"
 
 #undef  DEFAULT_PCC_STRUCT_RETURN
 #define DEFAULT_PCC_STRUCT_RETURN 1
===================================================================
Index: config/iq2000/iq2000.h
--- config/iq2000/iq2000.h	8 Aug 2003 11:30:24 -0000	1.1
+++ config/iq2000/iq2000.h	14 Aug 2003 23:40:00 -0000
@@ -19,11 +19,6 @@
    Software Foundation, 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.  */
 
-/* Set up System V.4 (aka ELF) defaults.  */
-#include "svr4.h"
-#include "elfos.h"
-
-
 /* Driver configuration.  */
 
 #undef SWITCH_TAKES_ARG
===================================================================
Index: config/m68k/coff.h
--- config/m68k/coff.h	27 Jun 2003 16:08:43 -0000	1.12
+++ config/m68k/coff.h	14 Aug 2003 23:40:01 -0000
@@ -26,10 +26,6 @@ Boston, MA 02111-1307, USA.  */
 
 #define SDB_DEBUGGING_INFO 1
 
-/* Output DBX (stabs) debugging information if using -gstabs.  */
-
-#include "dbxcoff.h"
-
 /* COFF symbols don't start with an underscore.  */
 
 #undef USER_LABEL_PREFIX
===================================================================
Index: config/m68k/hp310.h
--- config/m68k/hp310.h	27 Feb 2002 18:47:35 -0000	1.4
+++ config/m68k/hp310.h	14 Aug 2003 23:40:01 -0000
@@ -1,10 +1,5 @@
 /* Definitions of target machine for GNU compiler.  HP-UX 68010 version.  */
 
-/* See m68k.h.  0 means 68000 without 68881 and no bitfields.  */
-#define	TARGET_DEFAULT 0
-
-#include "m68k/hp320.h"
-
 /* Don't try using XFmode.  */
 #undef LONG_DOUBLE_TYPE_SIZE
 #define LONG_DOUBLE_TYPE_SIZE 64
===================================================================
Index: config/m68k/hp310g.h
--- config/m68k/hp310g.h	29 Aug 2002 21:40:13 -0000	1.3
+++ config/m68k/hp310g.h	1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-/* Definitions of target machine for GNU compiler.  HP-UX 68010 version.
-   Use this file if GCC is supposed to work with the GNU assembler,
-   GNU linker and GNU debugger using DBX debugging information.
-   (In other words, much of HPUX has been cast aside.)  */
-
-/* This wants DBX format.  */
-
-#define DBX_DEBUGGING_INFO 1
-
-#define USE_GAS
-
-#include "m68k/hp310.h"
===================================================================
Index: config/m68k/hp320.h
--- config/m68k/hp320.h	7 Jul 2003 03:42:23 -0000	1.27
+++ config/m68k/hp320.h	14 Aug 2003 23:40:01 -0000
@@ -1,5 +1,5 @@
 /* Definitions of target machine for GNU compiler.  HP-UX 68000/68020 version.
-   Copyright (C) 1987, 1988, 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2002
+   Copyright (C) 1987, 1988, 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2002, 2003
    Free Software Foundation, Inc.
 
 This file is part of GNU CC.
@@ -19,34 +19,6 @@ along with GNU CC; see the file COPYING.
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-/* Define USE_GAS if GCC is supposed to work with the GNU assembler,
-   GNU linker and GNU debugger using DBX debugging information.
-   (In other words, much of HPUX has been cast aside.)
-   Undefine USE_GAS if you want GCC to feed the HP assembler.  */
-
-/* #define USE_GAS */  /* Use hp320g.h if you want this.  */
-
-/* Control assembler-syntax conditionals in m68k.md.  */
-
-#ifndef USE_GAS
-#define MOTOROLA		/* Use Motorola syntax rather than "MIT" */
-#define SGS			/* Uses SGS assembler */
-#define SGS_CMP_ORDER		/* Takes cmp operands in reverse order */
-#define HPUX_ASM
-
-#if !defined (CROSS_COMPILE) && !defined (NO_BUGS)
-/* The assembler on HP 9k3xx machines running HPUX 8.0 doesn't translate
-   floating point constants behind some operands.  The workaround is to
-   use hex constants.  Reported by Thomas Nau (nau@medizin.uni-ulm.de).  */
-#define AS_BUG_FLOATING_CONSTANT
-/* The assembler on HP 9k3xx machines running HPUX 8.0 doesn't accept
-   labels followed by a text, data, or other section directive.  Reported
-   by Thomas Nau (nau@medizin.uni-ulm.de).  */
-#define AS_BUG_TRAILING_LABEL
-#endif
-
-#endif /* not USE_GAS */
-
 /* gcc.c should find libgcc.a itself rather than expecting linker to.  */
 #define LINK_LIBGCC_SPECIAL
 /* The arguments of -L must be a separate argv element.  */
@@ -56,8 +28,6 @@ Boston, MA 02111-1307, USA.  */
 
 /* Be compatible with system stddef.h.  */
 #define SIZE_TYPE "unsigned int"
-
-#include "m68k/m68k.h"
 
 #undef INT_OP_GROUP
 #define INT_OP_GROUP INT_OP_NO_DOT
===================================================================
Index: config/m68k/hp320base.h
--- config/m68k/hp320base.h	1 Jan 1970 00:00:00 -0000
+++ config/m68k/hp320base.h	14 Aug 2003 23:40:01 -0000
@@ -0,0 +1,40 @@
+/* Configuration file for an HP 320.
+   Copyright (C) 2003 Free Software Foundation, Inc.
+
+This file is part of GNU CC.
+
+GNU CC is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU CC is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU CC; see the file COPYING.  If not, write to
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
+
+/* Control assembler-syntax conditionals in m68k.md.  */
+
+#ifndef USE_GAS
+#define MOTOROLA		/* Use Motorola syntax rather than "MIT" */
+#define SGS			/* Uses SGS assembler */
+#define SGS_CMP_ORDER		/* Takes cmp operands in reverse order */
+#define HPUX_ASM
+
+#if !defined (CROSS_COMPILE) && !defined (NO_BUGS)
+/* The assembler on HP 9k3xx machines running HPUX 8.0 doesn't translate
+   floating point constants behind some operands.  The workaround is to
+   use hex constants.  Reported by Thomas Nau (nau@medizin.uni-ulm.de).  */
+#define AS_BUG_FLOATING_CONSTANT
+/* The assembler on HP 9k3xx machines running HPUX 8.0 doesn't accept
+   labels followed by a text, data, or other section directive.  Reported
+   by Thomas Nau (nau@medizin.uni-ulm.de).  */
+#define AS_BUG_TRAILING_LABEL
+#endif
+
+#endif /* not USE_GAS */
===================================================================
Index: config/m68k/hp320g.h
--- config/m68k/hp320g.h	29 Aug 2002 21:40:13 -0000	1.3
+++ config/m68k/hp320g.h	1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-/* Definitions of target machine for GNU compiler.  HP-UX 68000/68020 version.
-   Use this file if GCC is supposed to work with the GNU assembler,
-   GNU linker and GNU debugger using DBX debugging information.
-   (In other words, much of HPUX has been cast aside.)  */
-
-/* This wants DBX format.  */
-
-#define DBX_DEBUGGING_INFO 1
-
-#define USE_GAS
-
-#include "m68k/hp320.h"
===================================================================
Index: config/m68k/hpux7.h
--- config/m68k/hpux7.h	16 Dec 1998 21:06:42 -0000	1.2
+++ config/m68k/hpux7.h	1 Jan 1970 00:00:00 -0000
@@ -1,7 +0,0 @@
-/* tm.h for m68k running HPUX version 7.  */
-
-/* fletcher@cs.utexas.edu says this is needed.  */
-#define NO_DOT_IN_LABEL
-#define NO_BUGS
-
-#include "m68k/hp320.h"
===================================================================
Index: config/m68k/linux.h
--- config/m68k/linux.h	7 Jul 2003 03:42:23 -0000	1.34
+++ config/m68k/linux.h	14 Aug 2003 23:40:01 -0000
@@ -19,21 +19,6 @@ along with GNU CC; see the file COPYING.
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-#define LINUX_DEFAULT_ELF
-#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 "dbxelf.h"
-#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: config/m68k/m68k-aout.h
--- config/m68k/m68k-aout.h	15 Jun 2003 04:47:43 -0000	1.4
+++ config/m68k/m68k-aout.h	14 Aug 2003 23:40:01 -0000
@@ -1,6 +1,6 @@
 /* Definitions of target machine for GNU compiler.  "naked" 68020,
    a.out object files and debugging, version.
-   Copyright (C) 1994, 1996 Free Software Foundation, Inc.
+   Copyright (C) 1994, 1996, 2003 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -18,11 +18,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, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
-
-/* This comment is here to see if it will keep Sun's cpp from dying.  */
-
-#include "m68k/m68k-none.h"
-#include "m68k/m68kemb.h"
 
 #define DBX_DEBUGGING_INFO 1
 #undef SDB_DEBUGGING_INFO
===================================================================
Index: config/m68k/m68k-coff.h
--- config/m68k/m68k-coff.h	3 Sep 1999 17:10:48 -0000	1.3
+++ config/m68k/m68k-coff.h	1 Jan 1970 00:00:00 -0000
@@ -1,31 +0,0 @@
-/* Definitions of target machine for GNU compiler.  "naked" 68020,
-   COFF object files and debugging, version.
-   Copyright (C) 1994 Free Software Foundation, Inc.
-
-This file is part of GNU CC.
-
-GNU CC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU CC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-#define MOTOROLA	/* Use Motorola syntax rather than MIT.  */
-#ifndef  USE_GAS  /* forces jsbr instead of jsr.  */
-#define  USE_GAS
-#endif
-
-#include "m68k/m68k-none.h"
-#include "m68k/m68kemb.h"
-#include "m68k/coff.h"
-
-/* end of m68k-coff.h */
===================================================================
Index: config/m68k/m68k-none.h
--- config/m68k/m68k-none.h	17 May 2003 21:57:37 -0000	1.6
+++ config/m68k/m68k-none.h	14 Aug 2003 23:40:01 -0000
@@ -18,8 +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 "m68k/m68k.h"
-
 /* Default to m68k (m68020).  */
 #ifndef TARGET_CPU_DEFAULT
 #define TARGET_CPU_DEFAULT M68K_CPU_m68k
===================================================================
Index: config/m68k/m68kelf.h
--- config/m68k/m68kelf.h	7 Jul 2003 03:42:23 -0000	1.19
+++ config/m68k/m68kelf.h	14 Aug 2003 23:40:01 -0000
@@ -1,7 +1,7 @@
 /* m68kelf support, derived from m68kv4.h */
 
 /* Target definitions for GNU compiler for mc680x0 running System V.4
-   Copyright (C) 1991, 1993, 2000, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1991, 1993, 2000, 2002, 2003 Free Software Foundation, Inc.
 
    Written by Ron Guilmette (rfg@netcom.com) and Fred Fish (fnf@cygnus.com).
 
@@ -21,8 +21,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, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
-
-/* #notinclude "m68k/sgs.h"	/ * The m68k/SVR4 assembler is SGS based */
 
 /* These are necessary for -fpic/-fPIC to work correctly.  */
 #ifndef MOTOROLA
===================================================================
Index: config/m68k/m68kv4.h
--- config/m68k/m68kv4.h	7 Jul 2003 03:42:23 -0000	1.23
+++ config/m68k/m68kv4.h	14 Aug 2003 23:40:01 -0000
@@ -1,5 +1,5 @@
 /* Target definitions for GNU compiler for mc680x0 running System V.4
-   Copyright (C) 1991, 1993, 1994, 1995, 1996, 1998, 1999, 2000
+   Copyright (C) 1991, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2003
    Free Software Foundation, Inc.
    Contributed by Ron Guilmette (rfg@monkeys.com) and
    Fred Fish (fnf@cygnus.com).
@@ -34,19 +34,6 @@ Boston, MA 02111-1307, USA.  */
    }						\
   while (0)
 
-/* Use SGS_* macros to control compilation in m68k.md */
-
-#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 "dbxelf.h"
-#include "elfos.h"
-#include "svr4.h"		/* Pick up the generic SVR4 macros */
-
-/* See m68k.h.  7 means 68020 with 68881.  */
-
 #ifndef TARGET_DEFAULT
 #define	TARGET_DEFAULT (MASK_BITFIELD|MASK_68881|MASK_68020)
 #endif
@@ -257,7 +244,7 @@ do {									\
   switch_table_difference_label_flag = 0;				\
 } while (0)
 
-int switch_table_difference_label_flag;
+extern int switch_table_difference_label_flag;
 
 #undef ASM_OUTPUT_COMMON
 #undef ASM_OUTPUT_LOCAL
===================================================================
Index: config/m68k/netbsd.h
--- config/m68k/netbsd.h	3 Jun 2003 09:06:54 -0000	1.13
+++ config/m68k/netbsd.h	14 Aug 2003 23:40:01 -0000
@@ -11,13 +11,6 @@
     }						\
   while (0)
 
-#include <m68k/m68k.h>
-
-/* Get generic NetBSD definitions.  */
-
-#include <netbsd.h>
-#include <netbsd-aout.h>
-
 #define TARGET_DEFAULT (MASK_BITFIELD|MASK_68881|MASK_68020)
 
 #define EXTRA_SPECS \
===================================================================
Index: config/m68k/openbsd.h
--- config/m68k/openbsd.h	13 Jun 2003 14:39:41 -0000	1.11
+++ config/m68k/openbsd.h	14 Aug 2003 23:40:01 -0000
@@ -1,5 +1,5 @@
 /* Configuration file for an m68k OpenBSD target.
-   Copyright (C) 1999, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2003 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -28,16 +28,6 @@ Boston, MA 02111-1307, USA.  */
 	builtin_assert ("system=OpenBSD");	\
    }						\
   while (0)
-
-/* m68k is an old configuration that does not yet use the TARGET_CPU_DEFAULT
-   framework.  */
-#define TARGET_DEFAULT (MASK_BITFIELD | MASK_68881 | MASK_68020)
-
-#include <m68k/m68k.h>
-
-/* Get generic OpenBSD definitions.  */
-#define OBSD_OLD_GAS
-#include <openbsd.h>
 
 /* Define __HAVE_68881__ in preprocessor, unless -msoft-float is specified.
    This will control the use of inline 68881 insns in certain macros.  */
===================================================================
Index: config/m68k/sgs.h
--- config/m68k/sgs.h	17 May 2003 18:20:55 -0000	1.16
+++ config/m68k/sgs.h	14 Aug 2003 23:40:01 -0000
@@ -20,16 +20,6 @@ along with GNU CC; see the file COPYING.
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-/* Control assembler-syntax conditionals in m68k.md and conditionals in
-   m68k.h.  Note that some systems may also require SGS_SWAP_W and/or
-   SGS_SWITCH_TABLES to be defined as well.  */
-
-#define MOTOROLA		/* Use Motorola syntax rather than "MIT" */
-#define SGS			/* Uses SGS assembler */
-#define SGS_CMP_ORDER		/* Takes cmp operands in reverse order */
-
-#include "m68k/m68k.h"
-
 #undef INT_OP_GROUP
 #define INT_OP_GROUP INT_OP_STANDARD
 
===================================================================
Index: config/mcore/mcore-pe.h
--- config/mcore/mcore-pe.h	19 Jun 2003 21:47:16 -0000	1.18
+++ config/mcore/mcore-pe.h	14 Aug 2003 23:40:01 -0000
@@ -1,5 +1,5 @@
 /* Definitions of target machine for GNU compiler, for MCore using COFF/PE.
-   Copyright (C) 1994, 1999, 2000, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1994, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
    Contributed by Michael Tiemann (tiemann@cygnus.com).
 
 This file is part of GNU CC.
@@ -31,11 +31,8 @@ Boston, MA 02111-1307, USA.  */
 
 /* The MCore ABI says that bitfields are unsigned by default.  */
 /* The EPOC C++ environment does not support exceptions.  */
+#undef CC1_SPEC
 #define CC1_SPEC "-funsigned-bitfields %{!DIN_GCC:-fno-rtti} %{!DIN_GCC:-fno-exceptions}"
-
-#include "svr3.h"
-#include "mcore/mcore.h"
-#include "dbxcoff.h"
 
 #undef  SDB_DEBUGGING_INFO
 #define DBX_DEBUGGING_INFO 1
===================================================================
Index: config/mcore/mcore.h
--- config/mcore/mcore.h	3 Jul 2003 12:34:07 -0000	1.53
+++ config/mcore/mcore.h	14 Aug 2003 23:40:01 -0000
@@ -28,12 +28,6 @@
 #define	MCORE_STRUCT_ARGS
 /* RBE: end of "move elsewhere".  */
 
-#include "hwint.h"
-
-#ifndef HAVE_MACHINE_MODES
-#include "machmode.h"
-#endif
-
 /* Run-time Target Specification.  */
 #define TARGET_MCORE
 
@@ -179,10 +173,8 @@ extern const char * mcore_stack_incremen
      N_("Maximum amount for a single stack increment operation"), 0}	\
 }
 
-#ifndef CC1_SPEC
 /* The MCore ABI says that bitfields are unsigned by default.  */
 #define CC1_SPEC "-funsigned-bitfields"
-#endif
 
 /* What options are we going to default to specific settings when
    -O* happens; the user can subsequently override these settings.
===================================================================
Index: config/mips/netbsd.h
--- config/mips/netbsd.h	3 Jul 2003 12:34:08 -0000	1.29
+++ config/mips/netbsd.h	14 Aug 2003 23:40:01 -0000
@@ -128,20 +128,9 @@ Boston, MA 02111-1307, USA.  */
   while (0)
 
 
-/* Include the generic MIPS ELF configuration.  */
-#include <mips/elf.h>
-
-/* Now clean up after it.  */
+/* Clean up after the generic MIPS/ELF configuration.  */
 #undef MD_EXEC_PREFIX
 #undef MD_STARTFILE_PREFIX
-
-/* Get generic NetBSD definitions.  */
-#include <netbsd.h>
-
-
-/* Get generic NetBSD ELF definitions.  */
-#include <netbsd-elf.h>
-
 
 /* Extra specs we need.  */
 #undef SUBTARGET_EXTRA_SPECS
===================================================================
Index: config/mips/openbsd-be.h
--- config/mips/openbsd-be.h	27 Sep 1999 20:02:46 -0000	1.1
+++ config/mips/openbsd-be.h	1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-/* Configuration fragment for a mips big-endian OpenBSD target
-   Copyright (C) 1999 Free Software Foundation, Inc.
-
-This file is part of GNU CC.
-
-GNU CC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU CC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-#define TARGET_ENDIAN_DEFAULT MASK_BIG_ENDIAN
===================================================================
Index: config/mips/openbsd.h
--- config/mips/openbsd.h	14 Jul 2003 20:12:07 -0000	1.12
+++ config/mips/openbsd.h	14 Aug 2003 23:40:01 -0000
@@ -1,5 +1,5 @@
 /* Configuration for  a Mips ABI32 OpenBSD target.
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2003 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -21,34 +21,23 @@ Boston, MA 02111-1307, USA.  */
 /* Definitions needed for OpenBSD, to avoid picking mips 'defaults'.  */
 
 /* GAS must know this.  */
+#undef SUBTARGET_ASM_SPEC
 #define SUBTARGET_ASM_SPEC "%{fPIC|fPIE:-KPIC}"
 
 #define AS_NEEDS_DASH_FOR_PIPED_INPUT
 
 /* CPP specific OpenBSD specs.  */
+#undef SUBTARGET_CPP_SPEC
 #define SUBTARGET_CPP_SPEC OBSD_CPP_SPEC
 
 /* Needed for ELF (inspired by netbsd-elf).  */
 #define PREFERRED_DEBUGGING_TYPE DBX_DEBUG
+#undef LOCAL_LABEL_PREFIX
 #define LOCAL_LABEL_PREFIX	"."
 
 /* The profiling lib spec here is not really correct but we leave
    it as it is until we have some kind of profiling working.  */
 #define LIB_SPEC OBSD_LIB_SPEC
-
-/* By default, OpenBSD mips is little endian.  This is important to set
-   here as mips/mips.h defaults to big endian.  */
-#ifndef TARGET_ENDIAN_DEFAULT
-#define TARGET_ENDIAN_DEFAULT 0
-#endif
-
-#include <mips/mips.h>
-
-/* Get generic OpenBSD definitions.  */
-#define OBSD_HAS_DECLARE_FUNCTION_NAME
-#define OBSD_HAS_DECLARE_OBJECT
-#define OBSD_HAS_CORRECT_SPECS
-#include <openbsd.h>
 
 /* mips assembler uses .set for arcane purposes.  __attribute__((alias))
    and friends won't work until we get recent binutils with .weakext
===================================================================
Index: config/pa/pa.h
--- config/pa/pa.h	8 Aug 2003 02:57:48 -0000	1.200
+++ config/pa/pa.h	14 Aug 2003 23:40:01 -0000
@@ -325,9 +325,7 @@ extern int target_flags;
 
 #define OVERRIDE_OPTIONS override_options ()
 
-/* stabs-in-som is nearly identical to stabs-in-elf.  To avoid useless
-   code duplication we simply include this file and override as needed.  */
-#include "dbxelf.h"
+/* Override some settings from dbxelf.h.  */
 
 /* We do not have to be compatible with dbx, so we enable gdb extensions
    by default.  */
===================================================================
Index: config/rs6000/lynx.h
--- config/rs6000/lynx.h	29 Jun 2003 18:34:38 -0000	1.15
+++ config/rs6000/lynx.h	14 Aug 2003 23:40:01 -0000
@@ -19,31 +19,6 @@
    Free Software Foundation, 59 Temple Place - Suite 330, Boston,
    MA 02111-1307, USA.  */
 
-/* Definitions we want to override with those from rs6000.h:  */
-#undef LIB_SPEC
-#undef PTRDIFF_TYPE
-#undef WCHAR_TYPE
-#undef WCHAR_TYPE_SIZE
-#undef EXTRA_SECTIONS
-#undef READONLY_DATA_SECTION
-#undef READONLY_DATA_SECTION_ASM_OP
-#undef EXTRA_SECTION_FUNCTIONS
-#undef TARGET_ASM_SELECT_RTX_SECTION
-#undef TARGET_ASM_SELECT_SECTION
-#undef USER_LABEL_PREFIX
-#undef ASM_OUTPUT_LABELREF
-#undef ASM_GENERATE_INTERNAL_LABEL
-#undef ASM_OUTPUT_COMMON
-#undef ASM_OUTPUT_LOCAL
-
-#undef SDB_DEBUGGING_INFO
-#undef DBX_DEBUGGING_INFO
-#undef PREFERRED_DEBUGGING_TYPE
-
-#undef FUNCTION_PROFILER
-
-#include <rs6000/rs6000.h>
-
 /* Print subsidiary information on the compiler version in use.  */
 #define TARGET_VERSION fprintf (stderr, " (LynxOS-RS/6000)");
 
===================================================================
Index: config/rs6000/lynxbase.h
--- config/rs6000/lynxbase.h	1 Jan 1970 00:00:00 -0000
+++ config/rs6000/lynxbase.h	14 Aug 2003 23:40:01 -0000
@@ -0,0 +1,45 @@
+/* Definitions for Rs6000 running LynxOS.
+   Copyright (C) 2003 Free Software Foundation, Inc.
+   Contributed by David Henkel-Wallace, Cygnus Support (gumby@cygnus.com)
+
+   This file is part of GCC.
+
+   GCC is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published
+   by the Free Software Foundation; either version 2, or (at your
+   option) any later version.
+
+   GCC is distributed in the hope that it will be useful, but WITHOUT
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
+   License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with GCC; see the file COPYING.  If not, write to the
+   Free Software Foundation, 59 Temple Place - Suite 330, Boston,
+   MA 02111-1307, USA.  */
+
+/* Definitions we want to override with those from rs6000.h:  */
+#undef LIB_SPEC
+#undef PTRDIFF_TYPE
+#undef SIZE_TYPE
+#undef WCHAR_TYPE
+#undef WCHAR_TYPE_SIZE
+#undef EXTRA_SECTIONS
+#undef READONLY_DATA_SECTION
+#undef READONLY_DATA_SECTION_ASM_OP
+#undef EXTRA_SECTION_FUNCTIONS
+#undef TARGET_ASM_SELECT_RTX_SECTION
+#undef TARGET_ASM_SELECT_SECTION
+#undef USER_LABEL_PREFIX
+#undef ASM_OUTPUT_LABELREF
+#undef ASM_GENERATE_INTERNAL_LABEL
+#undef ASM_OUTPUT_COMMON
+#undef ASM_OUTPUT_LOCAL
+
+#undef SDB_DEBUGGING_INFO
+#undef DBX_DEBUGGING_INFO
+#undef PREFERRED_DEBUGGING_TYPE
+
+#undef FUNCTION_PROFILER
+#undef SUBTARGET_SWITCHES
===================================================================
Index: config/s390/s390.h
--- config/s390/s390.h	30 Jul 2003 17:38:14 -0000	1.80
+++ config/s390/s390.h	14 Aug 2003 23:40:01 -0000
@@ -26,7 +26,7 @@ Software Foundation, 59 Temple Place - S
 /* Override the __fixdfdi etc. routines when building libgcc2.
    ??? This should be done in a cleaner way ...  */
 #if defined (IN_LIBGCC2) && !defined (__s390x__)
-#include <s390/fixdfdi.h>
+#include <config/s390/fixdfdi.h>
 #endif
 
 /* Which processor to generate code or schedule for. The cpu attribute
===================================================================
Index: config/sh/embed-elf.h
--- config/sh/embed-elf.h	17 Jun 2003 19:19:15 -0000	1.2
+++ config/sh/embed-elf.h	14 Aug 2003 23:40:01 -0000
@@ -1,6 +1,6 @@
 /* Definitions of target machine for GNU compiler for Renesas / SuperH SH 
    non-Linux embedded targets.
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003 Free Software Foundation, Inc.
    Contributed by J"orn Rennecke <joern.rennecke@superh.com>
 
 This file is part of GNU CC.
@@ -19,8 +19,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, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
-
-#include "sh/elf.h"
 
 #undef USER_LABEL_PREFIX
 #define USER_LABEL_PREFIX "_"
===================================================================
Index: config/sparc/openbsd.h
--- config/sparc/openbsd.h	17 Jun 2003 01:00:43 -0000	1.11
+++ config/sparc/openbsd.h	14 Aug 2003 23:40:01 -0000
@@ -1,5 +1,5 @@
 /* Configuration file for sparc OpenBSD target.
-   Copyright (C) 1999, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2003 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -17,10 +17,6 @@ You should have received a copy of the G
 along with GCC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
-
-/* Get generic OpenBSD definitions.  */
-#define OBSD_OLD_GAS
-#include <openbsd.h>
 
 /* Target OS builtins.  */
 #define TARGET_OS_CPP_BUILTINS()		\


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