config.gcc (sparc-tti-*, [...]): Include various CPU headers via tm_file.

2001-11-12  David O'Brien  <obrien@FreeBSD.org>
	* config.gcc (sparc-tti-*, sparc64-wrs-vxworks*, sparc-wrs-vxworks*,
	sparclite-wrs-vxworks*, sparc-*-aout*, sparc-*-netbsd*,
	sparc-*-chorusos*, sparc-*-linux*aout*, sparc-*-linux*libc1*,
	sparc-*-linux*, sparc-*-lynxos*, sparc-*-rtemsaout*, sparc-*-rtems*,
	sparc-*-rtemself*, sparc-*-solaris2*, sparc-*-sunos3*, sparc-*-sysv4*,
	sparc-*-vxsim*, sparclet-*-aout*, sparclite-*-coff*, sparclite-*-aout*,
	sparc86x-*-aout*, sparc86x-*-elf*, sparc64-*-aout*, sparc64-*-elf*,
	sparc64-*-linux*):  Include various CPU headers via tm_file.
	* config/svr3.h (ASM_OUTPUT_IDENT): Undef before defining it.
	(SELECT_SECTION): Likewise.
	(SELECT_RTX_SECTION): Likewise.
	* config/sparc/sparc_bi.h: New file.
	* config/sparc/aout.h: Don't include sparc/sparc.h and aoutos.h.
	* config/sparc/linux-aout.h: Likewise.
	* config/sparc/linux.h: Don't include sparc/sysv4.h.
	* config/sparc/linux64.h: Likewise.
	(SPARC_BI_ARCH): Don't define.  sparc_bi.h will do it instead.
	* config/sparc/lite.h:  Don't include sparc/sparc.h and gofast.h.
	* config/sparc/litecoff.h: Don't include sparc/lite.h, svr3.h,
	and dbxcoff.h
	(ASM_OUTPUT_IDENT): Do not #undef.
	(SELECT_SECTION): Likewise.
	(SELECT_RTX_SECTION): Likewise.
	* config/sparc/liteelf.h: Don't include gofast.h.
	* config/sparc/lynx-ng.h: Don't include sparc/sparc.h and lynx-ng.h.
	* config/sparc/lynx.h: Don't include sparc/sparc.h.
	* config/sparc/pbd.h: Likewise.
	* config/sparc/netbsd.h: Don't include sparc/sparc.h and netbsd.h.
	* config/sparc/rtems.h: Don't include sparc/aout.h and rtems.h.
	* config/sparc/rtemself.h: Don't include rtems.h.
	* config/sparc/sol2-64.h: Don't include sparc/sol2-sld-64.h.
	* config/sparc/sol2-sld-64.h (SPARC_BI_ARCH): Don't define, include
	sparc_bi.h instead.
	* config/sparc/sol2-sld.h: Don't include sparc/sol2.h.
	* config/sparc/sol2.h: Include sparc/sparc.h directly.
	* config/sparc/sp64-aout.h: Don't include sparc/sparc.h and aoutos.h.
	* config/sparc/sp64-elf.h: Don't include sparc/sol2.h.
	* config/sparc/sp86x-aout.h: Don't include sparc/sparc.h and gofast.h.
	* config/sparc/sp86x-elf.h: Don't include gofast.h.
	* config/sparc/splet.h: Don't include sparc/aout.h.
	* config/sparc/sun4o3.h: Don't include sparc/sparc.h.
	* config/sparc/sysv4.h: Don't include sparc/sparc.h directly.
	* config/sparc/vxsim.h: Don't include sparc/sysv4.h.
	* config/sparc/vxsparc.h: Don't include sparc/aout.h and gofast.h.
	* config/sparc/vxsparc64.h: Don't include gofast.h.
	(SPARC_BI_ARCH): Don't define.  sparc_bi.h will do it instead.

Approved by:  David S. Miller <davem@redhat.com>
              Message-Id: <20011112.151527.70477368.davem@redhat.com>

From-SVN: r46969

31 files changed, 108 insertions, 102 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7578395..a2fd39b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,52 @@
+2001-11-12  David O'Brien  <obrien@FreeBSD.org>
+
+	* config.gcc (sparc-tti-*, sparc64-wrs-vxworks*, sparc-wrs-vxworks*,
+	sparclite-wrs-vxworks*, sparc-*-aout*, sparc-*-netbsd*,
+	sparc-*-chorusos*, sparc-*-linux*aout*, sparc-*-linux*libc1*,
+	sparc-*-linux*, sparc-*-lynxos*, sparc-*-rtemsaout*, sparc-*-rtems*,
+	sparc-*-rtemself*, sparc-*-solaris2*, sparc-*-sunos3*, sparc-*-sysv4*,
+	sparc-*-vxsim*, sparclet-*-aout*, sparclite-*-coff*, sparclite-*-aout*,
+	sparc86x-*-aout*, sparc86x-*-elf*, sparc64-*-aout*, sparc64-*-elf*,
+	sparc64-*-linux*):  Include various CPU headers via tm_file.
+	* config/svr3.h (ASM_OUTPUT_IDENT): Undef before defining it.
+	(SELECT_SECTION): Likewise.
+	(SELECT_RTX_SECTION): Likewise.
+	* config/sparc/sparc_bi.h: New file.
+	* config/sparc/aout.h: Don't include sparc/sparc.h and aoutos.h.
+	* config/sparc/linux-aout.h: Likewise.
+	* config/sparc/linux.h: Don't include sparc/sysv4.h.
+	* config/sparc/linux64.h: Likewise.
+	(SPARC_BI_ARCH): Don't define.  sparc_bi.h will do it instead.
+	* config/sparc/lite.h:  Don't include sparc/sparc.h and gofast.h.
+	* config/sparc/litecoff.h: Don't include sparc/lite.h, svr3.h,
+	and dbxcoff.h
+	(ASM_OUTPUT_IDENT): Do not #undef.
+	(SELECT_SECTION): Likewise.
+	(SELECT_RTX_SECTION): Likewise.
+	* config/sparc/liteelf.h: Don't include gofast.h.
+	* config/sparc/lynx-ng.h: Don't include sparc/sparc.h and lynx-ng.h.
+	* config/sparc/lynx.h: Don't include sparc/sparc.h.
+	* config/sparc/pbd.h: Likewise.
+	* config/sparc/netbsd.h: Don't include sparc/sparc.h and netbsd.h.
+	* config/sparc/rtems.h: Don't include sparc/aout.h and rtems.h.
+	* config/sparc/rtemself.h: Don't include rtems.h.
+	* config/sparc/sol2-64.h: Don't include sparc/sol2-sld-64.h.
+	* config/sparc/sol2-sld-64.h (SPARC_BI_ARCH): Don't define, include
+	sparc_bi.h instead.
+	* config/sparc/sol2-sld.h: Don't include sparc/sol2.h.
+	* config/sparc/sol2.h: Include sparc/sparc.h directly.
+	* config/sparc/sp64-aout.h: Don't include sparc/sparc.h and aoutos.h.
+	* config/sparc/sp64-elf.h: Don't include sparc/sol2.h.
+	* config/sparc/sp86x-aout.h: Don't include sparc/sparc.h and gofast.h.
+	* config/sparc/sp86x-elf.h: Don't include gofast.h.
+	* config/sparc/splet.h: Don't include sparc/aout.h.
+	* config/sparc/sun4o3.h: Don't include sparc/sparc.h.
+	* config/sparc/sysv4.h: Don't include sparc/sparc.h directly.
+	* config/sparc/vxsim.h: Don't include sparc/sysv4.h.
+	* config/sparc/vxsparc.h: Don't include sparc/aout.h and gofast.h.
+	* config/sparc/vxsparc64.h: Don't include gofast.h.
+	(SPARC_BI_ARCH): Don't define.  sparc_bi.h will do it instead.
+
 2001-11-12  Joseph S. Myers  <jsm28@cam.ac.uk>
 
 	* doc/standards.texi: Mention C99 TC1.
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 6f17aaa..f6169dd 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -2901,26 +2901,26 @@ sh-*-*)
 	float_format=sh
 	;;
 sparc-tti-*)
-	tm_file=sparc/pbd.h
+	tm_file="${tm_file} sparc/pbd.h"
 	xm_defines=POSIX
 	;;
 sparc64-wrs-vxworks*)
-        tm_file="sparc/sol2.h sparc/elf.h sparc/vxsparc64.h"
+        tm_file="sparc/sol2.h sparc/elf.h sparc/sparc_bi.h gofast.h sparc/vxsparc64.h"
         tmake_file=sparc/t-vxsparc64
         use_collect2=yes
         ;;
 sparc-wrs-vxworks* | sparclite-wrs-vxworks*)
-	tm_file=sparc/vxsparc.h
+	tm_file="${tm_file} aoutos.h sparc/aout.h gofast.h sparc/vxsparc.h"
 	tmake_file=sparc/t-vxsparc
 	use_collect2=yes
 	thread_file='vxworks'
 	;;
 sparc-*-aout*)
 	tmake_file=sparc/t-sparcbare
-	tm_file="sparc/aout.h libgloss.h"
+	tm_file="sparc/sparc.h aoutos.h sparc/aout.h libgloss.h"
 	;;
 sparc-*-netbsd*)
-	tm_file=sparc/netbsd.h
+	tm_file="${tm_file} netbsd.h sparc/netbsd.h"
 	tmake_file=t-netbsd
 	use_collect2=yes
 	;;
@@ -2934,7 +2934,7 @@ sparc-*-bsd*)
 	tm_file="${tm_file} sparc/bsd.h"
 	;;
 sparc-*-chorusos*)
-	tm_file="sparc/sol2.h sparc/elf.h chorus.h"
+	tm_file="${tm_file} sparc/sysv4.h sparc/sol2.h sparc/elf.h chorus.h"
 	tmake_file=sparc/t-chorus-elf
 	extra_parts="crti.o crtn.o crtbegin.o crtend.o"
 	float_format=i64
@@ -2952,13 +2952,13 @@ sparc-*-elf*)
 	float_format=i64
 	;;
 sparc-*-linux*aout*)		# Sparc's running GNU/Linux, a.out
-	tm_file=sparc/linux-aout.h
+	tm_file="aoutos.h sparc/sparc.h sparc/linux-aout.h"
 	xmake_file=x-linux
 	gnu_ld=yes
 	;;
 sparc-*-linux*libc1*)	# Sparc's running GNU/Linux, libc5
 	xmake_file=x-linux
-	tm_file=sparc/linux.h
+	tm_file="${tm_file} sparc/sysv4.h sparc/linux.h"
 	tmake_file="t-slibgcc-elf-ver t-linux t-linux-gnulibc1"
 	extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 	gnu_ld=yes
@@ -2966,7 +2966,7 @@ sparc-*-linux*libc1*)	# Sparc's running GNU/Linux, libc5
 	;;
 sparc-*-linux*)		# Sparc's running GNU/Linux, libc6
 	xmake_file=x-linux
-	tm_file=sparc/linux.h
+	tm_file="${tm_file} sparc/sysv4.h sparc/linux.h"
 	tmake_file="t-slibgcc-elf-ver t-linux"
 	extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 	gnu_ld=yes
@@ -2978,21 +2978,21 @@ sparc-*-linux*)		# Sparc's running GNU/Linux, libc6
 sparc-*-lynxos*)
 	if test x$gas = xyes
 	then
-		tm_file=sparc/lynx.h
+		tm_file="${tm_file} sparc/lynx.h"
 	else
-		tm_file=sparc/lynx-ng.h
+		tm_file="${tm_file} lynx-ng.h sparc/lynx-ng.h"
 	fi
 	tmake_file=sparc/t-sunos41
 	;;
 sparc-*-rtemsaout*)
 	tmake_file="sparc/t-sparcbare t-rtems"
-	tm_file=sparc/rtems.h
+	tm_file="${tm_file} aoutos.h sparc/aout.h sparc/rtems.h rtems.h"
 	if test x$enable_threads = xyes; then
 	  thread_file='rtems'
 	fi
 	;;
 sparc-*-rtems*|sparc-*-rtemself*)
-	tm_file="sparc/sol2.h sparc/elf.h sparc/rtemself.h"
+	tm_file="sparc/sol2.h sparc/elf.h sparc/rtemself.h rtems.h"
 	tmake_file="sparc/t-elf t-rtems"
 	extra_parts="crti.o crtn.o crtbegin.o crtend.o"
 	#float_format=i128
@@ -3004,7 +3004,7 @@ sparc-*-rtems*|sparc-*-rtemself*)
 sparcv9-*-solaris2* | sparc64-*-solaris2*)
 	if test x$gnu_ld = xyes
 	then
-		tm_file=sparc/sol2-64.h
+		tm_file="sparc/sol2-sld-64.h sparc/sol2-64.h"
 	else
 		tm_file=sparc/sol2-sld-64.h
 	fi
@@ -3054,9 +3054,9 @@ sparc-hal-solaris2*)
 sparc-*-solaris2*)
 	if test x$gnu_ld = xyes
 	then
-		tm_file=sparc/sol2.h
+		tm_file="sparc/sol2.h"
 	else
-		tm_file=sparc/sol2-sld.h
+		tm_file="sparc/sol2.h sparc/sol2-sld.h"
 	fi
 	xm_defines=POSIX
 	tmake_file=sparc/t-sol2
@@ -3071,9 +3071,9 @@ sparc-*-solaris2*)
 	*-*-solaris2*)
 		if test x$gnu_ld = xyes
 		then
-			tm_file=sparc/sol2-64.h
+			tm_file="sparc/sol2-sld-64.h sparc/sol2-64.h"
 		else
-			tm_file=sparc/sol2-sld-64.h
+			tm_file="sparc/sol2-sld-64.h"
 		fi
 		tmake_file="$tmake_file sparc/t-sol2-64"
 		;;
@@ -3113,56 +3113,56 @@ sparc-*-sunos4*)
 	fi
 	;;
 sparc-*-sunos3*)
-	tm_file=sparc/sun4o3.h
+	tm_file="${tm_file} sparc/sun4o3.h"
 	use_collect2=yes
 	;;
 sparc-*-sysv4*)
-	tm_file=sparc/sysv4.h
+	tm_file="${tm_file} sparc/sysv4.h"
 	xm_defines=POSIX
 	tmake_file=t-svr4
 	extra_parts="crtbegin.o crtend.o"
 	;;
 sparc-*-vxsim*)
 	xm_defines=POSIX
-	tm_file=sparc/vxsim.h
+	tm_file="${tm_file} sparc/sysv4.h sparc/vxsim.h"
 	tmake_file=sparc/t-vxsparc
 	;;
 sparclet-*-aout*)
-	tm_file="sparc/splet.h libgloss.h"
+	tm_file="${tm_file} aoutos.h sparc/aout.h sparc/splet.h libgloss.h"
 	tmake_file=sparc/t-splet
 	;;
 sparclite-*-coff*)
-	tm_file="sparc/litecoff.h libgloss.h"
+	tm_file="${tm_file} gofast.h sparc/lite.h svr3.h sparc/litecoff.h dbxcoff.h libgloss.h"
 	tmake_file=sparc/t-sparclite
 	;;
 sparclite-*-aout*)
-	tm_file="sparc/lite.h aoutos.h libgloss.h"
+	tm_file="${tm_file} gofast.h sparc/lite.h aoutos.h libgloss.h"
 	tmake_file=sparc/t-sparclite
 	;;
 sparclite-*-elf*)
-	tm_file="sparc/sol2.h sparc/elf.h sparc/liteelf.h"
+	tm_file="sparc/sol2.h sparc/elf.h gofast.h sparc/liteelf.h"
 	tmake_file=sparc/t-sparclite
         extra_parts="crtbegin.o crtend.o"
 	;;
 sparc86x-*-aout*)
-	tm_file="sparc/sp86x-aout.h aoutos.h libgloss.h"
+	tm_file="${tm_file} gofast.h sparc/sp86x-aout.h aoutos.h libgloss.h"
 	tmake_file=sparc/t-sp86x
 	;;
 sparc86x-*-elf*)
-	tm_file="sparc/sol2.h sparc/elf.h sparc/sp86x-elf.h"
+	tm_file="sparc/sol2.h sparc/elf.h gofast.h sparc/sp86x-elf.h"
 	tmake_file=sparc/t-sp86x
         extra_parts="crtbegin.o crtend.o"
 	;;
 sparc64-*-aout*)
-	tm_file=sparc/sp64-aout.h
+	tm_file="sparc/sparc.h aoutos.h sparc/sp64-aout.h"
 	;;
 sparc64-*-elf*)
-	tm_file=sparc/sp64-elf.h
+	tm_file="sparc/sol2.h sparc/sp64-elf.h"
 	extra_parts="crtbegin.o crtend.o"
 	;;
 sparc64-*-linux*)		# 64-bit Sparc's running GNU/Linux
 	tmake_file="t-slibgcc-elf-ver t-linux sparc/t-linux64"
-	tm_file=sparc/linux64.h
+	tm_file="sparc/sparc_bi.h ${tm_file} sparc/sysv4.h sparc/linux64.h"
 	xmake_file=x-linux
 	extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 	gnu_ld=yes
diff --git a/gcc/config/sparc/aout.h b/gcc/config/sparc/aout.h
index f640eb9..217430e 100644
--- a/gcc/config/sparc/aout.h
+++ b/gcc/config/sparc/aout.h
@@ -19,8 +19,5 @@ 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 "sparc/sparc.h"	/* SPARC definitions */
-#include "aoutos.h"		/* A.out definitions */
-
 #undef CPP_PREDEFINES
 #define CPP_PREDEFINES "-Dsparc -Acpu=sparc -Amachine=sparc"
diff --git a/gcc/config/sparc/linux-aout.h b/gcc/config/sparc/linux-aout.h
index ee5af67..0c44541 100644
--- a/gcc/config/sparc/linux-aout.h
+++ b/gcc/config/sparc/linux-aout.h
@@ -19,9 +19,6 @@ 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 <aoutos.h>
-#include <sparc/sparc.h>
-
 /* Don't assume anything about the header files.  */
 #define NO_IMPLICIT_EXTERN_C
 
diff --git a/gcc/config/sparc/linux.h b/gcc/config/sparc/linux.h
index 78fcda5..53fbf7f 100644
--- a/gcc/config/sparc/linux.h
+++ b/gcc/config/sparc/linux.h
@@ -35,8 +35,6 @@ Boston, MA 02111-1307, USA.  */
 /* Use stabs instead of DWARF debug format.  */
 #define PREFERRED_DEBUGGING_TYPE DBX_DEBUG
 
-#include <sparc/sysv4.h>
-
 #undef MD_EXEC_PREFIX
 #undef MD_STARTFILE_PREFIX
 
diff --git a/gcc/config/sparc/linux64.h b/gcc/config/sparc/linux64.h
index a15f871..566d722 100644
--- a/gcc/config/sparc/linux64.h
+++ b/gcc/config/sparc/linux64.h
@@ -19,15 +19,11 @@ 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 SPARC_BI_ARCH
-
 #define LINUX_DEFAULT_ELF
 
 /* Don't assume anything about the header files.  */
 #define NO_IMPLICIT_EXTERN_C
 
-#include <sparc/sysv4.h>
-
 #undef MD_EXEC_PREFIX
 #undef MD_STARTFILE_PREFIX
 
diff --git a/gcc/config/sparc/lite.h b/gcc/config/sparc/lite.h
index 22c47e1..f740443 100644
--- a/gcc/config/sparc/lite.h
+++ b/gcc/config/sparc/lite.h
@@ -19,8 +19,6 @@ 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 "sparc/sparc.h"
-
 #undef CPP_PREDEFINES
 #define CPP_PREDEFINES "-Dsparc -Dsparclite -Acpu=sparc -Amachine=sparc"
 
@@ -33,6 +31,5 @@ Boston, MA 02111-1307, USA.  */
 #define TARGET_DEFAULT (MASK_APP_REGS + MASK_EPILOGUE)
 
 /* US Software GOFAST library support.  */
-#include "gofast.h"
 #undef INIT_SUBTARGET_OPTABS
 #define INIT_SUBTARGET_OPTABS INIT_GOFAST_OPTABS
diff --git a/gcc/config/sparc/litecoff.h b/gcc/config/sparc/litecoff.h
index e2340c3..73a31cc 100644
--- a/gcc/config/sparc/litecoff.h
+++ b/gcc/config/sparc/litecoff.h
@@ -19,16 +19,8 @@ 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 "sparc/lite.h"
-
-#undef ASM_OUTPUT_IDENT
-
-#undef SELECT_SECTION
-#undef SELECT_RTX_SECTION
 #define BSS_SECTION_ASM_OP	"\t.section\t\".bss\""
 
-#include "svr3.h"
-
 #undef CPP_PREDEFINES
 #define CPP_PREDEFINES "-Dsparc -Dsparclite -Acpu=sparc -Amachine=sparc"
 
@@ -36,8 +28,6 @@ Boston, MA 02111-1307, USA.  */
 
 #define PREFERRED_DEBUGGING_TYPE DBX_DEBUG
 
-#include "dbxcoff.h"
-
 /* Support the ctors and dtors sections for g++.  */
 
 #undef INIT_SECTION_ASM_OP
diff --git a/gcc/config/sparc/liteelf.h b/gcc/config/sparc/liteelf.h
index 0181d66..1c4525c 100644
--- a/gcc/config/sparc/liteelf.h
+++ b/gcc/config/sparc/liteelf.h
@@ -39,7 +39,6 @@ Boston, MA 02111-1307, USA.  */
 #define TARGET_DEFAULT (MASK_APP_REGS + MASK_EPILOGUE)
 
 /* US Software GOFAST library support.  */
-#include "gofast.h"
 #undef INIT_SUBTARGET_OPTABS
 #define INIT_SUBTARGET_OPTABS INIT_GOFAST_OPTABS      
 
diff --git a/gcc/config/sparc/lynx-ng.h b/gcc/config/sparc/lynx-ng.h
index b88b739..b1a6ef5 100644
--- a/gcc/config/sparc/lynx-ng.h
+++ b/gcc/config/sparc/lynx-ng.h
@@ -18,9 +18,6 @@ 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 <sparc/sparc.h>
-#include <lynx-ng.h>
-
 /* ??? Must redefine to get sparclite and v8 defines.  Can this be done
    differently?  */
 
diff --git a/gcc/config/sparc/lynx.h b/gcc/config/sparc/lynx.h
index bcbf61f..45216b2 100644
--- a/gcc/config/sparc/lynx.h
+++ b/gcc/config/sparc/lynx.h
@@ -18,8 +18,6 @@ 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 <sparc/sparc.h>
-
 #undef ASM_OUTPUT_IDENT
 #undef SELECT_SECTION
 #undef SELECT_RTX_SECTION
diff --git a/gcc/config/sparc/netbsd.h b/gcc/config/sparc/netbsd.h
index 2d92d6b..0fc5bd1 100644
--- a/gcc/config/sparc/netbsd.h
+++ b/gcc/config/sparc/netbsd.h
@@ -1,9 +1,3 @@
-#include <sparc/sparc.h>
-
-/* Get generic NetBSD definitions.  */
-
-#include <netbsd.h>
-
 /* Names to predefine in the preprocessor for this target machine.  */
 
 #undef CPP_PREDEFINES
diff --git a/gcc/config/sparc/pbd.h b/gcc/config/sparc/pbd.h
index bf61741..27dfa96 100644
--- a/gcc/config/sparc/pbd.h
+++ b/gcc/config/sparc/pbd.h
@@ -19,7 +19,6 @@ 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 "sparc/sparc.h"
 
 /* Names to predefine in the preprocessor for this target machine.  */
 
diff --git a/gcc/config/sparc/rtems.h b/gcc/config/sparc/rtems.h
index eeb7730..9db8049 100644
--- a/gcc/config/sparc/rtems.h
+++ b/gcc/config/sparc/rtems.h
@@ -19,7 +19,6 @@ 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 "sparc/aout.h"
 
 /* Specify predefined symbols in preprocessor.  */
 
@@ -31,6 +30,3 @@ Boston, MA 02111-1307, USA.  */
 #ifndef TARGET_MEM_FUNCTIONS
 #define TARGET_MEM_FUNCTIONS
 #endif
-
-/* Get machine-independent configuration parameters for RTEMS.  */
-#include <rtems.h>
diff --git a/gcc/config/sparc/rtemself.h b/gcc/config/sparc/rtemself.h
index cfc95f2..108ff33 100644
--- a/gcc/config/sparc/rtemself.h
+++ b/gcc/config/sparc/rtemself.h
@@ -29,7 +29,3 @@ Boston, MA 02111-1307, USA.  */
 #ifndef TARGET_MEM_FUNCTIONS
 #define TARGET_MEM_FUNCTIONS
 #endif
-
-/* Get machine-independent configuration parameters for RTEMS.  */
-#include <rtems.h>
-
diff --git a/gcc/config/sparc/sol2-64.h b/gcc/config/sparc/sol2-64.h
index a5d2be6..40db497 100644
--- a/gcc/config/sparc/sol2-64.h
+++ b/gcc/config/sparc/sol2-64.h
@@ -1,8 +1,6 @@
 /* Definitions of target machine for GNU compiler, for 64-bit SPARC
    running Solaris 2 using the GNU linker.  */
 
-#include "sparc/sol2-sld-64.h"
-
 #ifdef LINKER_DOES_NOT_WORK_WITH_DWARF2
 #undef LINKER_DOES_NOT_WORK_WITH_DWARF2
 #endif
diff --git a/gcc/config/sparc/sol2-sld-64.h b/gcc/config/sparc/sol2-sld-64.h
index 8433cfc..c9d89ca 100644
--- a/gcc/config/sparc/sol2-sld-64.h
+++ b/gcc/config/sparc/sol2-sld-64.h
@@ -2,9 +2,7 @@
    running Solaris 2 using the system linker.  */
 
 #ifdef AS_SPARC64_FLAG
-
-#define SPARC_BI_ARCH
-
+#include "sparc/sparc_bi.h"
 #endif
 
 #include "sparc/sol2.h"
diff --git a/gcc/config/sparc/sol2-sld.h b/gcc/config/sparc/sol2-sld.h
index a824987..3847fae 100644
--- a/gcc/config/sparc/sol2-sld.h
+++ b/gcc/config/sparc/sol2-sld.h
@@ -1,8 +1,6 @@
 /* Definitions of target machine for GNU compiler, for SPARC running Solaris 2
    using the system linker.  */
 
-#include "sparc/sol2.h"
-
 /* At least up through Solaris 2.6,
    the system linker does not work with DWARF or DWARF2,
    since it does not have working support for relocations
diff --git a/gcc/config/sparc/sol2.h b/gcc/config/sparc/sol2.h
index 4f0cef8..aee098b 100644
--- a/gcc/config/sparc/sol2.h
+++ b/gcc/config/sparc/sol2.h
@@ -22,6 +22,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 /* Supposedly the same as vanilla sparc svr4, except for the stuff below: */
+#include "sparc/sparc.h"
 #include "sparc/sysv4.h"
 
 /* Solaris 2 uses a wint_t different from the default. This is required
diff --git a/gcc/config/sparc/sp64-aout.h b/gcc/config/sparc/sp64-aout.h
index ea3433d..8183973 100644
--- a/gcc/config/sparc/sp64-aout.h
+++ b/gcc/config/sparc/sp64-aout.h
@@ -19,8 +19,6 @@ 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 "sparc/sparc.h"
-#include "aoutos.h"
 
 #undef TARGET_VERSION
 #define TARGET_VERSION fprintf (stderr, " (sparc64-aout)")
diff --git a/gcc/config/sparc/sp64-elf.h b/gcc/config/sparc/sp64-elf.h
index cdd8f4c..3aac978 100644
--- a/gcc/config/sparc/sp64-elf.h
+++ b/gcc/config/sparc/sp64-elf.h
@@ -25,8 +25,6 @@ Boston, MA 02111-1307, USA.  */
    less duplicate all of svr4.h, sparc/sysv4.h, and sparc/sol2.h here
    (suitably cleaned up).  */
 
-#include "sparc/sol2.h"
-
 #undef TARGET_VERSION
 #define TARGET_VERSION fprintf (stderr, " (sparc64-elf)")
 
diff --git a/gcc/config/sparc/sp86x-aout.h b/gcc/config/sparc/sp86x-aout.h
index 78a26cb..ed31925 100644
--- a/gcc/config/sparc/sp86x-aout.h
+++ b/gcc/config/sparc/sp86x-aout.h
@@ -18,7 +18,6 @@ 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 "sparc/sparc.h"
 
 #undef CPP_PREDEFINES
 #define CPP_PREDEFINES "-D__sparc__ -D__sparclite86x__ -Acpu=sparc -Amachine=sparc"
@@ -35,7 +34,6 @@ Boston, MA 02111-1307, USA.  */
 #define ASM_SPEC "%{v:-v} %{mlittle-endian-data:--little-endian-data} %(asm_cpu)"
 
 /* US Software GOFAST library support.  */
-#include "gofast.h"
 #undef INIT_SUBTARGET_OPTABS
 #define INIT_SUBTARGET_OPTABS INIT_GOFAST_OPTABS
 
diff --git a/gcc/config/sparc/sp86x-elf.h b/gcc/config/sparc/sp86x-elf.h
index 412738d..5ae99e3 100644
--- a/gcc/config/sparc/sp86x-elf.h
+++ b/gcc/config/sparc/sp86x-elf.h
@@ -42,7 +42,6 @@ Boston, MA 02111-1307, USA.  */
 #define ASM_SPEC "%{v:-V} %{mlittle-endian-data:--little-endian-data} %(asm_cpu)"
 
 /* US Software GOFAST library support.  */
-#include "gofast.h"
 #undef INIT_SUBTARGET_OPTABS
 #define INIT_SUBTARGET_OPTABS INIT_GOFAST_OPTABS      
 
diff --git a/gcc/config/sparc/sparc_bi.h b/gcc/config/sparc/sparc_bi.h
new file mode 100644
index 0000000..f85111a
--- /dev/null
+++ b/gcc/config/sparc/sparc_bi.h
@@ -0,0 +1,24 @@
+/* Definitions of target machine for GNU compiler, for Sun SPARC.
+   Copyright (C) 2001 Free Software Foundation, Inc.
+   Contributed by David E. O'Brien <obrien@FreeBSD.org>.
+
+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.  */
+
+/* Specify this in a cover file to provide bi-architecture (32/64) support.  */
+
+#define SPARC_BI_ARCH
diff --git a/gcc/config/sparc/splet.h b/gcc/config/sparc/splet.h
index cd85f01..922dd33 100644
--- a/gcc/config/sparc/splet.h
+++ b/gcc/config/sparc/splet.h
@@ -19,8 +19,6 @@ 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 "sparc/aout.h"
-
 #undef TARGET_DEFAULT
 #define TARGET_DEFAULT (MASK_APP_REGS + MASK_EPILOGUE)
 
diff --git a/gcc/config/sparc/sun4o3.h b/gcc/config/sparc/sun4o3.h
index d2a53c1..19ff33e 100644
--- a/gcc/config/sparc/sun4o3.h
+++ b/gcc/config/sparc/sun4o3.h
@@ -1,5 +1,3 @@
-#include "sparc/sparc.h"
-
 /* Override the name of the mcount profiling function.  */
 
 #undef MCOUNT_FUNCTION
diff --git a/gcc/config/sparc/sysv4.h b/gcc/config/sparc/sysv4.h
index ecff5b5..12c3fdf 100644
--- a/gcc/config/sparc/sysv4.h
+++ b/gcc/config/sparc/sysv4.h
@@ -20,8 +20,6 @@ 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.  */
 
-/* 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
    appropriate only for SunOS 4.x, and not for svr4.  */
diff --git a/gcc/config/sparc/vxsim.h b/gcc/config/sparc/vxsim.h
index 9573dbe..ea2ed5e 100644
--- a/gcc/config/sparc/vxsim.h
+++ b/gcc/config/sparc/vxsim.h
@@ -19,7 +19,6 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 /* Supposedly the same as vanilla sparc svr4, except for the stuff below: */
-#include "sparc/sysv4.h"
 
 #undef CPP_PREDEFINES
 #define CPP_PREDEFINES \
diff --git a/gcc/config/sparc/vxsparc.h b/gcc/config/sparc/vxsparc.h
index 1b5a70a..da3e591 100644
--- a/gcc/config/sparc/vxsparc.h
+++ b/gcc/config/sparc/vxsparc.h
@@ -19,7 +19,6 @@ 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 "sparc/aout.h"
 
 /* Specify what to link with.  */
 /* VxWorks does all the library stuff itself.  */
@@ -56,6 +55,5 @@ Boston, MA 02111-1307, USA.  */
 #define WCHAR_TYPE_SIZE 8
 
 /* US Software GOFAST library support.  */
-#include "gofast.h"
 #undef INIT_SUBTARGET_OPTABS
 #define INIT_SUBTARGET_OPTABS INIT_GOFAST_OPTABS
diff --git a/gcc/config/sparc/vxsparc64.h b/gcc/config/sparc/vxsparc64.h
index 5a4cd0c..ecfe25b 100644
--- a/gcc/config/sparc/vxsparc64.h
+++ b/gcc/config/sparc/vxsparc64.h
@@ -19,8 +19,6 @@ 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.  */
 
-/* Specify this in a cover file to provide bi-architecture (32/64) support.  */
-#define SPARC_BI_ARCH
 
 /* Specify what to link with.  */
 /* VxWorks does all the library stuff itself.  */
@@ -90,6 +88,5 @@ Boston, MA 02111-1307, USA.  */
 #define WCHAR_TYPE_SIZE 8
 
 /* US Software GOFAST library support.  */
-#include "gofast.h"
 #undef INIT_SUBTARGET_OPTABS
 #define INIT_SUBTARGET_OPTABS INIT_GOFAST_OPTABS
diff --git a/gcc/config/svr3.h b/gcc/config/svr3.h
index b1b9ece..3e17c65 100644
--- a/gcc/config/svr3.h
+++ b/gcc/config/svr3.h
@@ -119,6 +119,7 @@ Boston, MA 02111-1307, USA.
 
 /* Output #ident as a .ident.  */
 
+#undef  ASM_OUTPUT_IDENT
 #define ASM_OUTPUT_IDENT(FILE, NAME) \
   fprintf (FILE, "\t.ident \"%s\"\n", NAME);
 
@@ -301,6 +302,7 @@ const_section ()							\
    or a constant of some sort.  RELOC indicates whether forming
    the initial value of DECL requires link-time relocations.  */
 
+#undef  SELECT_SECTION
 #define SELECT_SECTION(DECL,RELOC,ALIGN)				\
 {									\
   if (TREE_CODE (DECL) == STRING_CST)					\
@@ -331,4 +333,5 @@ const_section ()							\
    in the case of a `const_int' rtx.  Currently, these always
    go into the const section.  */
 
+#undef  SELECT_RTX_SECTION
 #define SELECT_RTX_SECTION(MODE,RTX,ALIGN) const_section()