t-ppccomm (EXTRA_MULTILIB_PARTS): Add crtbegin, crtend.

* config/rs6000/t-ppccomm (EXTRA_MULTILIB_PARTS): Add crtbegin,
crtend.
(CRTSTUFF_T_CFLAGS_S): Delete definition.
* config/rs6000/sysv4.h (STARTFILE_LINUX_SPEC): Always use crtbegin.
(ENDFILE_LINUX_SPEC): Always use crtend.
* configure.in (powerpc-*-linux-gnulibc1): Don't define extra_parts.
(powerpc-*-linux-gnu): Likewise.
* configure: Regenerate.

* config/rs6000/eabi.h:	Don't include sysv4.h.
(MULTILIB_DEFAULTS): Don't define.
* config/rs6000/eabiaix.h: Don't include eabi.h.
* config/rs6000/eabile.h: Delete.
* config/rs6000/eabilesim.h: Delete.
* config/rs6000/eabisim.h: Don't include eabi.h.
* config/rs6000/linux.h: Don't include sysv4.h.
(JUMP_TABLES_IN_TEXT_SECTION): Don't redefine.
(MULTILIB_DEFAULTS): Don't redefine.
* config/rs6000/rtems.h: Don't include eabi.h.
* config/rs6000/sol2.h: Don't include sysv4le.h.
* config/rs6000/sysv4le.h: Don't include sysv4.h.
* config/rs6000/t-ppc: Delete.
* config/rs6000/t-ppcgas: Correct comment.
* config/rs6000/t-ppcos: Correct comment.  Don't build
multilibs for -fPIC, rather use -fPIC -mstrict-align
as default.
* config/rs6000/t-ppc: Delete.
* config/rs6000/vxppc.h: Don't include sysv4.h.
* config/rs6000/vxppcle.h: Delete.
* configure.in: Use multiple header files for p2pc ELF targets
powerpc-eabiaix, powerpc-eabisim, powerpc-rtems, powerpcle-eabi,
powerpcle-eabisim, powerpc-elf, powerpcle-elf, powerpc-linux-gnu,
powerpc-linux-gnulibc1, powerpc-sysv, powerpcle-sysv,
powerpc-vxworks, powerpcle-vxworks.  Assume GAS functionality is
always available for these platforms.

From-SVN: r32918

gcc/ChangeLog

+2000-04-04  Geoff Keating  <geoffk@cygnus.com>
+
+	* config/rs6000/t-ppccomm (EXTRA_MULTILIB_PARTS): Add crtbegin,
+	crtend.
+	(CRTSTUFF_T_CFLAGS_S): Delete definition.
+	* config/rs6000/sysv4.h (STARTFILE_LINUX_SPEC): Always use crtbegin.
+	(ENDFILE_LINUX_SPEC): Always use crtend.
+	* configure.in (powerpc-*-linux-gnulibc1): Don't define extra_parts.
+	(powerpc-*-linux-gnu): Likewise.
+	* configure: Regenerate.
+
+	* config/rs6000/eabi.h:	Don't include sysv4.h.
+	(MULTILIB_DEFAULTS): Don't define.
+	* config/rs6000/eabiaix.h: Don't include eabi.h.
+	* config/rs6000/eabile.h: Delete.
+	* config/rs6000/eabilesim.h: Delete.
+	* config/rs6000/eabisim.h: Don't include eabi.h.
+	* config/rs6000/linux.h: Don't include sysv4.h.
+	(JUMP_TABLES_IN_TEXT_SECTION): Don't redefine.
+	(MULTILIB_DEFAULTS): Don't redefine.
+	* config/rs6000/rtems.h: Don't include eabi.h.
+	* config/rs6000/sol2.h: Don't include sysv4le.h.
+	* config/rs6000/sysv4le.h: Don't include sysv4.h.
+	* config/rs6000/t-ppc: Delete.
+	* config/rs6000/t-ppcgas: Correct comment.
+	* config/rs6000/t-ppcos: Correct comment.  Don't build 
+	multilibs for -fPIC, rather use -fPIC -mstrict-align 
+	as default.
+	* config/rs6000/t-ppc: Delete.
+	* config/rs6000/vxppc.h: Don't include sysv4.h.
+	* config/rs6000/vxppcle.h: Delete.
+	* configure.in: Use multiple header files for p2pc ELF targets
+	powerpc-eabiaix, powerpc-eabisim, powerpc-rtems, powerpcle-eabi,
+	powerpcle-eabisim, powerpc-elf, powerpcle-elf, powerpc-linux-gnu,
+	powerpc-linux-gnulibc1, powerpc-sysv, powerpcle-sysv,
+	powerpc-vxworks, powerpcle-vxworks.  Assume GAS functionality is
+	always available for these platforms.
+
 2000-04-04  Richard Henderson  <rth@cygnus.com>
 
 	* calls.c (try_to_integrate): Initialize reg_parm_stack_space.

gcc/config/rs6000/eabi.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.  */
 
-#include "rs6000/sysv4.h"
-
 /* Add -meabi to target flags */
 #undef TARGET_DEFAULT
 #define TARGET_DEFAULT (MASK_POWERPC | MASK_NEW_MNEMONICS | MASK_EABI)
@@ -36,6 +34,3 @@ Boston, MA 02111-1307, USA.  */
 #undef CPP_PREDEFINES
 #define CPP_PREDEFINES \
   "-DPPC -D__embedded__ -Asystem(embedded) -Acpu(powerpc) -Amachine(powerpc)"
-
-#undef	MULTILIB_DEFAULTS
-#define	MULTILIB_DEFAULTS { "mbig", "mcall-sysv" }

gcc/config/rs6000/eabiaix.h

 /* Embedded ELF system support, using old AIX based calling sequence.
-   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 2000 Free Software Foundation, Inc.
    Contributed by Cygnus Support.
 
 This file is part of GNU CC.
@@ -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 "rs6000/eabi.h"
-
 /* Default ABI to use */
 #undef	RS6000_ABI_NAME
 #define RS6000_ABI_NAME "aix"

gcc/config/rs6000/eabile.h

-/* Core target definitions for GNU compiler for PowerPC targeted to
-   little endian embedded ELF systems.
-   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
-   Contributed by Cygnus Support.
-
-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.  */
-
-#include "rs6000/eabi.h"
-
-#undef TARGET_DEFAULT
-#define TARGET_DEFAULT (MASK_POWERPC | MASK_NEW_MNEMONICS | MASK_LITTLE_ENDIAN | MASK_EABI)
-
-#undef	CPP_ENDIAN_DEFAULT_SPEC
-#define	CPP_ENDIAN_DEFAULT_SPEC "%(cpp_endian_little)"
-
-#undef	CC1_ENDIAN_DEFAULT_SPEC
-#define	CC1_ENDIAN_DEFAULT_SPEC "%(cc1_endian_little)"
-
-#undef	LINK_TARGET_SPEC
-#define	LINK_TARGET_SPEC "\
-%{mbig: -oformat elf32-powerpc } %{mbig-endian: -oformat elf32-powerpc } \
-%{!mlittle: %{!mlittle-endian: %{!mbig: %{!mbig-endian: %{mcall-linux: -oformat elf32-powerpc}}}}}"
-
-/* Define this macro as a C expression for the initializer of an
-   array of string to tell the driver program which options are
-   defaults for this target and thus do not need to be handled
-   specially when using `MULTILIB_OPTIONS'.
-
-   Do not define this macro if `MULTILIB_OPTIONS' is not defined in
-   the target makefile fragment or if none of the options listed in
-   `MULTILIB_OPTIONS' are set by default.  *Note Target Fragment::.  */
-
-#undef	MULTILIB_DEFAULTS
-#define	MULTILIB_DEFAULTS { "mlittle", "mcall-sysv" }

gcc/config/rs6000/eabilesim.h

-/* Support for GCC on simulated PowerPC systems targeted to embedded ELF
-   systems.
-   Copyright (C) 1995 Free Software Foundation, Inc.
-   Contributed by Cygnus Support.
-
-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.  */
-
-#include "rs6000/eabile.h"
-
-#undef TARGET_VERSION
-#define TARGET_VERSION fprintf (stderr, " (PowerPC Simulated)");
-
-#undef CPP_PREDEFINES
-#define CPP_PREDEFINES \
-  "-DPPC -D__embedded__ -D__simulator__ -Asystem(embedded) -Asystem(simulator) -Acpu(powerpc) -Amachine(powerpc)"
-
-/* Make the simulator the default */
-#undef	LIB_DEFAULT_SPEC
-#define LIB_DEFAULT_SPEC "%(lib_sim)"
-
-#undef	STARTFILE_DEFAULT_SPEC
-#define STARTFILE_DEFAULT_SPEC "%(startfile_sim)"
-
-#undef	ENDFILE_DEFAULT_SPEC
-#define ENDFILE_DEFAULT_SPEC "%(endfile_sim)"
-
-#undef	LINK_START_DEFAULT_SPEC
-#define LINK_START_DEFAULT_SPEC "%(link_start_sim)"
-
-#undef	LINK_OS_DEFAULT_SPEC
-#define LINK_OS_DEFAULT_SPEC "%(link_start_sim)"

gcc/config/rs6000/eabisim.h

 /* Support for GCC on simulated PowerPC systems targeted to embedded ELF
    systems.
-   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 2000 Free Software Foundation, Inc.
    Contributed by Cygnus Support.
 
 This file is part of GNU CC.
@@ -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.  */
 
-#include "rs6000/eabi.h"
-
 #undef TARGET_VERSION
 #define TARGET_VERSION fprintf (stderr, " (PowerPC Simulated)");
 

gcc/config/rs6000/linux.h

 /* Definitions of target machine for GNU compiler,
    for IBM RS/6000 running AIX version 3.1.
-   Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
    Contributed by Michael Meissner (meissner@cygnus.com).
 
 This file is part of GNU CC.
@@ -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.  */
 
-#include "rs6000/sysv4.h"
-
 /* Don't assume anything about the header files. */
 #define NO_IMPLICIT_EXTERN_C
 
@@ -55,22 +53,7 @@ Boston, MA 02111-1307, USA.  */
 #undef TARGET_VERSION
 #define TARGET_VERSION fprintf (stderr, " (PowerPC GNU/Linux)");
 
-/* Define this macro as a C expression for the initializer of an
-   array of string to tell the driver program which options are
-   defaults for this target and thus do not need to be handled
-   specially when using `MULTILIB_OPTIONS'.
-
-   Do not define this macro if `MULTILIB_OPTIONS' is not defined in
-   the target makefile fragment or if none of the options listed in
-   `MULTILIB_OPTIONS' are set by default.  *Note Target Fragment::.  */
-
-#undef	MULTILIB_DEFAULTS
-#define	MULTILIB_DEFAULTS { "mbig", "mcall-linux" }
-
 #undef DEFAULT_VTABLE_THUNKS
 #ifndef USE_GNULIBC_1
 #define DEFAULT_VTABLE_THUNKS 1
 #endif
-
-#undef JUMP_TABLES_IN_TEXT_SECTION
-#define JUMP_TABLES_IN_TEXT_SECTION 0

gcc/config/rs6000/rtems.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 "rs6000/eabi.h"
-
 /* Specify predefined symbols in preprocessor.  */
 
 #undef CPP_PREDEFINES

gcc/config/rs6000/sol2.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.  */
 
-#include "rs6000/sysv4le.h"
-
 /* Default ABI to use */
 #undef	RS6000_ABI_NAME
 #define RS6000_ABI_NAME "solaris"

gcc/config/rs6000/sysv4.h

@@ -1293,12 +1293,12 @@ do {									\
 
 #define	STARTFILE_LINUX_SPEC "\
 %{!shared: %{pg:gcrt1.o%s} %{!pg:%{p:gcrt1.o%s} %{!p:crt1.o%s}}} \
-%{mnewlib: ecrti.o%s} \
-%{!mnewlib: crti.o%s %{!shared:crtbegin.o%s} %{shared:crtbeginS.o%s}}"
+%{mnewlib: ecrti.o%s} %{!mnewlib: crti.o%s} \
+crtbegin.o%s"
 
-#define	ENDFILE_LINUX_SPEC "\
+#define	ENDFILE_LINUX_SPEC "crtend.o%s \
 %{mnewlib: ecrtn.o%s} \
-%{!mnewlib: %{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s}"
+%{!mnewlib: crtn.o%s}"
 
 #define LINK_START_LINUX_SPEC "-Ttext 0x400074"
 

gcc/config/rs6000/sysv4le.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.  */
 
-#include "rs6000/sysv4.h"
-
 #undef TARGET_DEFAULT
 #define TARGET_DEFAULT (MASK_POWERPC | MASK_NEW_MNEMONICS | MASK_LITTLE_ENDIAN)
 

gcc/config/rs6000/t-ppc

-# PowerPC support without gas
-
-# Build libgcc.a with different options.  If no gas support, don't build
-# explicit little endian or big endian libraries, since it depends on the
-# -mbig/-mlittle switches passed to gas.  The -mrelocatable support also needs
-# -mrelocatable passed to gas, so don't use it either.
-
-MULTILIB_OPTIONS	= msoft-float
-MULTILIB_DIRNAMES	= nof
-MULTILIB_EXCEPTIONS	=
-MULTILIB_EXTRA_OPTS	= mstrict-align
-MULTILIB_MATCHES	= ${MULTILIB_MATCHES_FLOAT}

gcc/config/rs6000/t-ppccomm

-# Common support for PowerPC eabi, System V targets.
+# Common support for PowerPC ELF targets (both EABI and SVR4).
 
 # Do not build libgcc1.
 LIBGCC1 =
@@ -43,7 +43,8 @@ MULTILIB_MATCHES_SYSV	= mcall-sysv=mcall-sysv-eabi mcall-sysv=mcall-sysv-noeabi
 
 LIBGCC = stmp-multilib
 INSTALL_LIBGCC = install-multilib
-EXTRA_MULTILIB_PARTS = ecrti$(objext) ecrtn$(objext) scrt0$(objext) scrti$(objext) scrtn$(objext)
+EXTRA_MULTILIB_PARTS = crtbegin$(objext) crtend$(objext) \
+  ecrti$(objext) ecrtn$(objext) scrt0$(objext) scrti$(objext) scrtn$(objext)
 
 # We build {e,s}crti.o, {e,s}crtn.o, and scrt0.o which serve to add begin and
 # end labels to all of the special sections used when we link using gcc.
@@ -82,4 +83,4 @@ $(T)scrt0$(objext): scrt0.c
 
 # It is important that crtbegin.o, etc., aren't surprised by stuff in .sdata.
 CRTSTUFF_T_CFLAGS = -msdata=none
-CRTSTUFF_T_CFLAGS_S = -fpic -msdata=none
+

gcc/config/rs6000/t-ppcgas

-# PowerPC embedded support with gas.
-# Build libgcc.a with different options.
+# Multilibs for powerpc embedded ELF targets.
 
 MULTILIB_OPTIONS	= msoft-float \
 			  mlittle/mbig \

gcc/config/rs6000/t-ppcos

-# Target config file for a System V based system (Solaris, GNU/Linux, Netbsd)
-# with gas.
+# Multilibs for a powerpc hosted ELF target (linux, SVR4, solaris)
 
-# Build libgcc.a with different options.  With gas, build pic libraries
-# as well no floating point
-MULTILIB_OPTIONS	= msoft-float fPIC
-MULTILIB_DIRNAMES	= nof pic
-MULTILIB_EXCEPTIONS	=
-MULTILIB_MATCHES	= ${MULTILIB_MATCHES_FLOAT} \
-			  fPIC=mrelocatable-lib \
-			  fPIC=mrelocatable \
-			  fPIC=fpic
+MULTILIB_OPTIONS	= msoft-float
+MULTILIB_DIRNAMES	= nof
+MULTILIB_EXTRA_OPTS	= fPIC mstrict-align
+MULTILIB_EXCEPTIONS	= 
+
+MULTILIB_MATCHES	= ${MULTILIB_MATCHES_FLOAT}

gcc/config/rs6000/vxppc.h

@@ -20,8 +20,6 @@ Boston, MA 02111-1307, USA.  */
 
 /* This file just exists to give specs for the PowerPC running on VxWorks.  */
 
-#include "rs6000/sysv4.h"
-
 /* Reset defaults */
 #undef	CPP_OS_DEFAULT_SPEC
 #define CPP_OS_DEFAULT_SPEC "%(cpp_os_vxworks)"

gcc/config/rs6000/vxppcle.h

-/* Definitions of target machine for GNU compiler.  Vxworks PowerPC version.
-   Copyright (C) 1996, 1998 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.  */
-
-/* This file just exists to give specs for the PowerPC running on VxWorks.  */
-
-#include "rs6000/sysv4le.h"
-
-/* Reset defaults */
-#undef	CPP_OS_DEFAULT_SPEC
-#define CPP_OS_DEFAULT_SPEC "%(cpp_os_vxworks)"
-
-#undef	LIB_DEFAULT_SPEC
-#define LIB_DEFAULT_SPEC "%(lib_vxworks)"
-
-#undef	STARTFILE_DEFAULT_SPEC
-#define STARTFILE_DEFAULT_SPEC "%(startfile_vxworks)"
-
-#undef	ENDFILE_DEFAULT_SPEC
-#define ENDFILE_DEFAULT_SPEC "%(endfile_vxworks)"
-
-#undef	LINK_START_DEFAULT_SPEC
-#define LINK_START_DEFAULT_SPEC "%(link_start_vxworks)"
-
-#undef	LINK_OS_DEFAULT_SPEC
-#define LINK_OS_DEFAULT_SPEC "%(link_os_vxworks)"
-
-#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "\
--D__vxworks -D__vxworks__ -Asystem(vxworks) -Asystem(embedded) \
--Acpu(powerpc) -Amachine(powerpc)"
-
-/* Don't define _LITTLE_ENDIAN or _BIG_ENDIAN */
-#undef	CPP_ENDIAN_BIG_SPEC
-#define CPP_ENDIAN_BIG_SPEC "-D__BIG_ENDIAN__ -Amachine(bigendian)"
-
-#undef	CPP_ENDIAN_LITTLE_SPEC
-#define CPP_ENDIAN_LITTLE_SPEC "-D__LITTLE_ENDIAN__ -Amachine(littleendian)"
-
-/* We use stabs-in-elf for debugging */
-#undef PREFERRED_DEBUGGING_TYPE
-#define PREFERRED_DEBUGGING_TYPE DBX_DEBUG

gcc/configure.in

@@ -2992,79 +2992,57 @@ changequote([,])dnl
 		tmake_file=rs6000/t-beos
 		xmake_file=rs6000/x-beos
 		;;
-	powerpc-*-sysv* | powerpc-*-elf*)
+	powerpc-*-sysv*)
 		tm_file=rs6000/sysv4.h
 		xm_file="rs6000/xm-sysv4.h"
 		xm_defines="USG POSIX"
 		extra_headers=ppc-asm.h
-		if test x$gas = xyes
-		then
-			tmake_file="rs6000/t-ppcos rs6000/t-ppccomm"
-		else
-			tmake_file="rs6000/t-ppc rs6000/t-ppccomm"
-		fi
+		tmake_file="rs6000/t-ppcos rs6000/t-ppccomm"
 		xmake_file=rs6000/x-sysv4
 		;;
 	powerpc-*-eabiaix*)
-		tm_file=rs6000/eabiaix.h
+		tm_file="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/eabisim.h
+		tm_file="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"
 		tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
 		extra_headers=ppc-asm.h
 		;;
 	powerpc-*-eabi*)
-		tm_file=rs6000/eabi.h
-		if test x$gas = xyes
-		then
-			tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
-		else
-			tmake_file="rs6000/t-ppc rs6000/t-ppccomm"
-		fi
+		tm_file="rs6000/sysv4.h rs6000/eabi.h"
+		tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
 		extra_headers=ppc-asm.h
 		;;
 	powerpc-*-rtems*)
-		tm_file=rs6000/rtems.h
-		if test x$gas = xyes
-		then
-		     tmake_file="rs6000/t-ppcgas t-rtems rs6000/t-ppccomm"
-		else
-		     tmake_file="rs6000/t-ppc t-rtems rs6000/t-ppccomm"
-		fi
+		tm_file="rs6000/sysv4.h rs6000/eabi.h rs6000/rtems.h"
+		tmake_file="rs6000/t-ppcgas t-rtems rs6000/t-ppccomm"
 		extra_headers=ppc-asm.h
 		;;
 	powerpc-*-linux-gnulibc1)
-		tm_file=rs6000/linux.h
+		tm_file="rs6000/sysv4.h rs6000/linux.h"
 		xm_file=rs6000/xm-sysv4.h
 		out_file=rs6000/rs6000.c
-		if test x$gas = xyes
-		then
-			tmake_file="rs6000/t-ppcos t-linux t-linux-gnulibc1 rs6000/t-ppccomm"
-		else
-			tmake_file="rs6000/t-ppc t-linux t-linux-gnulibc1 rs6000/t-ppccomm"
-		fi
+		tmake_file="rs6000/t-ppcos t-linux t-linux-gnulibc1 rs6000/t-ppccomm"
 		xmake_file=x-linux
-		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 		extra_headers=ppc-asm.h
 		if test x$enable_threads = xyes; then
 			thread_file='posix'
 		fi
 		;;
 	powerpc-*-linux-gnu*)
-		tm_file=rs6000/linux.h
+		tm_file="rs6000/sysv4.h rs6000/linux.h"
 		xm_file="rs6000/xm-sysv4.h"
 		xm_defines="USG ${xm_defines}"
 		out_file=rs6000/rs6000.c
-		if test x$gas = xyes
-		then
-			tmake_file="rs6000/t-ppcos t-linux rs6000/t-ppccomm"
-		else
-			tmake_file="rs6000/t-ppc t-linux rs6000/t-ppccomm"
-		fi
+		tmake_file="rs6000/t-ppcos t-linux rs6000/t-ppccomm"
 		xmake_file=x-linux
-		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 		extra_headers=ppc-asm.h
 		if test x$enable_threads = xyes; then
 			thread_file='posix'
@@ -3074,7 +3052,7 @@ changequote([,])dnl
                 cpu_type=rs6000
 		xm_file="rs6000/xm-sysv4.h"
 		xm_defines="USG POSIX"
-                tm_file=rs6000/vxppc.h
+                tm_file="rs6000/sysv4.h rs6000/vxppc.h"
                 tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
 		extra_headers=ppc-asm.h
 		thread_file='vxworks'
@@ -3083,49 +3061,39 @@ changequote([,])dnl
                 cpu_type=rs6000
 		xm_file="rs6000/xm-sysv4.h"
 		xm_defines="USG POSIX"
-                tm_file=rs6000/vxppcle.h
+                tm_file="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* | powerpcle-*-elf*)
-		tm_file=rs6000/sysv4le.h
+	powerpcle-*-sysv*)
+		tm_file="rs6000/sysv4.h rs6000/sysv4le.h"
 		xm_file="rs6000/xm-sysv4.h"
 		xm_defines="USG POSIX"
-		if test x$gas = xyes
-		then
-			tmake_file="rs6000/t-ppcos rs6000/t-ppccomm"
-		else
-			tmake_file="rs6000/t-ppc rs6000/t-ppccomm"
-		fi
+		tmake_file="rs6000/t-ppcos rs6000/t-ppccomm"
 		xmake_file=rs6000/x-sysv4
 		extra_headers=ppc-asm.h
 		;;
+	powerpcle-*-elf*)
+		tm_file="rs6000/sysv4.h rs6000/sysv4le.h"
+		tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
+		extra_headers=ppc-asm.h
+		;;
 	powerpcle-*-eabisim*)
-		tm_file=rs6000/eabilesim.h
+		tm_file="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/eabile.h
-		if test x$gas = xyes
-		then
-			tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
-		else
-			tmake_file="rs6000/t-ppc rs6000/t-ppccomm"
-		fi
+		tm_file="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/sol2.h
+		tm_file="rs6000/sysv4.h rs6000/sysv4le.h rs6000/sol2.h"
 		xm_file="rs6000/xm-sysv4.h"
 		xm_defines="USG POSIX"
-		if test x$gas = xyes
-		then
-			tmake_file="rs6000/t-ppcos rs6000/t-ppccomm"
-		else
-			tmake_file="rs6000/t-ppc rs6000/t-ppccomm"
-		fi
+		tmake_file="rs6000/t-ppcos rs6000/t-ppccomm"
 		xmake_file=rs6000/x-sysv4
 		extra_headers=ppc-asm.h
 		;;