config.gcc (powerpc-*-beos*): Include ${tm_file} and rs6000/aix.h.

	2001-01-09  Franz Sirl  <Franz.Sirl-kernel@lauterbach.com>

	* config.gcc (powerpc-*-beos*): Include ${tm_file} and rs6000/aix.h.
	(rs6000-ibm-aix3.[01]*): Likewise.
	(rs6000-ibm-aix3.2.[456789]*, powerpc-ibm-aix3.2.[456789]*): Likewise.
	(rs6000-ibm-aix4.[12]*, powerpc-ibm-aix4.[12]*): Likewise.
	(rs6000-ibm-aix4.[3456789]*, powerpc-ibm-aix4.[3456789]*): Likewise.
	(rs6000-ibm-aix[56789].*, powerpc-ibm-aix[56789].*): Likewise.
	(powerpc-*-sysv*): Include {tm_file}. svr4.h and rs6000/sysv4.h.
	(powerpc-*-eabiaix*): Likewise.
	(powerpc-*-eabisim*): Likewise.
	(powerpc-*-elf*): Likewise.
	(powerpc-*-eabi*): Likewise.
	(powerpc-*-rtems*): Likewise.
	(powerpc-*-linux*libc1): Likewise.
	(powerpc-*-linux*): Likewise.
	(powerpc-wrs-vxworks*): Likewise.
	(powerpcle-wrs-vxworks*): Likewise.
	(powerpcle-*-sysv*): Likewise.
	(powerpcle-*-elf*): Likewise.
	(powerpcle-*-eabisim*): Likewise.
	(powerpcle-*-eabi*): Likewise.
	(powerpcle-*-solaris2*): Likewise.
	* config/rs6000/aix31.h: Delete includes.
	* config/rs6000/aix3newas.h: Likewise.
	* config/rs6000/aix41.h: Likewise.
	* config/rs6000/aix43.h: Likewise.
	* config/rs6000/beos.h: Likewise.
	* config/rs6000/rtems.h: Likewise.
	* config/rs6000/sysv4.h: Likewise.

From-SVN: r38841

9 files changed, 60 insertions, 51 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4ded428..1f32906 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,34 @@
+2001-01-09  Franz Sirl  <Franz.Sirl-kernel@lauterbach.com>
+
+	* config.gcc (powerpc-*-beos*): Include ${tm_file} and rs6000/aix.h.
+	(rs6000-ibm-aix3.[01]*): Likewise.
+	(rs6000-ibm-aix3.2.[456789]*, powerpc-ibm-aix3.2.[456789]*): Likewise.
+	(rs6000-ibm-aix4.[12]*, powerpc-ibm-aix4.[12]*): Likewise.
+	(rs6000-ibm-aix4.[3456789]*, powerpc-ibm-aix4.[3456789]*): Likewise.
+	(rs6000-ibm-aix[56789].*, powerpc-ibm-aix[56789].*): Likewise.
+	(powerpc-*-sysv*): Include {tm_file}. svr4.h and rs6000/sysv4.h.
+	(powerpc-*-eabiaix*): Likewise.
+	(powerpc-*-eabisim*): Likewise.
+	(powerpc-*-elf*): Likewise.
+	(powerpc-*-eabi*): Likewise.
+	(powerpc-*-rtems*): Likewise.
+	(powerpc-*-linux*libc1): Likewise.
+	(powerpc-*-linux*): Likewise.
+	(powerpc-wrs-vxworks*): Likewise.
+	(powerpcle-wrs-vxworks*): Likewise.
+	(powerpcle-*-sysv*): Likewise.
+	(powerpcle-*-elf*): Likewise.
+	(powerpcle-*-eabisim*): Likewise.
+	(powerpcle-*-eabi*): Likewise.
+	(powerpcle-*-solaris2*): Likewise.
+	* config/rs6000/aix31.h: Delete includes.
+	* config/rs6000/aix3newas.h: Likewise.
+	* config/rs6000/aix41.h: Likewise.
+	* config/rs6000/aix43.h: Likewise.
+	* config/rs6000/beos.h: Likewise.
+	* config/rs6000/rtems.h: Likewise.
+	* config/rs6000/sysv4.h: Likewise.
+
 2001-01-09  Kazu Hirata  <kazu@hxi.com>
 
 	* config/h8300/h8300.c (get_shift_alg): Remove an argument cpu.
diff --git a/gcc/config.gcc b/gcc/config.gcc
index e2b3072..5f47b24 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -2720,7 +2720,7 @@ powerpc-*-openbsd*)
 	;;
 powerpc-*-beos*)
 	cpu_type=rs6000
-	tm_file=rs6000/beos.h
+	tm_file="${tm_file} rs6000/aix.h rs6000/beos.h"
 	xm_file=rs6000/xm-beos.h
 	tmake_file=rs6000/t-beos
 	xmake_file=rs6000/x-beos
@@ -2730,7 +2730,7 @@ powerpc-*-darwin*)
 	xmake_file=rs6000/x-darwin
 	;;
 powerpc-*-sysv*)
-	tm_file=rs6000/sysv4.h
+	tm_file="${tm_file} svr4.h rs6000/sysv4.h"
 	xm_file="rs6000/xm-sysv4.h"
 	xm_defines="USG POSIX"
 	extra_headers=ppc-asm.h
@@ -2738,27 +2738,27 @@ powerpc-*-sysv*)
 	xmake_file=rs6000/x-sysv4
 	;;
 powerpc-*-eabiaix*)
-	tm_file="rs6000/sysv4.h rs6000/eabi.h rs6000/eabiaix.h"
+	tm_file="${tm_file} 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*)
-	tm_file="rs6000/sysv4.h rs6000/eabi.h rs6000/eabisim.h"
+	tm_file="${tm_file} 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*)
-	tm_file="rs6000/sysv4.h"
+	tm_file="${tm_file} svr4.h rs6000/sysv4.h"
 	tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
 	extra_headers=ppc-asm.h
 	;;
 powerpc-*-eabi*)
-	tm_file="rs6000/sysv4.h rs6000/eabi.h"
+	tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/eabi.h"
 	tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
 	extra_headers=ppc-asm.h
 	;;
 powerpc-*-rtems*)
-	tm_file="rs6000/sysv4.h rs6000/eabi.h rs6000/rtems.h"
+	tm_file="${tm_file} 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
@@ -2766,7 +2766,7 @@ powerpc-*-rtems*)
 	fi
 	;;
 powerpc-*-linux*libc1)
-	tm_file="rs6000/sysv4.h rs6000/linux.h"
+	tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/linux.h"
 	xm_file=rs6000/xm-sysv4.h
 	out_file=rs6000/rs6000.c
 	tmake_file="rs6000/t-ppcos t-linux t-linux-gnulibc1 rs6000/t-ppccomm"
@@ -2777,7 +2777,7 @@ powerpc-*-linux*libc1)
 	fi
 	;;
 powerpc-*-linux*)
-	tm_file="rs6000/sysv4.h rs6000/linux.h"
+	tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/linux.h"
 	xm_file="rs6000/xm-sysv4.h"
 	xm_defines="USG ${xm_defines}"
 	out_file=rs6000/rs6000.c
@@ -2792,7 +2792,7 @@ powerpc-wrs-vxworks*)
         cpu_type=rs6000
 	xm_file="rs6000/xm-sysv4.h"
 	xm_defines="USG POSIX"
-        tm_file="rs6000/sysv4.h rs6000/vxppc.h"
+        tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/vxppc.h"
         tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
 	extra_headers=ppc-asm.h
 	thread_file='vxworks'
@@ -2801,13 +2801,13 @@ powerpcle-wrs-vxworks*)
         cpu_type=rs6000
 	xm_file="rs6000/xm-sysv4.h"
 	xm_defines="USG POSIX"
-        tm_file="rs6000/sysv4.h rs6000/sysv4le.h rs6000/vxppc.h"
+        tm_file="${tm_file} 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="rs6000/sysv4.h rs6000/sysv4le.h"
+	tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/sysv4le.h"
 	xm_file="rs6000/xm-sysv4.h"
 	xm_defines="USG POSIX"
 	tmake_file="rs6000/t-ppcos rs6000/t-ppccomm"
@@ -2815,22 +2815,22 @@ powerpcle-*-sysv*)
 	extra_headers=ppc-asm.h
 	;;
 powerpcle-*-elf*)
-	tm_file="rs6000/sysv4.h rs6000/sysv4le.h"
+	tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/sysv4le.h"
 	tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
 	extra_headers=ppc-asm.h
 	;;
 powerpcle-*-eabisim*)
-	tm_file="rs6000/sysv4.h rs6000/sysv4le.h rs6000/eabi.h rs6000/eabisim.h"
+	tm_file="${tm_file} 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*)
-	tm_file="rs6000/sysv4.h rs6000/sysv4le.h rs6000/eabi.h"
+	tm_file="${tm_file} 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="rs6000/sysv4.h rs6000/sysv4le.h rs6000/sol2.h"
+	tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/sysv4le.h rs6000/sol2.h"
 	xm_file="rs6000/xm-sysv4.h"
 	xm_defines="USG POSIX"
 	tmake_file="rs6000/t-ppcos rs6000/t-ppccomm"
@@ -2838,13 +2838,13 @@ powerpcle-*-solaris2*)
 	extra_headers=ppc-asm.h
 	;;
 rs6000-ibm-aix3.[01]*)
-	tm_file=rs6000/aix31.h
+	tm_file="${tm_file} rs6000/aix.h rs6000/aix31.h"
 	xmake_file=rs6000/x-aix31
 	float_format=none
 	use_collect2=yes
 	;;
 rs6000-ibm-aix3.2.[456789]* | powerpc-ibm-aix3.2.[456789]*)
-	tm_file=rs6000/aix3newas.h
+	tm_file="${tm_file} rs6000/aix.h rs6000/aix3newas.h"
 	if test x$host != x$target
 	then
 		tmake_file=rs6000/t-xnewas
@@ -2855,7 +2855,7 @@ rs6000-ibm-aix3.2.[456789]* | powerpc-ibm-aix3.2.[456789]*)
 	use_collect2=yes
 	;;
 rs6000-ibm-aix4.[12]* | powerpc-ibm-aix4.[12]*)
-	tm_file=rs6000/aix41.h
+	tm_file="${tm_file} rs6000/aix.h rs6000/aix41.h"
 	if test x$host != x$target
 	then
 		tmake_file=rs6000/t-xnewas
@@ -2873,7 +2873,7 @@ rs6000-ibm-aix4.[12]* | powerpc-ibm-aix4.[12]*)
 	use_collect2=yes
 	;;
 rs6000-ibm-aix4.[3456789]* | powerpc-ibm-aix4.[3456789]*)
-	tm_file=rs6000/aix43.h
+	tm_file="${tm_file} rs6000/aix.h rs6000/aix43.h"
 	tmake_file=rs6000/t-aix43
 	xmake_file=rs6000/x-aix41
 	float_format=none
@@ -2881,7 +2881,7 @@ rs6000-ibm-aix4.[3456789]* | powerpc-ibm-aix4.[3456789]*)
 	thread_file='aix'
 	;;
 rs6000-ibm-aix[56789].* | powerpc-ibm-aix[56789].*)
-	tm_file=rs6000/aix43.h
+	tm_file="${tm_file} rs6000/aix.h rs6000/aix43.h"
 	tmake_file=rs6000/t-aix43
 	xmake_file=rs6000/x-aix41
 	float_format=none
diff --git a/gcc/config/rs6000/aix31.h b/gcc/config/rs6000/aix31.h
index fd6a15c0..1156b1e 100644
--- a/gcc/config/rs6000/aix31.h
+++ b/gcc/config/rs6000/aix31.h
@@ -1,6 +1,6 @@
 /* Definitions of target machine for GNU compiler,
    for IBM RS/6000 running AIX version 3.1.
-   Copyright (C) 1993,1997, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1993,1997, 2000, 2001 Free Software Foundation, Inc.
    Contributed by Richard Kenner (kenner@nyu.edu)
 
 This file is part of GNU CC.
@@ -21,9 +21,6 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 
-#include "rs6000/rs6000.h"
-#include "rs6000/aix.h"
-
 /* Output something to declare an external symbol to the assembler.  Most
    assemblers don't need this.
 
diff --git a/gcc/config/rs6000/aix3newas.h b/gcc/config/rs6000/aix3newas.h
index f2b9386..bc6dc9b 100644
--- a/gcc/config/rs6000/aix3newas.h
+++ b/gcc/config/rs6000/aix3newas.h
@@ -1,6 +1,6 @@
 /* Definitions of target machine for GNU compiler,
    for IBM RS/6000 POWER running AIX version 3.x with the fixed assembler.
-   Copyright (C) 1995, 1996, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 2000, 2001 Free Software Foundation, Inc.
    Contributed by Jason Merrill (jason@cygnus.com).
 
 This file is part of GNU CC.
@@ -21,9 +21,6 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 
-#include "rs6000/rs6000.h"
-#include "rs6000/aix.h"
-
 /* Tell the assembler to assume that all undefined names are external.  */
 
 #undef ASM_SPEC
diff --git a/gcc/config/rs6000/aix41.h b/gcc/config/rs6000/aix41.h
index e21d5de..cae1a85 100644
--- a/gcc/config/rs6000/aix41.h
+++ b/gcc/config/rs6000/aix41.h
@@ -1,6 +1,6 @@
 /* Definitions of target machine for GNU compiler,
    for IBM RS/6000 POWER running AIX version 4.1.
-   Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000
+   Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
    Free Software Foundation, Inc.
    Contributed by David Edelsohn (edelsohn@gnu.org).
 
@@ -22,9 +22,6 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 
-#include "rs6000/rs6000.h"
-#include "rs6000/aix.h"
-
 #undef  SUBSUBTARGET_SWITCHES
 #define SUBSUBTARGET_SWITCHES		\
   {"pe",		0,					\
diff --git a/gcc/config/rs6000/aix43.h b/gcc/config/rs6000/aix43.h
index 7ce1549..861bc45 100644
--- a/gcc/config/rs6000/aix43.h
+++ b/gcc/config/rs6000/aix43.h
@@ -1,6 +1,6 @@
 /* Definitions of target machine for GNU compiler,
    for IBM RS/6000 POWER running AIX version 4.3.
-   Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
    Contributed by David Edelsohn (edelsohn@gnu.org).
 
 This file is part of GNU CC.
@@ -21,9 +21,6 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 
-#include "rs6000/rs6000.h"
-#include "rs6000/aix.h"
-
 /* AIX 4.3 and above support 64-bit executables.  */
 #undef  SUBSUBTARGET_SWITCHES
 #define SUBSUBTARGET_SWITCHES					\
diff --git a/gcc/config/rs6000/beos.h b/gcc/config/rs6000/beos.h
index b2ddfb7..073554b 100644
--- a/gcc/config/rs6000/beos.h
+++ b/gcc/config/rs6000/beos.h
@@ -1,5 +1,5 @@
 /* Definitions of target machine for GNU compiler, for BeOS.
-   Copyright (C) 1997, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2000, 2001 Free Software Foundation, Inc.
    Contributed by Fred Fish (fnf@cygnus.com), based on aix41.h
    from David Edelsohn (edelsohn@npac.syr.edu).
 
@@ -21,9 +21,6 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 
-#include "rs6000/rs6000.h"
-#include "rs6000/aix.h"
-
 /* Enable AIX XL compiler calling convention breakage compatibility.  */
 #define MASK_XL_CALL		0x40000000
 #define	TARGET_XL_CALL		(target_flags & MASK_XL_CALL)
diff --git a/gcc/config/rs6000/rtems.h b/gcc/config/rs6000/rtems.h
index f28addc..6810d38 100644
--- a/gcc/config/rs6000/rtems.h
+++ b/gcc/config/rs6000/rtems.h
@@ -1,5 +1,5 @@
 /* Definitions for rtems targeting a PowerPC using elf.
-   Copyright (C) 1996, 1997, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
    Contributed by Joel Sherrill (joel@OARcorp.com).
 
 This file is part of GNU CC.
@@ -32,6 +32,3 @@ Boston, MA 02111-1307, USA.  */
 
 #undef STARTFILE_DEFAULT_SPEC
 #define STARTFILE_DEFAULT_SPEC "crt0.o%s"
-
-/* Get machine-independent configuration parameters for RTEMS.  */
-#include <rtems.h>
diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
index 3172d99..8b2f59f 100644
--- a/gcc/config/rs6000/sysv4.h
+++ b/gcc/config/rs6000/sysv4.h
@@ -1,5 +1,6 @@
 /* Target definitions for GNU compiler for PowerPC running System V.4
-   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001
+   Free Software Foundation, Inc.
    Contributed by Cygnus Support.
 
 This file is part of GNU CC.
@@ -19,11 +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.  */
 
-#include "rs6000/rs6000.h"
-
-/* Use the regular svr4 definitions.  */
-
-#include "svr4.h"
 
 /* Yes!  We are ELF.  */
 #define	TARGET_OBJECT_FORMAT OBJECT_ELF