Gcc 3.4.2 20040728.

1 files changed, 1263 insertions, 1499 deletions

diff --git a/contrib/gcc/config.gcc b/contrib/gcc/config.gcc
index e00f913..0946647 100644
--- a/contrib/gcc/config.gcc
+++ b/contrib/gcc/config.gcc
@@ -1,5 +1,6 @@
-# GCC build-, host- and target-specific configuration file.
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+# GCC target-specific configuration file.
+# Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+# Free Software Foundation, Inc.
 
 #This file is part of GCC.
 
@@ -18,15 +19,13 @@
 #Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #02111-1307, USA.
 
-# This is the GCC build-, host- and target-specific configuration file
-# where a configuration type, as recognized and generated by config.bfd,
-# is mapped to different system-specific definitions and files.  This is
-# invoked by the autoconf-generated configure script, called for build,
-# host and target in that order, setting ${machine} to each.  Putting it
-# in a separate shell file lets us skip running autoconf when modifying
-# build-, host- and target-specific information.
+# This is the GCC target-specific configuration file
+# where a configuration type is mapped to different system-specific
+# definitions and files.  This is invoked by the autoconf-generated
+# configure script.  Putting it in a separate shell file lets us skip
+# running autoconf when modifying target-specific information.
 
-# This file switches on the shell variable ${machine}, and also uses the
+# This file switches on the shell variable ${target}, and also uses the
 # following shell variables:
 #
 #  with_*		Various variables as set by configure.
@@ -34,6 +33,11 @@
 #  enable_threads_flag	Either the name, yes or no depending on whether
 #			threads support was requested.
 #
+#  default_use_cxa_atexit
+#			"no" by default, can be set to "yes" if a target
+#			wishes to use __cxa_atexit() by default if the
+#			$enable___cxa_atexit variable is not set.
+#
 #  gas_flag		Either yes or no depending on whether GNU as was
 #			requested.
 #
@@ -43,7 +47,8 @@
 # This file sets the following shell variables for use by the
 # autoconf-generated configure script:
 #
-#  cpu_type		The name of the cpu, if different from machine.
+#  cpu_type		The name of the cpu, if different from the first
+#			chunk of the canonical target name.
 #
 #  tm_defines		List of target macros to define for all compilations.
 #
@@ -79,11 +84,12 @@
 #			the compiler proper (cc1, cc1obj, cc1plus)
 #			depending on target.
 #
+#  extra_gcc_objs	List of extra objects that should be linked into
+#			the compiler driver (gcc) depending on target.
+#
 #  extra_headers	List of used header files from the directory
 #			config/${cpu_type}.
 #
-#  host_xmake_file	List of host-specific makefile-fragments.
-#
 #  extra_passes		List of extra executables compiled for this target
 #			machine, used for compiling from source to object.
 #
@@ -92,12 +98,6 @@
 #
 #  extra_programs	Like extra_passes, but these are used when linking.
 #
-#  host_extra_objs	List of extra host-dependent objects that should
-#			be linked into the compiler proper.
-#
-#  host_extra_gcc_objs	List of extra host-dependent objects that should
-#			be linked into the gcc driver.
-#
 #  c_target_objs	List of extra target-dependent objects that be
 #			linked into the C compiler only.
 #
@@ -106,18 +106,6 @@
 #
 #  target_gtfiles       List of extra source files with type information.
 #
-#  build_xm_defines	List of macros to define when compiling for the
-#			build machine.
-#
-#  build_xm_file	List of files to include when compiling for the
-#			build machine.
-#
-#  host_xm_defines	List of macros to define when compiling for the
-#			host machine.
-#
-#  host_xm_file		List of files to include when compiling for the
-#			host machine.
-#
 #  xm_defines		List of macros to define when compiling for the
 #			target machine.
 #
@@ -129,60 +117,42 @@
 #
 #  target_cpu_default	Set to override the default target model.
 #
-#  build_install_headers_dir
-#			Target to use when installing header files.
-#
-#  host_truncate_target
-#			Non-empty if the target name should be truncated
-#			on this host, due to filename length issues.
-#
 #  gdb_needs_out_file_path
 #			Set to yes if gdb needs a dir command with
 #			`dirname $out_file`.
 #
-#  build_exeext		Set to the suffix, if the build machine requires
-#			executables to have a file name suffix.
-#
-#  host_exeext		Set to the suffix, if the host machine requires
-#			executables to have a file name suffix.
-#
 #  thread_file		Set to control which thread package to use.
 #
 #  gas			Set to yes or no depending on whether the target
 #			system normally uses GNU as.
-
-# The following variables are used in each case-construct to build up the
-# outgoing variables:
-#
-#  xmake_file		Makefile-fragment when this system is as a host,
-#			for host_xmake_file.
 #
-#  extra_host_objs	List of extra objects that should be linked into
-#			the compiler proper when this system is a host,
-#			for host_extra_objs.
+#  need_64bit_hwint	Set to yes if HOST_WIDE_INT must be 64 bits wide
+#			for this target.  This is true iff
+#			MAX_LONG_TYPE_SIZE is 64.  (The code which
+#			determines the underlying integral type for
+#			HOST_WIDE_INT cannot see the definition of
+#			MAX_LONG_TYPE_SIZE.)
 #
-#  install_headers_dir	Makefile-target for how the header file directory
-#			is installed, when this system is a build system,
-#			for build_install_headers_dir.
+#  configure_default_options
+#			Set to an initializer for configure_default_options
+#			in configargs.h, based on --with-cpu et cetera.
 #
-#  truncate_target	Non-empty if the target name should be truncated
-#			when this system is a host, due to filename length
-#			issues.  For host_truncate_target.
-#
-#  exeext		The suffix for executables on this system.
+#  use_fixproto		Set to "yes" if fixproto should be run normally,
+#			"no" if fixproto should never be run.
+
+# The following variables are used in each case-construct to build up the
+# outgoing variables:
 #
 #  gnu_ld		Set to yes or no depending on whether the target
 #			system normally uses GNU ld.
 
 out_file=
-xmake_file=
 tmake_file=
 extra_headers=
 extra_passes=
 extra_parts=
 extra_programs=
 extra_objs=
-extra_host_objs=
 extra_gcc_objs=
 c_target_objs=
 cxx_target_objs=
@@ -192,15 +162,8 @@ xm_defines=
 use_collect2=
 # Set this to override the default target model.
 target_cpu_default=
-# Set this to control how the header file directory is installed.
-install_headers_dir=install-headers-tar
-# Set this if directory names should be truncated to 14 characters.
-truncate_target=
 # Set this if gdb needs a dir command with `dirname $out_file`
 gdb_needs_out_file_path=
-# Set this if the build machine requires executables to have a
-# file name suffix.
-exeext=
 # Set this to control which thread package will be used.
 thread_file=
 # Reinitialize these from the flag values every loop pass, since some
@@ -208,69 +171,39 @@ thread_file=
 gas="$gas_flag"
 gnu_ld="$gnu_ld_flag"
 enable_threads=$enable_threads_flag
+default_use_cxa_atexit=no
 target_gtfiles=
+need_64bit_hwint=
+
+# Default to not using fixproto.  Targets which need fixproto should
+# specifically set this to 'yes'.
+use_fixproto=no
+
+# Don't carry these over build->host->target.  Please.
+xm_file=
+md_file=
 
 # Obsolete configurations.
-case $machine in
-   m88k-*-*			\
- | mn10200-*-*			\
- | romp-*-*			\
- | alpha*-*-interix*		\
- | alpha*-*-linux*libc1*	\
- | alpha*-*-linux*ecoff*	\
- | arm*-*-aout*			\
- | arm*-*-conix*		\
- | arm*-*-oabi			\
- | strongarm-*-coff*		\
- | hppa1.0-*-osf*		\
- | hppa1.0-*-bsd*		\
- | hppa1.[01]-*-hpux[789]*	\
- | hppa*-*-hiux*		\
- | hppa*-*-lites*		\
- | i?86-*-win32			\
- | m68000-hp-bsd*		\
- | m68000-sun-sunos*		\
- | m68000-att-sysv*		\
- | m68k-atari-sysv*		\
- | m68k-motorola-sysv*		\
- | m68k-ncr-sysv*		\
- | m68k-plexus-sysv*		\
- | m68k-tti-*			\
- | m68k-crds-unos*		\
- | m68k-cbm-sysv*		\
- | m68k-ccur-rtu*		\
- | m68k-hp-bsd*			\
- | m68k-sun-mach*		\
- | m68k-sun-sunos*		\
- | m68k-*-linux*aout*		\
- | m68k-*-linux*libc1*		\
- | m68k-*-psos*			\
- | mips*-*-ecoff*		\
- | mips-sni-sysv4		\
- | mips64orion-*-rtems*		\
- | ns32k-*-openbsd*		\
- | powerpc*-*-sysv*		\
- | powerpc*-*-linux*libc1*	\
- | rs6000-ibm-aix[123]*		\
- | rs6000-bull-bosx		\
- | rs6000-*-mach*		\
- | sparc-*-aout*		\
- | sparc-*-netbsd*aout*		\
- | sparc-*-bsd*			\
- | sparc-*-chorusos*		\
- | sparc-*-linux*aout*		\
- | sparc-*-linux*libc1*		\
- | sparc-*-lynxos*		\
- | sparc-hal-solaris2*		\
- | sparc-*-sunos[34]*		\
- | sparclet-*-aout*		\
- | sparclite-*-aout*		\
- | sparc86x-*-aout*		\
- | v850-*-rtems*		\
- | vax-*-vms*			\
- )
+case ${target} in
+ d30v-* | \
+ dsp16xx-* | \
+ i370-* | \
+ i960-* | \
+ i?86-moss-msdos | i?86-*-moss* | \
+ i?86-ncr-sysv4* | \
+ i?86-*-netware | \
+ i?86-*-freebsd2* | i?86-*-freebsd*aout* | \
+ i?86-*-linux*aout* | \
+ i?86-*-linux*libc1* | \
+ i?86-*-interix | \
+ i?86-*-mach* | \
+ i?86-*-udk* | \
+ i?86-*-sysv[123]* | \
+ i386-*-vsta | \
+ m68k-hp-hpux* | m68000-hp-hpux* | \
+ m68k-*-sysv4*)
     if test "x$enable_obsolete" != xyes; then
-      echo "*** Configuration $machine is obsolete." >&2
+      echo "*** Configuration ${target} is obsolete." >&2
       echo "*** Specify --enable-obsolete to build it anyway." >&2
       echo "*** Support will be REMOVED in the next major release of GCC," >&2
       echo "*** unless a maintainer comes forward." >&2
@@ -278,23 +211,60 @@ case $machine in
     fi;;
 esac
 
+# Unsupported targets list.  Do not put an entry in this list unless
+# it would otherwise be caught by a more permissive pattern.  The list
+# should be in alphabetical order.
+case ${target} in
+   alpha*-*-linux*libc1*		\
+ | i[34567]86-sequent-sysv		\
+ | i[34567]86-sequent-sysv[123]*	\
+ | i[34567]86-go32-*			\
+ | i[34567]86-*-go32*			\
+ | m68k-*-linux*aout*			\
+ | m68k-*-linux*libc1*			\
+ | mips64orion*-*-rtems*		\
+ | powerpc-*-linux*libc1*		\
+ | sparc-*-linux*aout*			\
+ | sparc-*-linux*libc1*			\
+ | sparc-hal-solaris2*			\
+ | thumb-*-*				\
+ | *-*-linux*coff*			\
+ | *-*-linux*oldld*			\
+ | *-*-rtemsaout*			\
+ | *-*-rtemscoff*			\
+ | vax-*-vms*				\
+ )
+	echo "*** Configuration ${target} not supported" 1>&2
+	exit 1
+	;;
+esac
+
 # Set default cpu_type, tm_file, tm_p_file and xm_file so it can be
 # updated in each machine entry.  Also set default extra_headers for some
 # machines.
 tm_p_file=
-cpu_type=`echo $machine | sed 's/-.*$//'`
-case $machine in
+cpu_type=`echo ${target} | sed 's/-.*$//'`
+case ${target} in
 alpha*-*-*)
 	cpu_type=alpha
+	need_64bit_hwint=yes
+	;;
+am33_2.0-*-linux*)
+	cpu_type=mn10300
 	;;
 strongarm*-*-*)
 	cpu_type=arm
 	;;
 arm*-*-*)
 	cpu_type=arm
+	extra_headers="mmintrin.h"
+	;;
+ep9312*-*-*)
+	cpu_type=arm
 	;;
 xscale-*-*)
 	cpu_type=arm
+	extra_headers="mmintrin.h"
 	;;
 i[34567]86-*-*)
 	cpu_type=i386
@@ -303,13 +273,18 @@ i[34567]86-*-*)
 x86_64-*-*)
 	cpu_type=i386
 	extra_headers="mmintrin.h xmmintrin.h emmintrin.h pmmintrin.h"
+	need_64bit_hwint=yes
 	;;
 ia64-*-*)
 	extra_headers=ia64intrin.h
+	need_64bit_hwint=yes
 	;;
 hppa*-*-* | parisc*-*-*)
 	cpu_type=pa
 	;;
+m32r*-*-*)
+        cpu_type=m32r
+        ;;
 m680[012]0-*-*)
 	cpu_type=m68k
 	extra_headers=math-68881.h
@@ -319,17 +294,30 @@ m68k-*-*)
 	;;
 mips*-*-*)
 	cpu_type=mips
+	need_64bit_hwint=yes
 	;;
 powerpc*-*-*)
 	cpu_type=rs6000
 	extra_headers="ppc-asm.h altivec.h spe.h"
+	need_64bit_hwint=yes
+	;;
+rs6000*-*-*)
+	need_64bit_hwint=yes
+	;;
+sparc64*-*-*)
+	cpu_type=sparc
+	need_64bit_hwint=yes
 	;;
 sparc*-*-*)
 	cpu_type=sparc
 	;;
+s390*-*-*)
+	need_64bit_hwint=yes
+	;;
 # Note the 'l'; we need to be able to match e.g. "shle" or "shl".
 sh[123456789l]*-*-*)
 	cpu_type=sh
+	need_64bit_hwint=yes
 	;;
 tic4x-*-*)
         cpu_type=c4x
@@ -347,168 +335,217 @@ then
 	extra_modes=${cpu_type}/${cpu_type}-modes.def
 fi
 
-case $machine in
+case ${target} in
 x86_64-*-*)
 	tm_file="i386/biarch64.h ${tm_file}"
 	;;
 esac
 
 # On a.out targets, we need to use collect2.
-case $machine in
+case ${target} in
 *-*-*aout*)
 	use_collect2=yes
 	;;
 esac
 
-# Common parts for GNU/Linux, GNU/Hurd, OpenBSD, NetBSD, and FreeBSD systems.
-case $machine in
+# Common parts for widely ported systems.
+case ${target} in
+*-*-darwin*)
+  tm_file="${tm_file} darwin.h"
+  tm_p_file="${tm_p_file} darwin-protos.h"
+  tmake_file="t-darwin"
+  target_gtfiles="\$(srcdir)/config/darwin.c"
+  c_target_objs="darwin-c.o"
+  cxx_target_objs="darwin-c.o"
+  extra_parts="crt2.o"
+  extra_objs="darwin.o"
+  case ${enable_threads} in
+    "" | yes | posix) thread_file='posix' ;;
+  esac
+  ;;
+*-*-freebsd[12] | *-*-freebsd[12].* | *-*-freebsd*aout*)
+  # This is the place-holder for the generic a.out configuration
+  # of FreeBSD.  No actual configuration resides here since
+  # there was only ever a bare-bones ix86 configuration for
+  # a.out and it exists solely in the machine-specific section.
+  # This place-holder must exist to avoid dropping into
+  # the generic ELF configuration of FreeBSD (i.e. it must be
+  # ordered before that section).
+  ;;
+*-*-freebsd*)
+  # This is the generic ELF configuration of FreeBSD.  Later
+  # machine-specific sections may refine and add to this
+  # configuration.
+  #
+  # Due to tm_file entry ordering issues that vary between cpu
+  # architectures, we only define fbsd_tm_file to allow the
+  # machine-specific section to dictate the final order of all
+  # entries of tm_file with the minor exception that components
+  # of the tm_file set here will always be of the form:
+  #
+  # freebsd<version_number>.h [freebsd-<conf_option>.h ...] freebsd-spec.h freebsd.h
+  #
+  # The machine-specific section should not tamper with this
+  # ordering but may order all other entries of tm_file as it
+  # pleases around the provided core setting.
+  gas=yes
+  gnu_ld=yes
+  extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
+  case ${target} in
+    *-*-freebsd3 | *-*-freebsd[3].*)
+      tm_defines="${tm_defines} FBSD_MAJOR=3" ;;
+    *-*-freebsd4 | *-*-freebsd[4].*)
+      tm_defines="${tm_defines} FBSD_MAJOR=4" ;;
+    *-*-freebsd5 | *-*-freebsd[5].*)
+      tm_defines="${tm_defines} FBSD_MAJOR=5" ;;
+    *-*-freebsd6 | *-*-freebsd[6].*)
+      tm_defines="${tm_defines} FBSD_MAJOR=6" ;;
+    *)
+      echo 'Please update *-*-freebsd* in gcc/config.gcc'
+      exit 1
+      ;;
+  esac
+  tmake_file="t-slibgcc-elf-ver t-freebsd"
+  case ${enable_threads} in
+    no)
+      fbsd_tm_file="${fbsd_tm_file} freebsd-nthr.h"
+      ;;
+    "" | yes | posix)
+      thread_file='posix'
+      tmake_file="${tmake_file} t-freebsd-thread"
+      # Before 5.0, FreeBSD can't bind shared libraries to -lc
+      # when "optionally" threaded via weak pthread_* checks.
+      case ${target} in
+        *-*-freebsd[34] | *-*-freebsd[34].*)
+          tmake_file="${tmake_file} t-slibgcc-nolc-override"
+          ;;
+      esac
+      ;;
+    *) 
+      echo 'Unknown thread configuration for FreeBSD'
+      exit 1
+      ;;
+  esac
+  fbsd_tm_file="${fbsd_tm_file} freebsd-spec.h freebsd.h"
+  ;;
+*-*-kfreebsd*-gnu)
+  # Must come before *-*-gnu*
+  xm_defines=POSIX # needed for cross-compiling from FreeBSD?
+  extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o"
+  # GNU tools are the only tools.
+  gas=yes
+  gnu_ld=yes
+  case ${enable_threads} in
+    "" | yes | posix) thread_file='posix' ;;
+  esac
+  ;;
+*-*-linux*libc1* | *-*-linux*aout*)
+  # Avoid the generic linux case.
+  ;;
 *-*-linux*)
-	xm_defines=POSIX
-	case $machine in
-	*-*-linux*ecoff* | *-*-linux*libc1* | *-*-linux*oldld* | *-*-linux*aout*)
-		;;
-	*)
-		extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o"
-		gas=yes gnu_ld=yes
-		case x${enable_threads} in
-			x | xyes | xposix) thread_file='posix'
-			;;
-		esac
-		;;
-	esac
-	;;
+  # Must come before *-*-gnu* (because of *-*-linux-gnu* systems).
+  extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o"
+  gas=yes
+  gnu_ld=yes
+  case ${enable_threads} in
+    "" | yes | posix) thread_file='posix' ;;
+  esac
+  ;;
 *-*-gnu*)
-	# On the Hurd, the setup is just about the same on
-	# each different CPU.  The specific machines that we
-	# support are matched above and just set $cpu_type.
-	xm_defines=POSIX
-	tm_file="${cpu_type}/gnu.h"
-	extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o"
-	# GNU always uses ELF.
-	elf=yes
-	# GNU tools are the only tools.
-	gnu_ld=yes
-	gas=yes
-	# These details are the same as for Linux.
-	# But here we need a little extra magic.
-	tmake_file="t-slibgcc-elf-ver t-linux t-gnu"
-	case $machine in
-	alpha*)
-		tm_file="${cpu_type}/${cpu_type}.h alpha/elf.h alpha/linux.h alpha/linux-elf.h gnu.h ${tm_file}"
-		;;
-	i[34567]86-*-*)
-		tm_file="${cpu_type}/${cpu_type}.h i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h linux.h i386/linux.h gnu.h ${tm_file}"
-		;;
-	esac
-	;;
-*-*-openbsd*)
-	tm_file=${cpu_type}/openbsd.h
-	tmake_file="t-libc-ok t-openbsd t-libgcc-pic"
-	xm_defines=POSIX
-	if test x$enable_threads = xyes; then
-		thread_file='posix'
-		tmake_file="${tmake_file} t-openbsd-thread"
-	fi
-	;;
+  # On the Hurd, the setup is just about the same on
+  # each different CPU.  The specific machines that we
+  # support are matched above and just set $cpu_type.
+  tm_file="${cpu_type}/gnu.h"
+  extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o"
+  # GNU tools are the only tools.
+  gas=yes
+  gnu_ld=yes
+  # These details are the same as for Linux.
+  # But here we need a little extra magic.
+  tmake_file="t-slibgcc-elf-ver t-linux t-gnu"
+  case ${target} in
+    alpha*)
+      tm_file="${cpu_type}/${cpu_type}.h alpha/elf.h alpha/linux.h alpha/linux-elf.h gnu.h ${tm_file}"
+      ;;
+    i[34567]86-*-*)
+      tm_file="${cpu_type}/${cpu_type}.h i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h linux.h i386/linux.h gnu.h ${tm_file}"
+      ;;
+  esac
+  ;;
 *-*-netbsd*)
-	tmake_file="t-slibgcc-elf-ver t-libc-ok t-netbsd"
-	xm_defines=POSIX
-	gas=yes
-	gnu_ld=yes
+  tmake_file="t-slibgcc-elf-ver t-libc-ok t-netbsd t-libgcc-pic"
+  gas=yes
+  gnu_ld=yes
 
-	# NetBSD 2.0 and later get POSIX threads enabled by default.
-	# Allow them to be explicitly enabled on any other version.
-	case x${enable_threads} in
-	x)
-		case $machine in
-		*-*-netbsd[2-9]* | *-*-netbsdelf[2-9]*)
-			thread_file='posix'
-			tm_defines="${tm_defines} NETBSD_ENABLE_PTHREADS"
-			;;
-		esac
-		;;
-	xyes | xposix)
-		thread_file='posix'
-		tm_defines="${tm_defines} NETBSD_ENABLE_PTHREADS"
-		;;
-	esac
+  # NetBSD 2.0 and later get POSIX threads enabled by default.
+  # Allow them to be explicitly enabled on any other version.
+  case ${enable_threads} in
+    "")
+      case ${target} in
+        *-*-netbsd[2-9]* | *-*-netbsdelf[2-9]*)
+          thread_file='posix'
+          tm_defines="${tm_defines} NETBSD_ENABLE_PTHREADS"
+          ;;
+      esac
+      ;;
+    yes | posix)
+      thread_file='posix'
+      tm_defines="${tm_defines} NETBSD_ENABLE_PTHREADS"
+      ;;
+  esac
 
-	# NetBSD 1.7 and later are set up to use GCC's crtstuff for
-	# ELF configurations.  We will clear extra_parts in the
-	# a.out configurations.
-	case $machine in
-	*-*-netbsd*1.[7-9]* | *-*-netbsd[2-9]* | *-*-netbsdelf[2-9]*)
-		extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o"
-		;;
-	esac
-	;;
-*-*-freebsd[12] | *-*-freebsd[12].* | *-*-freebsd*aout*)
-	# This is the place-holder for the generic a.out configuration
-	# of FreeBSD.  No actual configuration resides here since
-	# there was only ever a bare-bones ix86 configuration for
-	# a.out and it exists solely in the machine-specific section.
-	# This place-holder must exist to avoid dropping into
-	# the generic ELF configuration of FreeBSD (i.e. it must be
-	# ordered before that section).
-	;;
-*-*-freebsd*)
-	# This is the generic ELF configuration of FreeBSD.  Later
-	# machine-specific sections may refine and add to this
-	# configuration.
-	#
-	# Due to tm_file entry ordering issues that vary between cpu
-	# architectures, we only define fbsd_tm_file to allow the
-	# machine-specific section to dictate the final order of all
-	# entries of tm_file with the minor exception that components
-	# of the tm_file set here will always be of the form:
-	#
-	# freebsd<version_number>.h [freebsd-<conf_option>.h ...] freebsd-spec.h freebsd.h
-	#
-	# The machine-specific section should not tamper with this
-	# ordering but may order all other entries of tm_file as it
-	# pleases around the provided core setting.
-	gas=yes
-	gnu_ld=yes
-	extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
-	case $machine in
-	*-*-freebsd3 | *-*-freebsd[3].*) fbsd_tm_file="freebsd3.h";;
-	*-*-freebsd4 | *-*-freebsd[4].*) fbsd_tm_file="freebsd4.h";;
-	*-*-freebsd5 | *-*-freebsd[5].*) fbsd_tm_file="freebsd5.h";;
-	*-*-freebsd6 | *-*-freebsd[6].*) fbsd_tm_file="freebsd6.h";;
-	*) echo 'Please update *-*-freebsd* in gcc/config.gcc'; exit 1;;
-	esac
-	tmake_file="t-slibgcc-elf-ver t-freebsd"
-	xmake_file=none
-	xm_defines=POSIX
-	case x${enable_threads} in
-	xno) fbsd_tm_file="${fbsd_tm_file} freebsd-nthr.h";;
-	x | xyes | xpthreads | xposix)
-		thread_file='posix'
-		tmake_file="${tmake_file} t-freebsd-thread"
-		# Before 5.0, FreeBSD can't bind shared libraries to -lc
-		# when "optionally" threaded via weak pthread_* checks.
-		case $machine in
-		*-*-freebsd[34] | *-*-freebsd[34].*)
-			tmake_file="${tmake_file} t-slibgcc-nolc-override";;
-		esac
-		;;
-	*) echo 'Unknown thread configuration for FreeBSD'; exit 1;;
-	esac
-	fbsd_tm_file="${fbsd_tm_file} freebsd-spec.h freebsd.h"
-	;;
+  # NetBSD 1.7 and later are set up to use GCC's crtstuff for
+  # ELF configurations.  We will clear extra_parts in the
+  # a.out configurations.
+  case ${target} in
+    *-*-netbsd*1.[7-9]* | *-*-netbsd[2-9]* | *-*-netbsdelf[2-9]*)
+      extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o"
+      ;;
+  esac
+
+  # NetBSD 2.0 and later provide __cxa_atexit(), which we use by
+  # default (unless overridden by --disable-__cxa_atexit).
+  case ${target} in
+    *-*-netbsd[2-9]* | *-*-netbsdelf[2-9]*)
+      default_use_cxa_atexit=yes
+      ;;
+  esac
+  ;;
+*-*-openbsd*)
+  tmake_file="t-libc-ok t-openbsd t-libgcc-pic"
+  case ${enable_threads} in
+    yes)
+      thread_file='posix'
+      tmake_file="${tmake_file} t-openbsd-thread"
+      ;;
+  esac
+  ;;
+*-*-rtems*)
+  case ${enable_threads} in
+    yes) thread_file='rtems' ;;
+  esac
+  ;;
+*-*-vxworks*)
+  tmake_file=t-vxworks
+  tm_file="${tm_file} elfos.h svr4.h vxworks.h"
+  case ${enable_threads} in
+    no) ;;
+    "" | yes | vxworks) thread_file='vxworks' ;;
+    *) echo 'Unknown thread configuration for VxWorks'; exit 1 ;;
+  esac
+  use_collect2=yes
+  xm_defines=POSIX
+  ;;
 esac
 
-case $machine in
+case ${target} in
 # Support site-specific machine types.
 *local*)
-	rest=`echo $machine | sed -e "s/$cpu_type-//"`
+	rest=`echo ${target} | sed -e "s/$cpu_type-//"`
 	tm_file=${cpu_type}/$rest.h
 	if test -f $srcdir/config/${cpu_type}/xm-$rest.h
 	then xm_file=${cpu_type}/xm-$rest.h
 	fi
-	if test -f $srcdir/config/${cpu_type}/x-$rest
-	then xmake_file=${cpu_type}/x-$rest
-	fi
 	if test -f $srcdir/config/${cpu_type}/t-$rest
 	then tmake_file=${cpu_type}/t-$rest
 	fi
@@ -520,41 +557,7 @@ alpha*-*-unicosmk*)
 	# Don't include t-ieee for now because we don't support that yet
 	# tmake_file="alpha/t-ieee"
 	tmake_file="alpha/t-unicosmk"
-	;;
-alpha-*-interix)
-	tm_file="${tm_file} alpha/alpha32.h interix.h alpha/alpha-interix.h"
-
-	# GAS + IEEE_CONFORMANT+IEEE (no inexact);
-	#target_cpu_default="MASK_GAS|MASK_IEEE_CONFORMANT|MASK_IEEE"
-
-	# GAS + IEEE_CONFORMANT
-	target_cpu_default="MASK_GAS|MASK_IEEE_CONFORMANT"
-
-	xm_defines=POSIX
-	xm_file="alpha/xm-alpha-interix.h"
-	tmake_file="alpha/t-alpha t-interix alpha/t-interix alpha/t-ieee"
-	if test x$enable_threads = xyes ; then
-		thread_file='posix'
-	fi
-	if test x$stabs = xyes ; then
-		tm_file="${tm_file} dbxcoff.h"
-	fi
-	#prefix='$$INTERIX_ROOT'/usr/contrib
-	#local_prefix='$$INTERIX_ROOT'/usr/contrib
-	;;
-alpha*-*-linux*ecoff*)
-	echo "Configuration $machine no longer supported" 1>&2
-	exit 1
-	;;
-alpha*-*-linux*libc1*)
-	tm_file="${tm_file} alpha/elf.h alpha/linux.h alpha/linux-elf.h"
-	target_cpu_default="MASK_GAS"
-	tmake_file="t-slibgcc-elf-ver t-linux t-linux-gnulibc1 alpha/t-alpha alpha/t-crtfm alpha/t-ieee"
-	extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o"
-	gas=yes gnu_ld=yes
-	if test x$enable_threads = xyes; then
-		thread_file='posix'
-	fi
+	use_fixproto=yes
 	;;
 alpha*-*-linux*)
 	tm_file="${tm_file} alpha/elf.h alpha/linux.h alpha/linux-elf.h"
@@ -576,16 +579,14 @@ alpha*-*-netbsd*)
 	target_cpu_default="MASK_GAS"
 	tmake_file="${tmake_file} alpha/t-alpha alpha/t-ieee"
 	;;
-
 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"
 	;;
-
 alpha*-dec-osf[45]*)
-	xm_defines=POSIX
 	if test x$stabs = xyes
 	then
 		tm_file="${tm_file} dbx.h"
@@ -598,13 +599,10 @@ alpha*-dec-osf[45]*)
 	tmake_file="alpha/t-alpha alpha/t-ieee alpha/t-crtfm alpha/t-osf4"
 	tm_file="${tm_file} alpha/osf.h"
 	extra_headers=va_list.h
-	case $machine in
+	case ${target} in
 	  *-*-osf4*)
-	    # Some versions of OSF4 (specifically X4.0-9 296.7) have
-	    # a broken tar, so we use cpio instead.
-	    install_headers_dir=install-headers-cpio
 	    # Set target_cpu_default except on 4.0a.
-	    case $machine in
+	    case ${target} in
 		*-*-osf4.0a) ;;
 		*) target_cpu_default=MASK_SUPPORT_ARCH
 	    esac
@@ -614,75 +612,44 @@ alpha*-dec-osf[45]*)
 	    target_cpu_default=MASK_SUPPORT_ARCH
 	    ;;
 	esac
-	;;
-alpha*-*-vxworks*)
-	xm_defines=POSIX
-	tm_file="${tm_file} dbx.h alpha/vxworks.h"
-	tmake_file="alpha/t-alpha alpha/t-ieee"
-	if [ x$gas != xyes ]
-	then
-		extra_passes="mips-tfile mips-tdump"
-	fi
-	use_collect2=yes
-	thread_file='vxworks'
+	case ${enable_threads} in
+	  "" | yes | posix)
+	    thread_file='posix'
+	    tmake_file="${tmake_file} alpha/t-osf-pthread"
+	    ;;
+	esac
 	;;
 alpha64-dec-*vms*)
-	xm_defines=POSIX
 	tm_file="${tm_file} alpha/vms.h alpha/vms64.h"
-	xm_file="alpha/xm-vms.h alpha/xm-vms64.h"
+	xm_file="alpha/xm-vms.h"
 	tmake_file="alpha/t-alpha alpha/t-vms alpha/t-vms64 alpha/t-ieee"
-	xmake_file=alpha/x-vms
-	exeext=.exe
-	# This removes the cpu type and manufacturer components and
-	#  replaces "." with "_" in the operating system version.
-	case $host in *-*-*vms*)
-		target_alias=`echo $host \
-		  | sed 's/.*-.*-\(.*\)$/\1/' | sed 's/\./_/g'`
-		;;
-	esac
-	install_headers_dir=install-headers-cp
 	prefix=/gnu
 	local_prefix=/gnu
 	;;
 alpha*-dec-*vms*)
-	xm_defines=POSIX
 	tm_file="${tm_file} alpha/vms.h"
 	xm_file=alpha/xm-vms.h
 	tmake_file="alpha/t-alpha alpha/t-vms alpha/t-ieee"
-	xmake_file=alpha/x-vms
-	exeext=.exe
-	# This removes the cpu type and manufacturer components and
-	#  replaces "." with "_" in the operating system version.
-	case $host in *-*-*vms*)
-		target_alias=`echo $host \
-		  | sed 's/.*-.*-\(.*\)$/\1/' | sed 's/\./_/g'`
-		;;
-	esac
-	install_headers_dir=install-headers-cp
 	prefix=/gnu
 	local_prefix=/gnu
 	;;
 arc-*-elf*)
 	tm_file="dbxelf.h elfos.h svr4.h ${tm_file}"
 	extra_parts="crtinit.o crtfini.o"
+	use_fixproto=yes
 	;;
 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-*-vxworks*)
-	tm_file="arm/semi.h arm/aout.h arm/coff.h arm/vxarm.h arm/arm.h"
-	tmake_file=arm/t-arm-coff
-	thread_file='vxworks'
-	;;
-arm-semi-aout | armel-semi-aout)
-	tm_file="arm/semi.h arm/aout.h arm/arm.h"
-	tmake_file=arm/t-semi
-	;;
 arm-semi-aof | armel-semi-aof)
 	tm_file="arm/semiaof.h arm/aof.h arm/arm.h"
 	tmake_file=arm/t-semi
 	;;
+arm-wrs-vxworks)
+	tm_file="dbxelf.h elfos.h svr4.h vxworks.h arm/elf.h arm/aout.h arm/arm.h arm/vxworks.h"
+	tmake_file="${tmake_file} arm/t-vxworks"
+	;;
 arm*-*-freebsd*|strongarm*-*-freebsd*)
 	tm_file="dbxelf.h elfos.h ${fbsd_tm_file} arm/elf.h arm/aout.h arm/freebsd.h arm/arm.h"
 	tmake_file="${tmake_file} arm/t-strongarm-elf"
@@ -698,62 +665,48 @@ arm*-*-netbsd*)
 	use_collect2=yes
 	;;
 arm*-*-linux*)			# ARM GNU/Linux with ELF
-	tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h arm/linux-gas.h arm/linux-elf.h"
+	tm_file="dbxelf.h elfos.h linux.h arm/elf.h  arm/linux-gas.h arm/linux-elf.h arm/aout.h arm/arm.h"
 	tmake_file="t-slibgcc-elf-ver t-linux arm/t-linux"
 	extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 	gnu_ld=yes
-	case x${enable_threads} in
-	x | xyes | xpthreads | xposix)
-		thread_file='posix'
-		;;
-	esac
 	;;
 arm*-*-uclinux*)		# ARM ucLinux
 	tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h arm/linux-gas.h arm/linux-elf.h arm/uclinux-elf.h"
 	tmake_file=arm/t-arm-elf
 	;;
-arm*-*-aout)
-	tm_file="arm/aout.h arm/arm.h"
-	tmake_file=arm/t-arm-aout
-	;;
 arm*-*-ecos-elf)
 	tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h arm/ecos-elf.h"
 	tmake_file=arm/t-arm-elf
 	;;
 arm*-*-rtems*)
-	xm_defines=POSIX
 	tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h arm/rtems-elf.h rtems.h"
 	tmake_file="arm/t-arm-elf t-rtems"
-	if test x$enable_threads = xyes; then
-	  thread_file='rtems'
-	fi
 	;;
-arm*-*-elf)
+arm*-*-elf | ep9312-*-elf)
 	tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h"
 	tmake_file=arm/t-arm-elf
 	;;
-arm*-*-conix*)
-	tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/conix-elf.h arm/aout.h arm/arm.h"
-	tmake_file=arm/t-arm-elf
-	;;
-arm*-*-oabi)
-	tm_file="arm/unknown-elf-oabi.h dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h"
-	tmake_file=arm/t-arm-elf
+arm*-wince-pe*)
+	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"
 	;;
+arm*-*-kaos*)
+	tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h kaos.h arm/kaos-arm.h"
+	tmake_file=arm/t-arm-elf
+	;;
 avr-*-*)
+	tm_file="avr/avr.h dbxelf.h"
+	use_fixproto=yes
 	;;
 c4x-*-rtems* | tic4x-*-rtems*)
-	xm_defines=POSIX
 	tmake_file="c4x/t-c4x t-rtems"
 	tm_file="c4x/c4x.h c4x/rtems.h rtems.h"
-	if test x$enable_threads = xyes; then
-	  thread_file='rtems'
-	fi
 	c_target_objs="c4x-c.o"
 	cxx_target_objs="c4x-c.o"
 	;;
@@ -780,140 +733,81 @@ d30v-*)
 	tm_file="dbxelf.h elfos.h svr4.h ${tm_file}"
 	;;
 dsp16xx-*)
+	use_fixproto=yes
 	;;
 fr30-*-elf)
 	tm_file="dbxelf.h elfos.h svr4.h ${tm_file}"
 	tmake_file=fr30/t-fr30
 	extra_parts="crti.o crtn.o crtbegin.o crtend.o"
+	use_fixproto=yes
 	;;
 frv-*-elf)
 	tm_file="dbxelf.h elfos.h svr4.h ${tm_file} frv/frv-abi.h"
 	tmake_file=frv/t-frv
+	use_fixproto=yes
 	;;
 h8300-*-rtems*)
-	xm_defines=POSIX
-	tmake_file="h8300/t-h8300 t-rtems"
-	tm_file="h8300/h8300.h h8300/rtems.h rtems.h"
-	if test x$enable_threads = xyes; then
-	  thread_file='rtems'
-	fi
+	tmake_file="h8300/t-h8300 t-rtems h8300/t-rtems"
+	tm_file="h8300/h8300.h dbxcoff.h h8300/coff.h h8300/rtems.h rtems.h"
 	;;
 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"
+	use_fixproto=yes
 	;;
 h8300-*-*)
+	tm_file="h8300/h8300.h dbxcoff.h h8300/coff.h"
+	use_fixproto=yes
 	;;
 hppa*64*-*-linux* | parisc*64*-*-linux*)
 	target_cpu_default="(MASK_PA_11 | MASK_PA_20)"
 	tm_file="pa/pa64-start.h ${tm_file} dbxelf.h elfos.h svr4.h linux.h \
 		 pa/pa-linux.h pa/pa64-regs.h pa/pa-64.h pa/pa64-linux.h"
-	tmake_file=pa/t-linux64
+	tmake_file="t-slibgcc-elf-ver t-linux pa/t-linux64"
 	gas=yes gnu_ld=yes
+	need_64bit_hwint=yes
 	;;
 hppa*-*-linux* | parisc*-*-linux*)
 	target_cpu_default="MASK_PA_11 | MASK_NO_SPACE_REGS"
 	tm_file="${tm_file} dbxelf.h elfos.h svr4.h linux.h pa/pa-linux.h \
 		 pa/pa32-regs.h pa/pa32-linux.h"
 	tmake_file="t-slibgcc-elf-ver t-linux pa/t-linux"
+	# if not configured with --enable-sjlj-exceptions, bump the
+	# libgcc version number
+	if test x$sjlj != x1; then
+	    tmake_file="$tmake_file pa/t-slibgcc-elf-ver"
+	fi
 	;;
-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"
+#	;;
 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"
-	tmake_file="pa/t-bsd pa/t-pro"
-	xmake_file="pa/x-ada"
+	tmake_file="pa/t-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"
-	tmake_file="pa/t-bsd pa/t-pa"
-	xmake_file="pa/x-ada"
+	tm_file="${tm_file} pa/pa32-regs.h dbxelf.h pa/som.h pa/pa-osf.h"
+	tmake_file="pa/t-pa"
 	use_collect2=yes
 	;;
 hppa1.1-*-rtems*)
-	xm_defines=POSIX
 	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 pa/rtems.h rtems.h"
-	tmake_file="pa/t-bsd pa/t-pro t-rtems"
-	xmake_file="pa/x-ada"
-	if test x$enable_threads = xyes; then
-	  thread_file='rtems'
-	fi
-	;;
-hppa1.0-*-osf*)
-	tm_file="${tm_file} pa/pa32-regs.h pa/som.h pa/pa-osf.h"
-	tmake_file="pa/t-bsd pa/t-pa"
-	xmake_file="pa/x-ada"
-	use_collect2=yes
+	tmake_file="pa/t-pro t-rtems"
 	;;
 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"
-	use_collect2=yes
-	;;
-hppa1.0-*-bsd*)
-	tm_file="${tm_file} pa/pa32-regs.h pa/som.h"
-	tmake_file="pa/t-bsd pa/t-pa"
-	xmake_file="pa/x-ada"
-	use_collect2=yes
-	;;
-hppa1.0-*-hpux7*)
-	tm_file="pa/pa-oldas.h ${tm_file} pa/pa32-regs.h pa/som.h pa/pa-hpux7.h"
-	xm_defines=POSIX
-	tmake_file=pa/t-pa-hpux
-	install_headers_dir=install-headers-cpio
-	use_collect2=yes
-	;;
-hppa1.0-*-hpux8.0[0-2]*)
-	tm_file="${tm_file} pa/pa32-regs.h pa/som.h pa/pa-hpux.h"
-	xm_defines=POSIX
-	tmake_file=pa/t-pa-hpux
-	if test x$gas != xyes
-	then
-		tm_file="pa/pa-oldas.h ${tm_file}"
-	fi
-	install_headers_dir=install-headers-cpio
-	use_collect2=yes
-	;;
-hppa1.1-*-hpux8.0[0-2]*)
-	target_cpu_default="MASK_PA_11"
-	tm_file="${tm_file} pa/pa32-regs.h pa/som.h pa/pa-hpux.h"
-	xm_defines=POSIX
-	tmake_file=pa/t-pa-hpux
-	if test x$gas != xyes
-	then
-		tm_file="pa/pa-oldas.h ${tm_file}"
-	fi
-	install_headers_dir=install-headers-cpio
-	use_collect2=yes
-	;;
-hppa1.1-*-hpux8*)
-	target_cpu_default="MASK_PA_11"
-	tm_file="${tm_file} pa/pa32-regs.h pa/som.h pa/pa-hpux.h"
-	xm_defines=POSIX
-	tmake_file=pa/t-pa-hpux
-	install_headers_dir=install-headers-cpio
-	use_collect2=yes
-	;;
-hppa1.0-*-hpux8*)
-	tm_file="${tm_file} pa/pa32-regs.h pa/som.h pa/pa-hpux.h"
-	xm_defines=POSIX
-	tmake_file=pa/t-pa-hpux
-	install_headers_dir=install-headers-cpio
+	tmake_file="pa/t-pa"
 	use_collect2=yes
 	;;
 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"
-	xm_defines=POSIX
+	tm_file="${tm_file} pa/pa32-regs.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
 	    enable_threads=$have_pthread_h
 	fi
@@ -922,14 +816,12 @@ hppa1.1-*-hpux10* | hppa2*-*-hpux10*)
 		tmake_file="${tmake_file} pa/t-dce-thr"
 		;;
 	esac
-	install_headers_dir=install-headers-cpio
 	use_collect2=yes
+	use_fixproto=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"
-	xm_defines=POSIX
+	tm_file="${tm_file} pa/pa32-regs.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
 	    enable_threads=$have_pthread_h
 	fi
@@ -938,23 +830,22 @@ hppa1.0-*-hpux10*)
 		tmake_file="${tmake_file} pa/t-dce-thr"
 		;;
 	esac
-	install_headers_dir=install-headers-cpio
 	use_collect2=yes
+	use_fixproto=yes
 	;;
 hppa*64*-*-hpux11*)
-	xm_defines=POSIX
 	if test x$gas = xyes
 	then
 		tm_file="pa/pa64-start.h ${tm_file} dbxelf.h elfos.h  \
-			 pa/pa64-regs.h pa/long_double.h pa/pa-hpux.h \
+			 pa/pa64-regs.h pa/pa-hpux.h \
 			 pa/pa-hpux11.h pa/pa-64.h pa/pa64-hpux.h"
 	else
 		tm_file="pa/pa64-start.h ${tm_file} dbxelf.h pa/elf.h \
-			 pa/pa64-regs.h pa/long_double.h pa/pa-hpux.h \
+			 pa/pa64-regs.h pa/pa-hpux.h \
 			 pa/pa-hpux11.h pa/pa-64.h pa/pa64-hpux.h"
 	fi
+	need_64bit_hwint=yes
 	tmake_file="pa/t-pa64 pa/t-pa-hpux"
-	xmake_file="pa/x-ada"
 	target_cpu_default="(MASK_PA_11|MASK_PA_20|MASK_GAS)"
 	extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o"
 	if test x$gnu_ld = xyes
@@ -966,156 +857,83 @@ hppa*64*-*-hpux11*)
 		thread_file=posix 
 		;;
 	esac
-	install_headers_dir=install-headers-cpio
 	;;
 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"
-	xm_defines=POSIX
+	tm_file="${tm_file} pa/pa32-regs.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"
 	case x${enable_threads} in
 	xyes | xposix )
 		thread_file=posix 
 		;;
 	esac
-	install_headers_dir=install-headers-cpio
 	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"
-	xm_defines=POSIX
+	tm_file="${tm_file} pa/pa32-regs.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"
 	case x${enable_threads} in
 	xyes | xposix )
 		thread_file=posix 
 		;;
 	esac
-	install_headers_dir=install-headers-cpio
-	use_collect2=yes
-	;;
-hppa1.1-*-hpux* | hppa2*-*-hpux*)
-	target_cpu_default="MASK_PA_11"
-	tm_file="${tm_file} pa/pa32-regs.h pa/som.h pa/pa-hpux.h pa/pa-hpux9.h"
-	xm_defines=POSIX
-	tmake_file=pa/t-pa-hpux
-	install_headers_dir=install-headers-cpio
-	use_collect2=yes
-	;;
-hppa1.0-*-hpux*)
-	tm_file="${tm_file} pa/pa32-regs.h pa/som.h pa/pa-hpux.h pa/pa-hpux9.h"
-	xm_defines=POSIX
-	tmake_file=pa/t-pa-hpux
-	install_headers_dir=install-headers-cpio
-	use_collect2=yes
-	;;
-hppa1.1-*-hiux* | hppa2*-*-hiux*)
-	target_cpu_default="MASK_PA_11"
-	tm_file="${tm_file} pa/pa32-regs.h pa/som.h pa/pa-hpux.h pa/pa-hiux.h"
-	xm_defines=POSIX
-	tmake_file=pa/t-pa-hpux
-	install_headers_dir=install-headers-cpio
-	use_collect2=yes
-	;;
-hppa1.0-*-hiux*)
-	tm_file="${tm_file} pa/pa32-regs.h pa/som.h pa/pa-hpux.h pa/pa-hiux.h"
-	xm_defines=POSIX
-	tmake_file=pa/t-pa-hpux
-	install_headers_dir=install-headers-cpio
-	use_collect2=yes
-	;;
-hppa*-*-lites*)
-	tm_file="${tm_file} pa/pa32-regs.h dbxelf.h elfos.h pa/elf.h"
-	target_cpu_default="MASK_PA_11"
-	tmake_file="pa/t-bsd pa/t-pa"
-	xmake_file="pa/x-ada"
-	use_collect2=yes
-	;;
-hppa*-*-mpeix*)
-	tm_file="${tm_file} pa/pa32-regs.h pa/long_double.h pa/som.h pa/pa-mpeix.h"
-	tmake_file=pa/t-mpeix
-	echo "You must use gas. Assuming it is already installed."
-	gas=yes
-	install_headers_dir=install-headers-tar
 	use_collect2=yes
 	;;
 i370-*-opened*)			 # IBM 360/370/390 Architecture
-	xm_defines='POSIX FATAL_EXIT_CODE=12'
-	tm_file=i370/oe.h
-	tmake_file="i370/t-oe i370/t-i370"
+	xm_defines='FATAL_EXIT_CODE=12'
+	tm_file="i370/oe.h i370/i370.h"
+	tmake_file="i370/t-i370"
 	c_target_objs="i370-c.o"
 	cxx_target_objs="i370-c.o"
+	# Don't bother fixing up header files; they're weird.
 	;;
 i370-*-mvs*)
-	xm_defines='POSIX FATAL_EXIT_CODE=12'
-	tm_file=i370/mvs.h
+	xm_defines='FATAL_EXIT_CODE=12'
+	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"
+	use_fixproto=yes
 	;;
 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
 	;;
 i[34567]86-*-darwin*)
-	tm_file="${tm_file} darwin.h i386/darwin.h"
-	tm_p_file="${tm_p_file} darwin-protos.h"
-	tmake_file="t-darwin"
-	extra_objs="darwin.o"
-	target_gtfiles="\$(srcdir)/config/darwin.c"
-	c_target_objs="darwin-c.o"
-	cxx_target_objs="darwin-c.o"
-	extra_parts="crt2.o"
-	# Darwin linker does collect2 functionality
-	use_collect2=no
+	tm_file="${tm_file} i386/darwin.h"
 	;;
 i[34567]86-*-elf*)
-	xm_defines=POSIX
 	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h i386/i386elf.h"
 	tmake_file="i386/t-i386elf t-svr4"
+	use_fixproto=yes
 	;;
 i[34567]86-ncr-sysv4*)		# NCR 3000 - ix86 running system V.4
-	xm_defines="POSIX SMALL_ARG_MAX"
-	if test x$stabs = xyes -a x$gas = xyes
-	then
-		tm_file=i386/sysv4gdb.h
-	else
-		tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h i386/sysv4.h i386/sysv4-cpp.h"
-	fi
+	xm_defines="SMALL_ARG_MAX"
+	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h i386/sysv4.h i386/sysv4-cpp.h"
 	extra_parts="crtbegin.o crtend.o"
 	tmake_file=i386/t-crtpic
+	use_fixproto=yes
 	;;
 i[34567]86-*-netware)		# Intel 80386's running netware
 	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h i386/sysv4.h netware.h i386/netware.h"
-	tmake_file=i386/t-netware
 	;;
 i[34567]86-sequent-ptx4* | i[34567]86-sequent-sysv4*)
 	if test x$gas = xyes
 	then
 		tm_file="${tm_file} usegas.h"
 	fi
-	xm_defines="POSIX SMALL_ARG_MAX"
+	xm_defines="SMALL_ARG_MAX"
 	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ptx4.h i386/ptx4-i.h"
 	tmake_file=t-svr4
 	extra_parts="crtbegin.o crtend.o"
-	install_headers_dir=install-headers-cpio
-	;;
-i[34567]86-sequent-sysv*)	# would otherwise be caught by i?86-*-sysv*
-	echo "*** Configuration $machine not supported" 1>&2
-	exit 1
-	;;
-i[34567]86-wrs-vxworks*)
-	tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h i386/vxi386.h"
-	thread_file='vxworks'
+	use_fixproto=yes
 	;;
 i[34567]86-*-aout*)
 	tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h i386/i386-aout.h"
+	use_fixproto=yes
 	;;
 i[34567]86-*-beoself* | i[34567]86-*-beos*)
-	xm_defines=POSIX
 	tmake_file='i386/t-beos i386/t-crtpic'
 	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h i386/beos-elf.h"
 	extra_parts='crtbegin.o crtend.o'
@@ -1143,7 +961,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...
@@ -1151,14 +969,11 @@ i[34567]86-*-openbsd*)
 	;;
 i[34567]86-*-coff*)
 	tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h dbxcoff.h i386/i386-coff.h"
-	;;
-i[34567]86-*-linux*oldld*)	# would otherwise be caught by i?86-*-linux*
-	echo "*** Configuration $machine not supported" 1>&2
-	exit 1
+	use_fixproto=yes
 	;;
 i[34567]86-*-linux*aout*)	# Intel 80386's running GNU/Linux
 				# with a.out format
-	tmake_file="t-linux-aout i386/t-crtstuff"
+	tmake_file="i386/t-crtstuff"
 	tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h linux-aout.h i386/linux-aout.h"
 	gnu_ld=yes
 	;;
@@ -1184,60 +999,55 @@ x86_64-*-linux*)
 		 i386/x86-64.h i386/linux64.h"
 	tmake_file="t-slibgcc-elf-ver t-linux i386/t-linux64"
 	;;
-i[34567]86-*-gnu*)
+i[34567]86-*-kfreebsd*-gnu) # must be before i[34567]86-*-gnu*
+	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h linux.h i386/linux.h kfreebsdgnu.h i386/kfreebsdgnu.h"
+	tmake_file="t-slibgcc-elf-ver t-kfreebsd-gnu i386/t-crtstuff"
+	float_format=i386
+	use_fixproto=no
 	;;
-i[34567]86-go32-msdos | i[34567]86-*-go32*)
-	echo "GO32/DJGPP V1.X is no longer supported. Use *-pc-msdosdjgpp for DJGPP V2.X instead."
-	exit 1
+i[34567]86-*-gnu*)
 	;;
 i[34567]86-pc-msdosdjgpp*)
 	xm_file=i386/xm-djgpp.h
-	tm_file="dbxcoff.h ${tm_file} i386/djgpp.h"
+	tm_file="dbxcoff.h ${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/djgpp.h"
 	tmake_file=i386/t-djgpp
 	gnu_ld=yes
 	gas=yes
-	exeext=.exe
-	case $host in *pc-msdosdjgpp*)
-		target_alias=djgpp
-		;;
-	esac
 	;;
 i[34567]86-moss-msdos* | i[34567]86-*-moss*)
 	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h linux.h i386/linux.h i386/moss.h"
 	tmake_file=t-libc-ok
 	gnu_ld=yes
 	gas=yes
+	use_fixproto=yes
 	;;
 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
+	use_fixproto=yes
 	;;
 i[34567]86-*-mach*)
 	tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h i386/mach.h"
 #	tmake_file=t-libc-ok
 	use_collect2=yes
+	use_fixproto=yes
 	;;
-i[34567]86-go32-rtems* | i[34567]86-*-rtemscoff*)
-	# would otherwise be caught by i?86-*-rtems*
-	echo "*** Configuration $machine not supported" 1>&2
-	exit 1
+i[34567]86-*-nto-qnx*)
+	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
 	;;
 i[34567]86-*-rtems*)
-	xm_defines=POSIX
 	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h i386/i386elf.h i386/rtemself.h rtems.h"
 	extra_parts="crtbegin.o crtend.o crti.o crtn.o"
 	tmake_file="i386/t-rtems-i386 i386/t-crtstuff t-rtems"
-	if test x$enable_threads = xyes; then
-	  thread_file='rtems'
-	fi
 	;;
 i[34567]86-*-sco3.2v5*)	# 80386 running SCO Open Server 5
-	xm_defines=POSIX
-	install_headers_dir=install-headers-cpio
 	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h i386/sco5.h"
 	if test x$gas = xyes
 	then
@@ -1245,9 +1055,10 @@ i[34567]86-*-sco3.2v5*)	# 80386 running SCO Open Server 5
 	fi
 	tmake_file=i386/t-sco5
 	extra_parts="crtbegin.o crtend.o"
+	use_fixproto=yes
 	;;
 i[34567]86-*-solaris2*)
-	xm_defines="POSIX SMALL_ARG_MAX"
+	xm_defines="SMALL_ARG_MAX"
 	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h i386/sysv4.h sol2.h i386/sol2.h"
 	tmake_file="i386/t-sol2 t-svr4"
 	if test x$gnu_ld = xyes; then
@@ -1255,6 +1066,11 @@ i[34567]86-*-solaris2*)
 	else
 		tmake_file="$tmake_file t-slibgcc-sld"
 	fi
+	case ${target} in
+	*-*-solaris2.[789] | *-*-solaris2.1[0-9])
+		tm_file="$tm_file tm-dwarf2.h"
+		;;
+	esac
 	extra_parts="crt1.o crti.o crtn.o gcrt1.o gmon.o crtbegin.o crtend.o"
 	if test x${enable_threads} = x; then
 	    enable_threads=$have_pthread_h
@@ -1271,7 +1087,6 @@ i[34567]86-*-solaris2*)
 	fi
 	;;
 i[34567]86-*-sysv5*)           # Intel x86 on System V Release 5
-       xm_defines=POSIX
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h i386/sysv4.h i386/sysv5.h"
        if test x$stabs = xyes
        then
@@ -1282,9 +1097,10 @@ i[34567]86-*-sysv5*)           # Intel x86 on System V Release 5
        if test x$enable_threads = xyes; then
 	       thread_file='posix'
        fi
+	use_fixproto=yes
        ;;
 i[34567]86-*-sysv4*)		# Intel 80386's running system V.4
-	xm_defines="POSIX SMALL_ARG_MAX"
+	xm_defines="SMALL_ARG_MAX"
 	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h i386/sysv4.h i386/sysv4-cpp.h"
 	if test x$stabs = xyes
 	then
@@ -1292,16 +1108,15 @@ i[34567]86-*-sysv4*)		# Intel 80386's running system V.4
 	fi
 	tmake_file="i386/t-crtpic t-svr4"
 	extra_parts="crtbegin.o crtend.o"
+	use_fixproto=yes
 	;;
 i[34567]86-*-udk*)      # Intel x86 on SCO UW/OSR5 Dev Kit
-	xm_defines=POSIX
 	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h i386/sysv4.h i386/sysv5.h i386/udk.h"
 	tmake_file="i386/t-crtpic i386/t-udk t-svr4"
 	extra_parts="crtbegin.o crtend.o"
-	install_headers_dir=install-headers-cpio
+	use_fixproto=yes
 	;;
 i[34567]86-*-sysv*)		# Intel 80386's running system V
-	xm_defines=POSIX
 	if test x$gas = xyes
 	then
 		if test x$stabs = xyes
@@ -1320,67 +1135,58 @@ i[34567]86-*-sysv*)		# Intel 80386's running system V
 		tmake_file=i386/t-crtstuff
 	fi
 	tmake_file="$tmake_file i386/t-crtpic"
+	use_fixproto=yes
 	;;
 i386-*-vsta)			# Intel 80386's running VSTa kernel
-	xm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/xm-vsta.h"
-	tm_file="${tm_file} i386/vsta.h"
+	xm_file="i386/xm-vsta.h"
+	tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/vsta.h"
+	use_fixproto=yes
 	;;
-i[34567]86-*-win32)
-	xm_defines=POSIX
-	xm_file=i386/xm-cygwin.h
-	tmake_file=i386/t-cygwin
-	tm_file="${tm_file} i386/win32.h"
-	extra_objs=winnt.o
-	if test x$enable_threads = xyes; then
-		thread_file='win32'
-	fi
-	exeext=.exe
+i[4567]86-wrs-vxworks)
+	tm_file="${tm_file} i386/sysv4.h i386/unix.h i386/vxworks.h"
+	tmake_file="${tmake_file} i386/t-vxworks"
 	;;
 i[34567]86-*-pe | i[34567]86-*-cygwin*)
-	xm_defines=POSIX
+	tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h dbxcoff.h i386/cygming.h i386/cygwin.h"
 	xm_file=i386/xm-cygwin.h
-	tmake_file=i386/t-cygwin
-	tm_file=i386/cygwin.h
+	tmake_file="i386/t-cygwin i386/t-cygming"
 	extra_objs=winnt.o
+	c_target_objs=cygwin2.o
+	cxx_target_objs=cygwin2.o
+	extra_gcc_objs=cygwin1.o
 	if test x$enable_threads = xyes; then
-		thread_file='win32'
+		thread_file='posix'
 	fi
-	exeext=.exe
 	;;
 i[34567]86-*-mingw32*)
-	tm_file=i386/mingw32.h
-	xm_defines=POSIX
+	tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h dbxcoff.h i386/cygming.h i386/mingw32.h"
 	xm_file=i386/xm-mingw32.h
-	tmake_file="i386/t-cygwin i386/t-mingw32"
+	tmake_file="i386/t-cygming i386/t-mingw32"
 	extra_objs=winnt.o
 	if test x$enable_threads = xyes; then
 		thread_file='win32'
 	fi
-	exeext=.exe
-	case $machine in
+	case ${target} in
 		*mingw32crt*)
 			tm_file="${tm_file} i386/crtdll.h"
 			;;
-		*minwg32msv* | *mingw32*)
+		*mingw32msv* | *mingw32*)
 			;;
 	esac
 	;;
 i[34567]86-*-uwin*)
-	tm_file="i386/cygwin.h i386/uwin.h"
+	tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h dbxcoff.h i386/cygwin.h i386/uwin.h"
 	tmake_file="i386/t-cygwin i386/t-uwin"
 	extra_objs=winnt.o
 	if test x$enable_threads = xyes; then
 		thread_file='win32'
 	fi
-	exeext=.exe
+	use_fixproto=yes
 	;;
 i[34567]86-*-interix3*)
 	tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/i386-interix.h i386/i386-interix3.h interix.h interix3.h"
-	xm_file="i386/xm-i386-interix.h"
-	xm_defines=POSIX
-	tmake_file="t-interix i386/t-interix"
+	tmake_file="i386/t-interix"
 	extra_objs=winnt.o
-	xmake_file="x-interix"
 	if test x$enable_threads = xyes ; then
 		thread_file='posix'
 	fi
@@ -1390,9 +1196,7 @@ i[34567]86-*-interix3*)
 	;;
 i[34567]86-*-interix*)
 	tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/i386-interix.h interix.h"
-	xm_file="i386/xm-i386-interix.h"
-	xm_defines=POSIX
-	tmake_file="t-interix i386/t-interix"
+	tmake_file="i386/t-interix"
 	extra_objs=winnt.o
 	if test x$enable_threads = xyes ; then
 		thread_file='posix'
@@ -1401,30 +1205,16 @@ i[34567]86-*-interix*)
 		tm_file="${tm_file} dbxcoff.h"
 	fi
 	;;
-i960-wrs-vxworks5 | i960-wrs-vxworks5.0*)
-	tm_file="${tm_file} i960/vx960.h"
-	tmake_file=i960/t-vxworks960
-	use_collect2=yes
-	thread_file='vxworks'
-	c_target_objs="i960-c.o"
-	cxx_target_objs="i960-c.o"
-	;;
-i960-wrs-vxworks5* | i960-wrs-vxworks)
-	tm_file="${tm_file} dbxcoff.h i960/i960-coff.h i960/vx960-coff.h"
-	tmake_file=i960/t-vxworks960
-	use_collect2=yes
-	thread_file='vxworks'
-	c_target_objs="i960-c.o"
-	cxx_target_objs="i960-c.o"
-	;;
-i960-wrs-vxworks*)
-	tm_file="${tm_file} i960/vx960.h"
-	tmake_file=i960/t-vxworks960
-	use_collect2=yes
-	thread_file='vxworks'
-	c_target_objs="i960-c.o"
-	cxx_target_objs="i960-c.o"
+i[34567]86-*-kaos*)
+	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h i386/i386elf.h kaos.h i386/kaos-i386.h"
+	tmake_file="i386/t-i386elf t-svr4"
 	;;
+i860-*-sysv4*)
+        tm_file="${tm_file} elfos.h svr4.h i860/sysv4.h"
+        tmake_file="i860/t-i860 i860/t-svr4"
+        extra_parts="crtbegin.o crtend.o"
+	use_fixproto=yes
+        ;;
 i960-*-coff*)
 	tm_file="${tm_file} dbxcoff.h i960/i960-coff.h libgloss.h"
 	tmake_file=i960/t-960bare
@@ -1432,12 +1222,8 @@ i960-*-coff*)
 	cxx_target_objs="i960-c.o"
 	;;
 i960-*-rtems)
-	xm_defines=POSIX
 	tmake_file="i960/t-960bare t-rtems"
 	tm_file="${tm_file} dbxcoff.h i960/i960-coff.h i960/rtems.h rtems.h"
-	if test x$enable_threads = xyes; then
-	  thread_file='rtems'
-	fi
 	c_target_objs="i960-c.o"
 	cxx_target_objs="i960-c.o"
 	;;
@@ -1446,12 +1232,7 @@ i960-*-*)			# Default i960 environment.
 	tmake_file=i960/t-960bare
 	c_target_objs="i960-c.o"
 	cxx_target_objs="i960-c.o"
-	;;
-ia64*-*-aix*)
-	tm_file="${tm_file} dbxelf.h elfos.h svr4.h ia64/sysv4.h ia64/aix.h"
-	tmake_file="ia64/t-ia64 ia64/t-aix"
-	target_cpu_default="MASK_GNU_AS|MASK_GNU_LD"
-	extra_parts="crti.o crtn.o crtbegin.o crtend.o crtbeginS.o crtendS.o"
+	use_fixproto=yes
 	;;
 ia64*-*-elf*)
 	tm_file="${tm_file} dbxelf.h elfos.h ia64/sysv4.h ia64/elf.h"
@@ -1466,6 +1247,7 @@ ia64*-*-elf*)
 		target_cpu_default="${target_cpu_default}|MASK_GNU_LD"
 	fi
 	extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtfastmath.o"
+	use_fixproto=yes
 	;;
 ia64*-*-freebsd*)
 	tm_file="${tm_file} dbxelf.h elfos.h ${fbsd_tm_file} ia64/sysv4.h ia64/freebsd.h"
@@ -1483,7 +1265,7 @@ ia64*-*-linux*)
 	fi
 	;;
 ia64*-*-hpux*)
-	tm_file="${tm_file} dbxelf.h elfos.h svr4.h ia64/sysv4.h ia64/hpux.h ia64/hpux_longdouble.h"
+	tm_file="${tm_file} dbxelf.h elfos.h svr4.h ia64/sysv4.h ia64/hpux.h"
 	tmake_file="ia64/t-ia64 ia64/t-hpux"
 	target_cpu_default="MASK_GNU_AS"
 	case x$enable_threads in
@@ -1494,12 +1276,50 @@ ia64*-*-hpux*)
 	use_collect2=no
 	c_target_objs="ia64-c.o"
 	cxx_target_objs="ia64-c.o"
+	# If we decide to run fixproto we should define FIXPROTO_DEFINES
+	# in ia64/t-hpux, and also fix the definition of putenv in
+	# sys-protos.h (const char not char).
 	;;
 ip2k-*-elf)
-	;;
+	tm_file="elfos.h ${tm_file}"
+	use_fixproto=yes
+	;;
+iq2000*-*-elf*)
+        tm_file="svr4.h elfos.h iq2000/iq2000.h"
+        tmake_file=iq2000/t-iq2000
+        out_file=iq2000/iq2000.c
+        md_file=iq2000/iq2000.md
+	use_fixproto=yes
+        ;;
 m32r-*-elf*)
 	tm_file="dbxelf.h elfos.h svr4.h ${tm_file}"
+	extra_parts="crtinit.o crtfini.o"
+	use_fixproto=yes
+ 	;;
+m32rle-*-elf*)
+	tm_file="dbxelf.h elfos.h svr4.h m32r/little.h ${tm_file}"
 	extra_parts="crtinit.o crtfini.o m32rx/crtinit.o m32rx/crtfini.o"
+	use_fixproto=yes
+	;;
+m32r-*-linux*)
+	tm_file="dbxelf.h elfos.h svr4.h linux.h ${tm_file} m32r/linux.h"
+	extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
+	tmake_file="m32r/t-linux"
+	gnu_ld=yes
+	use_fixproto=yes
+	if test x$enable_threads = xyes; then
+		thread_file='posix'
+	fi
+ 	;;
+m32rle-*-linux*)
+	tm_file="dbxelf.h elfos.h svr4.h linux.h m32r/little.h ${tm_file} m32r/linux.h"
+	extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
+	tmake_file="m32r/t-linux"
+	gnu_ld=yes
+	use_fixproto=yes
+	if test x$enable_threads = xyes; then
+		thread_file='posix'
+	fi
 	;;
 # m68hc11 and m68hc12 share the same machine description.
 m68hc11-*-*|m6811-*-*)
@@ -1508,6 +1328,7 @@ m68hc11-*-*|m6811-*-*)
 	md_file="m68hc11/m68hc11.md"
 	out_file="m68hc11/m68hc11.c"
 	tmake_file="m68hc11/t-m68hc11-gas"
+	use_fixproto=yes
         ;;
 m68hc12-*-*|m6812-*-*)
 	tm_file="m68hc11/m68hc12.h dbxelf.h elfos.h m68hc11/m68hc11.h"
@@ -1515,183 +1336,60 @@ m68hc12-*-*|m6812-*-*)
 	md_file="m68hc11/m68hc11.md"
 	out_file="m68hc11/m68hc11.c"
 	tmake_file="m68hc11/t-m68hc11-gas"
+	use_fixproto=yes
         ;;
-m68000-hp-bsd*)			# HP 9000/200 running BSD
-	tm_file=m68k/hp2bsd.h
-	use_collect2=yes
-	;;
 m68000-hp-hpux*)		# HP 9000 series 300
-	xm_defines=POSIX
+	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
-	;;
-m68000-sun-sunos3*)
-	tm_file=m68k/sun2.h
-	use_collect2=yes
-	;;
-m68000-sun-sunos4*)
-	tm_file=m68k/sun2o4.h
-	use_collect2=yes
-	;;
-m68000-att-sysv*)
-	xm_defines=POSIX
-	if test x$gas = xyes
-	then
-		tm_file=m68k/3b1g.h
-	else
-		tm_file=m68k/3b1.h
-	fi
-	use_collect2=yes
-	;;
-m68k-atari-sysv4*)              # Atari variant of V.4.
-	tm_file=m68k/atari.h
-	xm_defines=POSIX
-	tmake_file=t-svr4
-	extra_parts="crtbegin.o crtend.o"
-	;;
-m68k-apollo-sysv* | m68k-bull-sysv*)
-	# can otherwise be caught by m68k-*-sysv4*
-	echo "*** Configuration $machine not supported" 1>&2
-	exit 1
-	;;
-m68k-motorola-sysv*)
-	tm_file=m68k/mot3300.h
-	xm_defines=POSIX
-	if test x$gas = xyes
-	then
-		if test x$gnu_ld = xyes
-		then
-			tmake_file=m68k/t-mot3300-gald
-		else
-			tmake_file=m68k/t-mot3300-gas
-			use_collect2=yes
-		fi
-	else
-		if test x$gnu_ld = xyes
-		then
-			tmake_file=m68k/t-mot3300-gld
-		else
-			tmake_file=m68k/t-mot3300
-			use_collect2=yes
-		fi
-	fi
-	gdb_needs_out_file_path=yes
-	extra_parts="crt0.o mcrt0.o"
-	;;
-m68k-ncr-sysv*)			# NCR Tower 32 SVR3
-	tm_file=m68k/tower-as.h
-	xm_defines=POSIX
-	extra_parts="crtbegin.o crtend.o"
-	;;
-m68k-plexus-sysv*)
-	tm_file=m68k/plexus.h
-	xm_defines=POSIX
-	use_collect2=yes
-	;;
-m68k-tti-*)
-	tm_file=m68k/pbb.h
-	xm_defines=POSIX
-	;;
-m68k-crds-unos*)
-	xm_defines=POSIX
-	tm_file=m68k/crds.h
-	use_collect2=yes
-	;;
-m68k-cbm-sysv4*)		# Commodore variant of V.4.
-	tm_file=m68k/amix.h
-	xm_defines=POSIX
-	tmake_file=t-svr4
-	extra_parts="crtbegin.o crtend.o"
-	;;
-m68k-ccur-rtu)
-	tm_file=m68k/ccur-GAS.h
-	use_collect2=yes
-	;;
-m68k-hp-bsd4.4*)		# HP 9000/3xx running 4.4bsd
-	tm_file=m68k/hp3bsd44.h
-	use_collect2=yes
-	;;
-m68k-hp-bsd*)			# HP 9000/3xx running Berkeley Unix
-	tm_file=m68k/hp3bsd.h
 	use_collect2=yes
+	use_fixproto=yes
 	;;
 m68k-hp-hpux7*)	# HP 9000 series 300 running HPUX version 7.
-	xm_defines=POSIX
+	tm_file="m68k/hp320base.h m68k/m68k.h m68k/hp320.h"
 	if test x$gas = xyes
 	then
-		xmake_file=m68k/x-hp320g
-		tm_file=m68k/hp320g.h
+		tm_defines="DBX_DEBUGGING_INFO=1 USE_GAS"
 	else
-		xmake_file=m68k/x-hp320
-		tm_file=m68k/hpux7.h
+		tm_defines="NO_DOT_IN_LABEL NO_BUGS"
 	fi
-	install_headers_dir=install-headers-cpio
 	use_collect2=yes
+	use_fixproto=yes
 	;;
 m68k-hp-hpux*)	# HP 9000 series 300
-	xm_defines=POSIX
+	tm_file="m68k/hp320base.h m68k/m68k.h m68k/hp320.h"
 	if test x$gas = xyes
 	then
-		xmake_file=m68k/x-hp320g
-		tm_file=m68k/hp320g.h
-	else
-		xmake_file=m68k/x-hp320
-		tm_file=m68k/hp320.h
-	fi
-	install_headers_dir=install-headers-cpio
-	use_collect2=yes
-	;;
-m68k-sun-mach*)
-	tm_file=m68k/sun3mach.h
-	use_collect2=yes
-	;;
-m68k-sun-sunos3*)
-	if test x$with_fp = xno
-	then
-		tm_file=m68k/sun3n3.h
-	else
-		tm_file=m68k/sun3o3.h
+		tm_defines="DBX_DEBUGGING_INFO=1 USE_GAS"
 	fi
 	use_collect2=yes
-	;;
-m68k-sun-sunos*)			# For SunOS 4 (the default).
-	if test x$with_fp = xno
-	then
-		tm_file=m68k/sun3n.h
-	else
-		tm_file=m68k/sun3.h
-	fi
-	use_collect2=yes
-	;;
-m68k-wrs-vxworks*)
-	tm_file=m68k/vxm68k.h
-	tmake_file=m68k/t-vxworks68
-	thread_file='vxworks'
+	use_fixproto=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"
+	use_fixproto=yes
 	;;
 m68020-*-elf* | m68k-*-elf*)
-	tm_file="m68k/m68k-none.h m68k/m68kelf.h dbxelf.h elfos.h m68k/m68kemb.h m68k/m68020-elf.h"
-	xm_defines=POSIX
+	tm_file="m68k/m68k.h m68k/m68k-none.h m68k/m68kelf.h dbxelf.h elfos.h m68k/m68kemb.h m68k/m68020-elf.h"
+	tm_defines="MOTOROLA USE_GAS"
 	tmake_file=m68k/t-m68kelf
 	extra_parts="crtbegin.o crtend.o"
+	use_fixproto=yes
 	;;
 m68010-*-netbsdelf* | m68k*-*-netbsdelf*)
 	tm_file="${tm_file} dbxelf.h elfos.h netbsd.h netbsd-elf.h m68k/netbsd-elf.h"
-	case $machine in
+	tm_defines="MOTOROLA USE_GAS"
+	case ${target} in
 	m68010*)
 		target_cpu_default="0"
 		;;
@@ -1701,248 +1399,224 @@ m68010-*-netbsdelf* | m68k*-*-netbsdelf*)
 	esac
 	;;
 m68k*-*-netbsd*)
-	tm_file=m68k/netbsd.h
+    if test "x$enable_obsolete" != xyes; then
+      echo "*** Configuration ${target} is obsolete." >&2
+      echo "*** Specify --enable-obsolete to build it anyway." >&2
+      echo "*** Support will be REMOVED in the next major release of GCC," >&2
+      echo "*** unless a maintainer comes forward." >&2
+      exit 1
+    fi
+	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
-	xm_defines=POSIX
+	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"
+	use_fixproto=yes
 	;;
-m68k-*-linux*aout*)		# Motorola m68k's running GNU/Linux
-				# with a.out format
-	tm_file=m68k/linux-aout.h
-	tmake_file="t-linux-aout m68k/t-linux-aout"
-	gnu_ld=yes
-	;;
-m68k-*-linux*libc1)		# Motorola m68k's running GNU/Linux
-				# with ELF format using the
-				# GNU/Linux C library 5
-	tm_file=m68k/linux.h
-	tmake_file="t-slibgcc-elf-ver t-linux t-linux-gnulibc1 m68k/t-linux"
-	extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-	gnu_ld=yes
+m68k-*-uclinux*)		# Motorola m68k/ColdFire running uClinux with uClibc
+	tm_file="m68k/m68k.h m68k/m68k-none.h m68k/m68kelf.h dbxelf.h elfos.h m68k/uclinux.h"
+ 	tm_defines="MOTOROLA USE_GAS"
+	tmake_file=m68k/t-uclinux
+	use_fixproto=no
 	;;
 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
-	tmake_file="t-slibgcc-elf-ver t-linux m68k/t-linux"
-	;;
-m68k-*-psos*)
-	tmake_file=m68k/t-m68kbare
-	tm_file=m68k/m68k-psos.h
-	;;
-m68k-*-rtemscoff*)	# would otherwise be caught by m68k-*-rtems*
-	echo "*** Configuration $machine not supported" 1>&2
-	exit 1
+	tm_file="m68k/m68k.h dbxelf.h elfos.h svr4.h linux.h m68k/linux.h"
+	tm_defines="MOTOROLA USE_GAS"
+	tmake_file="t-slibgcc-elf-ver t-linux"
+	# if not configured with --enable-sjlj-exceptions, bump the
+	# libgcc version number
+	if test x$sjlj != x1; then
+	    tmake_file="$tmake_file m68k/t-slibgcc-elf-ver"
+	fi
 	;;
 m68k-*-rtems*)
-	xm_defines=POSIX
 	tmake_file="m68k/t-m68kbare m68k/t-crtstuff t-rtems m68k/t-rtems"
-	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"
+	tm_defines="MOTOROLA USE_GAS"
 	extra_parts="crtbegin.o crtend.o"
-	if test x$enable_threads = xyes; then
-	  thread_file='rtems'
-	fi
-	;;
-m88k-*-aout*)
-	xm_defines=POSIX
-	tm_file=m88k/m88k-aout.h
-	;;
-m88k-*-openbsd*)
-	tmake_file="${tmake_file} m88k/t-luna-gas"
-	tm_file="m88k/aout-dbx.h aoutos.h m88k/m88k.h openbsd.h ${tm_file}"
-	;;
-m88k-*-sysv4*)
-	xm_defines=POSIX
-	tm_file="dbxelf.h elfos.h svr4.h m88k/sysv4.h"
-	extra_parts="crtbegin.o crtend.o"
-	tmake_file=m88k/t-sysv4
 	;;
 mcore-*-elf)
 	tm_file="dbxelf.h elfos.h svr4.h ${tm_file} mcore/mcore-elf.h"
 	tmake_file=mcore/t-mcore
+	use_fixproto=yes
 	;;
 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
+	use_fixproto=yes
 	;;
-mips-sgi-irix6*o32)		# SGI System V.4., IRIX 6, O32 ABI
+mips-sgi-irix6*)		# SGI System V.4., IRIX 6
+	tm_file="${tm_file} mips/iris5.h mips/iris6.h"
+	tmake_file="mips/t-iris mips/t-iris5-6 mips/t-iris6"
 	if test x$gas = xyes
 	then
-		tm_file="mips/iris5.h mips/iris5gas.h mips/iris6-o32-gas.h"
-		if test x$stabs = xyes
-		then
-			tm_file="${tm_file} dbx.h mips/dbxmdebug.h"
-		fi
-		tmake_file=mips/t-iris5-gas
-	else
-		tm_file="mips/iris5.h mips/iris6-o32-as.h"
-		tmake_file=mips/t-iris5-as
+		tm_file="${tm_file} mips/iris6gas.h"
 	fi
-	tm_file="${tm_file} mips/iris6-o32.h"
-	tmake_file="${tmake_file} mips/t-iris mips/t-iris5-6"
-	xm_defines=POSIX
-	xm_file=mips/xm-iris5.h
-	# mips-tfile doesn't work yet
-	# See comment in mips/iris5.h file.
-	use_collect2=yes
-#	if test x$enable_threads = xyes; then
-#		thread_file='irix'
-#	fi
-	;;
-mips-sgi-irix6*)		# SGI System V.4., IRIX 6
 	if test "x$gnu_ld" = xyes
 	then
-		tm_file="mips/iris6.h mips/iris6gld.h"
-	else
-		tm_file=mips/iris6.h
+		tm_file="${tm_file} mips/iris6gld.h"
+		tmake_file="$tmake_file mips/t-irix-gld"
+	fi
+	target_cpu_default="MASK_ABICALLS|MASK_FLOAT64|MASK_64BIT"
+	tm_defines="MIPS_ISA_DEFAULT=3 MIPS_ABI_DEFAULT=ABI_N32"
+	# See comment in mips/iris5.h file.  Only enabled for O32 ABI
+	# without GNU as.
+	if test x$gas = xno
+	then
+		use_collect2=yes
 	fi
-	tmake_file="mips/t-iris mips/t-iris5-6 mips/t-iris6"
-	xm_defines=POSIX
 #	if test x$enable_threads = xyes; then
 #		thread_file='irix'
 #	fi
-	;;
-mips-wrs-vxworks)
-	tm_file="${tm_file} mips/elf.h mips/vxworks.h"
-	tmake_file=mips/t-ecoff
-	gas=yes
-	gnu_ld=yes
-	extra_parts="crtbegin.o crtend.o"
-	thread_file='vxworks'
+	use_fixproto=yes
 	;;
 mips-sgi-irix5cross64)		# Irix5 host, Irix 6 target, cross64
-	tm_file="mips/iris6.h mips/cross64.h"
-	xm_defines=POSIX
-	xm_file=mips/xm-iris5.h
+	tm_file="${tm_file} mips/iris5.h mips/iris6.h mips/cross64.h"
 	tmake_file="mips/t-iris mips/t-cross64"
+	target_cpu_default="MASK_ABICALLS|MASK_FLOAT64|MASK_64BIT"
+	tm_defines="MIPS_ISA_DEFAULT=3 MIPS_ABI_DEFAULT=ABI_N32"
 	# See comment in mips/iris[56].h files.
 	use_collect2=yes
 #	if test x$enable_threads = xyes; then
 #		thread_file='irix'
 #	fi
+	use_fixproto=yes
 	;;
-mips-sni-sysv4)
-	if test x$gas = xyes
-	then
-		if test x$stabs = xyes
-		then
-			tm_file=mips/iris5gdb.h
-		else
-			tm_file="mips/sni-svr4.h mips/sni-gas.h"
-		fi
-	else
-		tm_file=mips/sni-svr4.h
-	fi
-	xm_defines=POSIX
-        if test x$gnu_ld != xyes
-        then
-                use_collect2=yes
-        fi
-        ;;
 mips-sgi-irix5*)		# SGI System V.4., IRIX 5
+	tm_file="${tm_file} mips/iris5.h"
 	if test x$gas = xyes
 	then
-		tm_file="mips/iris5.h mips/iris5gas.h"
+		tm_file="${tm_file} mips/sdb.h mips/iris5gas.h"
 		if test x$stabs = xyes
 		then
 			tm_file="${tm_file} dbx.h mips/dbxmdebug.h"
 		fi
 		tmake_file=mips/t-iris5-gas
 	else
-		tm_file=mips/iris5.h
 		tmake_file=mips/t-iris5-as
 	fi
+	if test "x$gnu_ld" = xyes
+	then
+		tm_file="${tm_file} mips/iris5gld.h"
+		tmake_file="$tmake_file mips/t-irix-gld"
+	fi
 	tmake_file="${tmake_file} mips/t-iris mips/t-iris5-6"
-	xm_defines=POSIX
-	xm_file=mips/xm-iris5.h
+	target_cpu_default="MASK_ABICALLS"
 	# mips-tfile doesn't work yet
 	# See comment in mips/iris5.h file.
-	use_collect2=yes
+	if test x$gas = xno
+	then
+		use_collect2=yes
+	fi
 #	if test x$enable_threads = xyes; then
 #		thread_file='irix'
 #	fi
-	;;
-mips-sgi-*)	# would otherwise be caught by mips-*-elf*
-	echo "*** Configuration $machine not supported" 1>&2
-	exit 1
+	use_fixproto=yes
 	;;
 mips*-*-netbsd*)			# NetBSD/mips, either endian.
 	target_cpu_default="MASK_GAS|MASK_ABICALLS"
-	tm_file="elfos.h ${tm_file} mips/netbsd.h"
-	tmake_file="${tmake_file} mips/t-netbsd"
+	tm_file="elfos.h ${tm_file} mips/elf.h netbsd.h netbsd-elf.h mips/netbsd.h"
+	;;
+mips64*-*-linux*)
+	tm_file="dbxelf.h elfos.h svr4.h linux.h ${tm_file} mips/linux.h mips/linux64.h"
+	tmake_file="t-slibgcc-elf-ver t-linux mips/t-linux64"
+
+	# This default ABI is a partial lie: t-linux64 overrides the
+	# DRIVER_SELF_SPEC that sets the default abi, in the spec file
+	# that is installed.  What GCC thinks of as the default must
+	# remain as ABI_32 such that the SONAMEs of the libgcc shared
+	# libraries remain compatible with those of mips-linux-gnu.
+	tm_defines="MIPS_ISA_DEFAULT=1 MIPS_ABI_DEFAULT=ABI_32"
+	target_cpu_default="MASK_ABICALLS|MASK_FLOAT64|MASK_64BIT"
+	extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o"
+	gnu_ld=yes
+	gas=yes
 	;;
 mips*-*-linux*)				# Linux MIPS, either endian.
         tm_file="dbxelf.h elfos.h svr4.h linux.h ${tm_file} mips/linux.h"
-	case $machine in
+	case ${target} in
         mipsisa32*-*)
                 target_cpu_default="MASK_SOFT_FLOAT"
 		tm_defines="MIPS_ISA_DEFAULT=32"
                 ;;
         esac
-	tmake_file="t-slibgcc-elf-ver t-linux mips/t-linux"
-	;;
-mips*el-*-openbsd*)	# mips little endian
-	target_cpu_default="MASK_GAS|MASK_ABICALLS"
+	tmake_file="t-slibgcc-elf-ver t-linux"
 	;;
-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-*-ecoff* | mipsel-*-ecoff*)
-	if test x$stabs = xyes; then
-		tm_file="${tm_file} dbx.h"
-	fi
-	tmake_file=mips/t-ecoff
+	tm_file="mips/mips.h openbsd.h mips/openbsd.h mips/sdb.h"
+	case ${target} 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"
 	tmake_file=mips/t-isa3264
-	tm_defines="MIPS_ISA_DEFAULT=32 MIPS_ABI_DEFAULT=ABI_MEABI"
+	tm_defines="MIPS_ISA_DEFAULT=32 MIPS_ABI_DEFAULT=ABI_EABI"
+	use_fixproto=yes
+	;;
+mipsisa32r2-*-elf* | mipsisa32r2el-*-elf*)
+	tm_file="${tm_file} mips/elf.h"
+	tmake_file=mips/t-isa3264
+	tm_defines="MIPS_ISA_DEFAULT=33 MIPS_ABI_DEFAULT=ABI_EABI"
+	use_fixproto=yes
 	;;
 mipsisa64-*-elf* | mipsisa64el-*-elf*)
 	tm_file="${tm_file} mips/elf.h"
 	tmake_file=mips/t-isa3264
 	target_cpu_default="MASK_64BIT|MASK_FLOAT64|MASK_GAS"
-	tm_defines="MIPS_ISA_DEFAULT=64 MIPS_ABI_DEFAULT=ABI_MEABI"
+	tm_defines="MIPS_ISA_DEFAULT=64 MIPS_ABI_DEFAULT=ABI_EABI"
+	use_fixproto=yes
 	;;
 mipsisa64sr71k-*-elf*)
         tm_file="${tm_file} mips/elf.h"
         tmake_file=mips/t-sr71k
 	target_cpu_default="MASK_64BIT|MASK_FLOAT64|MASK_GAS"
-	tm_defines="MIPS_ISA_DEFAULT=64 MIPS_CPU_STRING_DEFAULT=\\\"sr71000\\\" MIPS_ABI_DEFAULT=ABI_MEABI"
+	tm_defines="MIPS_ISA_DEFAULT=64 MIPS_CPU_STRING_DEFAULT=\\\"sr71000\\\" MIPS_ABI_DEFAULT=ABI_EABI"
+	use_fixproto=yes
         ;;
 mipsisa64sb1-*-elf* | mipsisa64sb1el-*-elf*)
 	tm_file="${tm_file} mips/elf.h"
 	tmake_file=mips/t-elf
 	target_cpu_default="MASK_64BIT|MASK_FLOAT64|MASK_GAS"
 	tm_defines="MIPS_ISA_DEFAULT=64 MIPS_CPU_STRING_DEFAULT=\\\"sb1\\\" MIPS_ABI_DEFAULT=ABI_O64"
+	use_fixproto=yes
 	;;
 mips-*-elf* | mipsel-*-elf*)
 	tm_file="${tm_file} mips/elf.h"
 	tmake_file=mips/t-elf
+	use_fixproto=yes
 	;;
 mips64-*-elf* | mips64el-*-elf*)
 	tm_file="${tm_file} mips/elf64.h"
 	tmake_file=mips/t-elf
 	target_cpu_default="MASK_64BIT|MASK_FLOAT64|MASK_GAS"
 	tm_defines="MIPS_ISA_DEFAULT=3 MIPS_ABI_DEFAULT=ABI_O64"
+	use_fixproto=yes
 	;;
 mips64vr-*-elf* | mips64vrel-*-elf*)
         tm_file="mips/vr.h ${tm_file} mips/elf64.h"
         tm_defines="MIPS_ABI_DEFAULT=ABI_O64 MIPS_MARCH_CONTROLS_SOFT_FLOAT=1"
         tmake_file=mips/t-vr
+	use_fixproto=yes
         ;;
 mips64orion-*-elf* | mips64orionel-*-elf*)
 	tm_file="${tm_file} mips/elforion.h mips/elf64.h"
@@ -1950,39 +1624,33 @@ mips64orion-*-elf* | mips64orionel-*-elf*)
 	tmake_file=mips/t-elf
 	target_cpu_default="MASK_64BIT|MASK_FLOAT64|MASK_GAS"
 	tm_defines="MIPS_ISA_DEFAULT=3 MIPS_ABI_DEFAULT=ABI_O64"
-	;;
-mips64orion-*-rtems*)
-	xm_defines=POSIX
-	tm_file="${tm_file} mips/elforion.h mips/elf64.h mips/rtems64.h rtems.h"
-	tmake_file="mips/t-elf t-rtems"
-	tmake_file=mips/t-elf
-	target_cpu_default="MASK_64BIT|MASK_FLOAT64|MASK_GAS"
-	tm_defines="MIPS_ISA_DEFAULT=3 MIPS_ABI_DEFAULT=ABI_O64"
-	if test x$enable_threads = xyes; then
-	  thread_file='rtems'
-	fi
+	use_fixproto=yes
 	;;
 mips*-*-rtems*)
-	xm_defines=POSIX
 	tm_file="${tm_file} mips/elf.h mips/rtems.h rtems.h"
 	tmake_file="mips/t-elf t-rtems mips/t-rtems"
-	if test x$enable_threads = xyes; then
-	  thread_file='rtems'
-	fi
+	;;
+mips-wrs-vxworks)
+	# We want vxworks.h after mips/elf.h, which unfortunately means we
+	# have to redo the tm_file list from scratch.
+	tm_file="elfos.h mips/mips.h svr4.h mips/elf.h vxworks.h mips/vxworks.h"
+	tmake_file="${tmake_file} mips/t-vxworks"
+	target_cpu_default="MASK_GAS"
+	;;
+mips-wrs-windiss)	# Instruction-level simulator for VxWorks.
+	xm_defines=POSIX
+	tm_file="elfos.h mips/mips.h svr4.h mips/elf.h windiss.h mips/windiss.h"
+	tmake_file="${tmake_file} mips/t-elf"
+	target_cpu_default="MASK_GAS"
+	thread_file=
 	;;
 mipstx39-*-elf* | mipstx39el-*-elf*)
 	tm_file="${tm_file} mips/r3900.h mips/elf.h"
 	tmake_file=mips/t-r3900
+	use_fixproto=yes
 	;;
 mmix-knuth-mmixware)
-	;;
-mn10200-*-*)
-	tm_file="dbxelf.h elfos.h svr4.h ${tm_file}"
-	if test x$stabs = xyes
-	then
-		tm_file="${tm_file} dbx.h"
-	fi
-	use_collect2=no
+	need_64bit_hwint=yes
 	;;
 mn10300-*-*)
 	tm_file="dbxelf.h elfos.h svr4.h ${tm_file}"
@@ -1991,9 +1659,10 @@ mn10300-*-*)
 		tm_file="${tm_file} dbx.h"
 	fi
 	use_collect2=no
+	use_fixproto=yes
 	;;
 ns32k-*-netbsdelf*)
-	echo "GCC does not yet support the ${machine} target"; exit 1
+	echo "GCC does not yet support the ${target} target"; exit 1
 	;;
 ns32k-*-netbsd*)
 	tm_file="${tm_file} netbsd.h netbsd-aout.h ns32k/netbsd.h"
@@ -2004,252 +1673,188 @@ ns32k-*-netbsd*)
 	;;
 pdp11-*-bsd)
 	tm_file="${tm_file} pdp11/2bsd.h"
+	use_fixproto=yes
         ;;
 pdp11-*-*)
+	use_fixproto=yes
 	;;
 avr-*-*)
+	use_fixproto=yes
 	;;
-ns32k-*-openbsd*)
-	# Nothing special
-	;;
-romp-*-openbsd*)
-	# Nothing special
-	;;
-powerpc-*-openbsd*)
-	tmake_file="${tmake_file} rs6000/t-rs6000 rs6000/t-openbsd"
-	extra_headers=
-	;;
+# port not yet contributed
+#powerpc-*-openbsd*)
+#	tmake_file="${tmake_file} rs6000/t-fprules "
+#	extra_headers=
+#	;;
 powerpc64-*-linux*)
-	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/linux64.h"
-	out_file=rs6000/rs6000.c
-	tmake_file="rs6000/t-rs6000 t-slibgcc-elf-ver t-linux rs6000/t-linux64"
+	tm_file="rs6000/biarch64.h ${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h"
+	case x$with_cpu in
+	x|xpowerpc64|xdefault64) tm_file="${tm_file} rs6000/default64.h";;
+	esac
+	tm_file="${tm_file} rs6000/linux64.h"
+	tmake_file="rs6000/t-fprules t-slibgcc-elf-ver t-linux rs6000/t-ppccomm rs6000/t-linux64"
 	;;
 powerpc64-*-gnu*)
 	tm_file="${cpu_type}/${cpu_type}.h elfos.h svr4.h freebsd-spec.h gnu.h rs6000/sysv4.h rs6000/linux64.h rs6000/gnu.h"
-	out_file=rs6000/rs6000.c
-	tmake_file="rs6000/t-rs6000 t-slibgcc-elf-ver t-gnu rs6000/t-linux64"
+	tmake_file="rs6000/t-fprules t-slibgcc-elf-ver t-gnu rs6000/t-linux64"
 	;;
 powerpc-*-beos*)
 	tm_file="${tm_file} rs6000/aix.h rs6000/beos.h rs6000/xcoff.h"
-	xm_defines=POSIX
-	tmake_file=rs6000/t-beos
+	tmake_file="rs6000/t-fprules rs6000/t-beos"
 	extra_headers=
+	use_fixproto=yes
 	;;
 powerpc-*-darwin*)
-	tm_file="${tm_file} darwin.h rs6000/darwin.h"
-	tm_p_file="${tm_p_file} darwin-protos.h"
-	tmake_file="rs6000/t-rs6000 t-darwin rs6000/t-darwin"
-	extra_objs="darwin.o"
-	target_gtfiles="\$(srcdir)/config/darwin.c"
-	c_target_objs="darwin-c.o"
-	cxx_target_objs="darwin-c.o"
-	extra_parts="crt2.o"
-	# Darwin linker does collect2 functionality
-	use_collect2=no
+	tm_file="${tm_file} rs6000/darwin.h"
+	tmake_file="t-darwin t-slibgcc-darwin rs6000/t-darwin"
 	extra_headers=altivec.h
 	;;
 powerpc*-*-freebsd*)
 	tm_file="${tm_file} dbxelf.h elfos.h ${fbsd_tm_file} rs6000/sysv4.h rs6000/freebsd.h"
-	xm_file=rs6000/xm-sysv4.h
-	out_file=rs6000/rs6000.c
-	tmake_file="rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"
-	;;
-powerpc-*-sysv*)
-	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h"
-	xm_defines=POSIX
-	tmake_file="rs6000/t-ppcos rs6000/t-ppccomm"
+	tmake_file="rs6000/t-fprules rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"
 	;;
 powerpc-*-netbsd*)
 	tm_file="${tm_file} dbxelf.h elfos.h netbsd.h netbsd-elf.h freebsd-spec.h rs6000/sysv4.h rs6000/netbsd.h"
 	tmake_file="${tmake_file} rs6000/t-netbsd"
 	;;
 powerpc-*-chorusos*)
-	xm_defines=POSIX
 	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h chorus.h"
-	tmake_file="rs6000/t-ppcos rs6000/t-ppccomm"
-	case x${enable_threads} in
-	  xyes | xpthreads | xposix)
-		thread_file='posix'
-		;;
+	tmake_file="rs6000/t-fprules rs6000/t-ppcos rs6000/t-ppccomm"
+	case ${enable_threads} in
+	  yes | posix)
+	    thread_file='posix'
+	    ;;
 	esac
-	;;
-powerpc-*-eabiaix*)
-	xm_defines=POSIX
-	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rs6000/eabiaix.h"
-	tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
+	use_fixproto=yes
 	;;
 powerpc-*-eabispe*)
-	xm_defines=POSIX
 	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rs6000/eabispe.h"
-	tmake_file="rs6000/t-ppcendian rs6000/t-ppccomm"
+	tmake_file="rs6000/t-spe rs6000/t-ppccomm"
 	;;
 powerpc-*-eabisimaltivec*)
-	xm_defines=POSIX
 	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rs6000/eabisim.h rs6000/eabialtivec.h"
-	tmake_file="rs6000/t-ppcendian rs6000/t-ppccomm"
+	tmake_file="rs6000/t-fprules rs6000/t-ppcendian rs6000/t-ppccomm"
 	;;
 powerpc-*-eabisim*)
-	xm_defines=POSIX
 	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rs6000/eabisim.h"
-	tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
+	tmake_file="rs6000/t-fprules rs6000/t-ppcgas rs6000/t-ppccomm"
 	;;
 powerpc-*-elf*)
-	xm_defines=POSIX
 	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h"
-	tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
+	tmake_file="rs6000/t-fprules rs6000/t-ppcgas rs6000/t-ppccomm"
+	use_fixproto=yes
 	;;
 powerpc-*-eabialtivec*)
-	xm_defines=POSIX
 	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rs6000/eabialtivec.h"
-	tmake_file="rs6000/t-ppcendian rs6000/t-ppccomm"
+	tmake_file="rs6000/t-fprules rs6000/t-ppcendian rs6000/t-ppccomm"
 	;;
 powerpc-*-eabi*)
-	xm_defines=POSIX
 	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h"
-	tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
+	tmake_file="rs6000/t-fprules rs6000/t-ppcgas rs6000/t-ppccomm"
 	;;
 powerpc-*-rtems*)
-	xm_defines=POSIX
 	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rs6000/rtems.h rtems.h"
-	tmake_file="rs6000/t-rtems t-rtems rs6000/t-ppccomm"
-	if test x$enable_threads = xyes; then
-	  thread_file='rtems'
-	fi
+	tmake_file="rs6000/t-fprules rs6000/t-rtems t-rtems rs6000/t-ppccomm"
 	;;
-powerpc-*-linux*libc1)
-	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/linux.h"
-	out_file=rs6000/rs6000.c
-	tmake_file="rs6000/t-ppcos t-slibgcc-elf-ver t-linux t-linux-gnulibc1 rs6000/t-ppccomm"
-	if test x$enable_threads = xyes; then
-		thread_file='posix'
-	fi
-	;;
-powerpc-*-linux-gnualtivec*)
+powerpc-*-linux*altivec*)
 	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/linux.h rs6000/linuxaltivec.h"
-	out_file=rs6000/rs6000.c
-	tmake_file="rs6000/t-ppcos t-slibgcc-elf-ver t-linux rs6000/t-ppccomm"
+	tmake_file="rs6000/t-fprules rs6000/t-ppcos t-slibgcc-elf-ver t-linux rs6000/t-ppccomm"
+	;;
+powerpc-*-linux*spe*)
+	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/linux.h rs6000/linuxspe.h"
+	tmake_file="rs6000/t-fprules rs6000/t-ppcos t-slibgcc-elf-ver t-linux rs6000/t-ppccomm"
 	;;
 powerpc-*-linux*)
 	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/linux.h"
-	out_file=rs6000/rs6000.c
-	tmake_file="rs6000/t-ppcos t-slibgcc-elf-ver t-linux rs6000/t-ppccomm"
+	tmake_file="rs6000/t-fprules rs6000/t-ppcos t-slibgcc-elf-ver t-linux rs6000/t-ppccomm"
 	;;
 powerpc-*-gnu-gnualtivec*)
 	tm_file="${cpu_type}/${cpu_type}.h elfos.h svr4.h freebsd-spec.h gnu.h rs6000/sysv4.h rs6000/linux.h rs6000/linuxaltivec.h rs6000/gnu.h"
-	out_file=rs6000/rs6000.c
-	tmake_file="rs6000/t-ppcos t-slibgcc-elf-ver t-gnu rs6000/t-ppccomm"
+	tmake_file="rs6000/t-fprules rs6000/t-ppcos t-slibgcc-elf-ver t-gnu rs6000/t-ppccomm"
 	if test x$enable_threads = xyes; then
 		thread_file='posix'
 	fi
 	;;
 powerpc-*-gnu*)
 	tm_file="${cpu_type}/${cpu_type}.h elfos.h svr4.h freebsd-spec.h gnu.h rs6000/sysv4.h rs6000/linux.h rs6000/gnu.h"
-	out_file=rs6000/rs6000.c
-	tmake_file="rs6000/t-ppcos t-slibgcc-elf-ver t-gnu rs6000/t-ppccomm"
+	tmake_file="rs6000/t-fprules rs6000/t-ppcos t-slibgcc-elf-ver t-gnu rs6000/t-ppccomm"
 	if test x$enable_threads = xyes; then
 		thread_file='posix'
 	fi
 	;;
 powerpc-wrs-vxworks*)
-	xm_defines=POSIX
-        tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/vxppc.h"
-        tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
-	thread_file='vxworks'
-        ;;
-powerpc-wrs-windiss*)
-        xm_defines=POSIX
+	# We want vxworks.h after rs6000/sysv4.h, which unfortunately
+	# means we have to redo the tm_file list from scratch.
+	tm_file="rs6000/rs6000.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h"
+	tm_file="${tm_file} vxworks.h rs6000/vxworks.h"
+	tmake_file="${tmake_file} rs6000/t-fprules rs6000/t-ppccomm rs6000/t-vxworks"
+	extra_headers=ppc-asm.h
+	;;
+powerpc-wrs-windiss*)	# Instruction-level simulator for VxWorks.
 	tm_file="${tm_file} elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/windiss.h"
-        tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
+        tmake_file="rs6000/t-fprules rs6000/t-ppcgas rs6000/t-ppccomm"
         thread_file=""
-        ;;
-powerpcle-wrs-vxworks*)
-	xm_defines=POSIX
-        tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/sysv4le.h rs6000/vxppc.h"
-        tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
-	thread_file='vxworks'
+	use_fixproto=yes
         ;;
 powerpcle-*-sysv*)
 	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/sysv4le.h"
-	xm_defines=POSIX
-	tmake_file="rs6000/t-ppcos rs6000/t-ppccomm"
+	tmake_file="rs6000/t-fprules rs6000/t-ppcos rs6000/t-ppccomm"
+	use_fixproto=yes
 	;;
 powerpcle-*-elf*)
-	xm_defines=POSIX
 	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/sysv4le.h"
-	tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
+	tmake_file="rs6000/t-fprules rs6000/t-ppcgas rs6000/t-ppccomm"
+	use_fixproto=yes
 	;;
 powerpcle-*-eabisim*)
-	xm_defines=POSIX
 	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/sysv4le.h rs6000/eabi.h rs6000/eabisim.h"
-	tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
+	tmake_file="rs6000/t-fprules rs6000/t-ppcgas rs6000/t-ppccomm"
 	;;
 powerpcle-*-eabi*)
-	xm_defines=POSIX
 	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/sysv4le.h rs6000/eabi.h"
-	tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
+	tmake_file="rs6000/t-fprules rs6000/t-ppcgas rs6000/t-ppccomm"
 	;;
-rs6000-ibm-aix3.[01]*)
-	xm_defines=POSIX
-	tm_file="${tm_file} rs6000/aix.h rs6000/aix31.h rs6000/xcoff.h"
-	use_collect2=yes
+powerpc-*-kaos*)
+	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h kaos.h rs6000/kaos-ppc.h"
+	tmake_file="rs6000/t-fprules rs6000/t-ppcgas rs6000/t-ppccomm"
 	;;
-rs6000-ibm-aix3.2.[456789]* | powerpc-ibm-aix3.2.[456789]*)
-	xm_defines=POSIX
-	tm_file="${tm_file} rs6000/aix.h rs6000/aix3newas.h rs6000/xcoff.h"
-	tmake_file=rs6000/t-newas
-	use_collect2=yes
-	extra_headers=
+powerpcle-*-kaos*)
+	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/sysv4le.h kaos.h rs6000/kaos-ppc.h"
+	tmake_file="rs6000/t-fprules rs6000/t-ppcgas rs6000/t-ppccomm"
 	;;
 rs6000-ibm-aix4.[12]* | powerpc-ibm-aix4.[12]*)
-	xm_defines=POSIX
 	tm_file="${tm_file} rs6000/aix.h rs6000/aix41.h rs6000/xcoff.h"
-	tmake_file=rs6000/t-newas
+	tmake_file="rs6000/t-fprules rs6000/t-newas"
 	use_collect2=yes
 	extra_headers=
+	use_fixproto=yes
 	;;
 rs6000-ibm-aix4.[3456789]* | powerpc-ibm-aix4.[3456789]*)
-	xm_defines=POSIX
-	tm_file="${tm_file} rs6000/aix.h rs6000/aix43.h rs6000/xcoff.h"
+	tm_file="rs6000/biarch64.h ${tm_file} rs6000/aix.h rs6000/aix43.h rs6000/xcoff.h"
 	tmake_file=rs6000/t-aix43
 	use_collect2=yes
 	thread_file='aix'
 	extra_headers=
 	;;
 rs6000-ibm-aix5.1.* | powerpc-ibm-aix5.1.*)
-	xm_defines=POSIX
-	tm_file="${tm_file} rs6000/aix.h rs6000/aix51.h rs6000/xcoff.h"
+	tm_file="rs6000/biarch64.h ${tm_file} rs6000/aix.h rs6000/aix51.h rs6000/xcoff.h"
 	tmake_file=rs6000/t-aix43
 	use_collect2=yes
 	thread_file='aix'
 	extra_headers=
 	;;
 rs6000-ibm-aix[56789].* | powerpc-ibm-aix[56789].*)
-	xm_defines=POSIX
 	tm_file="${tm_file} rs6000/aix.h rs6000/aix52.h rs6000/xcoff.h"
 	tmake_file=rs6000/t-aix52
 	use_collect2=yes
 	thread_file='aix'
 	extra_headers=
 	;;
-rs6000-ibm-aix*)
-	xm_defines=POSIX
-	tm_file="${tm_file} rs6000/aix.h rs6000/xcoff.h"
-	use_collect2=yes
-	;;
-rs6000-bull-bosx)
-	xm_defines=POSIX
-	tm_file="${tm_file} rs6000/aix.h rs6000/xcoff.h"
-	use_collect2=yes
-	;;
-rs6000-*-mach*)
-	tm_file="${tm_file} rs6000/mach.h"
-	xm_defines=POSIX
-	use_collect2=yes
-	;;
 rs6000-*-lynxos*)
-	tm_file="lynx.h rs6000/lynx.h"
-	tmake_file=rs6000/t-rs6000
+	tm_file="svr3.h lynx.h rs6000/lynxbase.h rs6000/rs6000.h rs6000/lynx.h"
+	tmake_file=rs6000/t-fprules
 	use_collect2=yes
+	use_fixproto=yes
 	;;
 s390-*-linux*)
 	tm_file="s390/s390.h dbxelf.h elfos.h svr4.h linux.h s390/linux.h"
@@ -2263,16 +1868,25 @@ s390x-*-linux*)
 	out_file=s390/s390.c
 	tmake_file="t-slibgcc-elf-ver t-linux s390/t-crtstuff s390/t-linux64"
 	;;
-sh-*-elf* | sh[2346l]*-*-elf*)
+s390x-ibm-tpf*)
+	tm_file="s390/s390x.h s390/s390.h dbxelf.h elfos.h svr4.h s390/tpf.h"
+	tm_p_file=s390/s390-protos.h
+	md_file=s390/s390.md
+	extra_modes=s390/s390-modes.def
+	extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o"
+	out_file=s390/s390.c
+	tmake_file="t-slibgcc-elf-ver s390/t-crtstuff s390/t-tpf"
+	;;
+sh-*-elf* | sh[2346l]*-*-elf* | sh*-*-kaos*)
 	tmake_file="sh/t-sh sh/t-elf"
-	case $machine in
+	case ${target} in
 	shl* | sh64l*)
 		tm_file="sh/little.h ${tm_file}"
 		tmake_file="${tmake_file} sh/t-le"
 		;;
 	esac
-	tm_file="${tm_file} dbxelf.h elfos.h svr4.h sh/embed-elf.h"
-	case $machine in
+	tm_file="${tm_file} dbxelf.h elfos.h svr4.h sh/elf.h sh/embed-elf.h"
+	case ${target} in
 	sh64*)
 		tmake_file="${tmake_file} sh/t-sh64"
 		tm_file="${tm_file} sh/sh64.h"
@@ -2282,31 +1896,28 @@ sh-*-elf* | sh[2346l]*-*-elf*)
 	sh4*)  target_cpu_default="SELECT_SH4" ;;
 	sh3e*) target_cpu_default="SELECT_SH3E" ;;
 	sh3*)  target_cpu_default="SELECT_SH3" ;;
+	sh2e*) target_cpu_default="SELECT_SH2E" ;;
 	sh2*)  target_cpu_default="SELECT_SH2" ;;
 	esac
-	case $machine in
+	case ${target} in
 	sh[234]*) tmake_file="${tmake_file} sh/t-monolib" ;;
 	esac
+	case ${target} in
+	sh*-*-kaos*) tm_file="${tm_file} kaos.h sh/kaos-sh.h" ;;
+	esac
+	use_fixproto=yes
 	;;
-sh-*-rtemself*)
-	xm_defines=POSIX
-	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"
-	if test x$enable_threads = xyes; then
-	  thread_file='rtems'
-	fi
+sh-*-rtemscoff*)
+	tmake_file="sh/t-sh t-rtems"
+	tm_file="${tm_file} dbxcoff.h sh/coff.h sh/rtems.h rtems.h"
 	;;
 sh-*-rtems*)
-	xm_defines=POSIX
-	tmake_file="sh/t-sh t-rtems"
-	tm_file="${tm_file} sh/coff.h sh/rtems.h rtems.h"
-	if test x$enable_threads = xyes; then
-	  thread_file='rtems'
-	fi
+	tmake_file="sh/t-sh sh/t-elf t-rtems"
+	tm_file="${tm_file} dbxelf.h elfos.h svr4.h sh/elf.h sh/embed-elf.h sh/rtemself.h rtems.h"
 	;;
 sh-*-linux* | sh[2346lbe]*-*-linux*)
-	tmake_file="sh/t-sh sh/t-elf"
-	case $machine in
+	tmake_file="sh/t-sh sh/t-elf t-slibgcc-elf-ver t-linux"
+	case ${target} in
 	sh*be-*-* | sh*eb-*-*) ;;
 	*)
 		tm_file="sh/little.h ${tm_file}"
@@ -2315,8 +1926,7 @@ sh-*-linux* | sh[2346lbe]*-*-linux*)
 	esac
 	tmake_file="${tmake_file} sh/t-linux"
 	tm_file="${tm_file} dbxelf.h elfos.h svr4.h sh/elf.h sh/linux.h"
-	gas=yes gnu_ld=yes
-	case $machine in
+	case ${target} in
 	sh64*)
 		tmake_file="${tmake_file} sh/t-sh64"
 		tm_file="${tm_file} sh/sh64.h"
@@ -2328,9 +1938,12 @@ sh-*-linux* | sh[2346lbe]*-*-linux*)
 	sh3e[lb]*) target_cpu_default="SELECT_SH3" ;;
 	sh3e*) target_cpu_default="SELECT_SH3E" ;;
 	sh3*) target_cpu_default="SELECT_SH3" ;;
+	sh2e[lb]e*) target_cpu_default="SELECT_SH2E" ;;
+	sh2e[lb]*) target_cpu_default="SELECT_SH2" ;;
+	sh2e*) target_cpu_default="SELECT_SH2E" ;;
 	sh2*) target_cpu_default="SELECT_SH2" ;;
 	esac
-	case $machine in
+	case ${target} in
 	sh[234]*) tmake_file="${tmake_file} sh/t-monolib" ;;
 	esac
 	;;
@@ -2338,7 +1951,7 @@ sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \
   sh64-*-netbsd* | sh64l*-*-netbsd*)
 	tm_file="${tm_file} dbxelf.h elfos.h sh/elf.h netbsd.h netbsd-elf.h sh/netbsd-elf.h"
 	tmake_file="${tmake_file} sh/t-sh sh/t-elf"
-	case $machine in
+	case ${target} in
 	sh*l*-*)
 		tm_file="sh/little.h ${tm_file}"
 		tmake_file="${tmake_file} sh/t-le"
@@ -2347,10 +1960,10 @@ sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \
 		tmake_file="${tmake_file} sh/t-be"
 		;;
 	esac
-	case $machine in
+	case ${target} in
 	sh5*-*)
 		# SHmedia, 32-bit ABI
-		target_cpu_default="SH5_BIT|SH4_BIT|SH3E_BIT"
+		target_cpu_default="SH5_BIT|SH4_BIT|SH3_BIT|SH_E_BIT"
 		tmake_file="${tmake_file} sh/t-sh64 sh/t-netbsd-sh5"
 		;;
 	sh64*-*)
@@ -2365,103 +1978,48 @@ sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \
 		;;
 	esac
 	;;
+sh-wrs-vxworks)
+	tmake_file="$tmake_file sh/t-sh sh/t-elf sh/t-vxworks"
+	tm_file="${tm_file} dbxelf.h elfos.h svr4.h sh/embed-elf.h sh/vxworks.h"
+	;;
 sh-*-*)
-	tm_file="${tm_file} sh/coff.h"
+	tm_file="${tm_file} dbxcoff.h sh/coff.h"
+	use_fixproto=yes
 	;;
 sparc-tti-*)
 	tm_file="${tm_file} sparc/pbd.h"
-	xm_defines=POSIX
-	;;
-sparc64-wrs-vxworks*)
-        tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h sparc/sol2.h sparc/elf.h sparc/biarch64.h gofast.h sparc/vxsparc64.h"
-        tmake_file="sparc/t-vxsparc64 sparc/t-crtfm"
-        use_collect2=yes
-        ;;
-sparc-wrs-vxworks* | sparclite-wrs-vxworks*)
-	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/sparc.h aoutos.h sparc/aout.h libgloss.h"
+	use_fixproto=yes
 	;;
 sparc-*-netbsdelf*)
 	tm_file="${tm_file} elfos.h svr4.h sparc/sysv4.h netbsd.h netbsd-elf.h sparc/netbsd-elf.h"
 	;;
-sparc-*-netbsd*)
-	tm_file="${tm_file} sparc/aout.h netbsd.h netbsd-aout.h sparc/netbsd.h"
-	tmake_file=t-netbsd
-	extra_parts=""
-	use_collect2=yes
-	;;
 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...
 	use_collect2=yes
 	;;
 sparc64-*-openbsd*)
-	tm_file="sparc/openbsd1-64.h sparc/sparc.h elfos.h svr4.h sparc/sysv4.h sparc/sol2.h sparc/sp64-elf.h openbsd.h sparc/openbsd64.h"
-	xm_file=sparc/xm-sp64.h
+	tm_file="sparc/openbsd1-64.h sparc/sparc.h elfos.h svr4.h sparc/sysv4.h sparc/sp64-elf.h openbsd.h sparc/openbsd64.h"
 	gas=yes gnu_ld=yes
 	with_cpu=ultrasparc
 	;;
-sparc-*-bsd*)
-	tm_file="${tm_file} sparc/bsd.h"
-	;;
-sparc-*-chorusos*)
-	tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h sparc/sol2.h sparc/elf.h chorus.h"
-	tmake_file="sparc/t-chorus-elf sparc/t-crtfm"
-	extra_parts="crti.o crtn.o crtbegin.o crtend.o"
-	case x${enable_threads} in
-	  xyes | xpthreads | xposix)
-		thread_file='posix'
-		;;
-	esac
-	;;
 sparc-*-elf*)
 	tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h sparc/sol2.h sparc/elf.h"
 	tmake_file="sparc/t-elf sparc/t-crtfm"
 	extra_parts="crti.o crtn.o crtbegin.o crtend.o"
-	;;
-sparc-*-linux*aout*)		# SPARC's running GNU/Linux, a.out
-	tm_file="aoutos.h sparc/sparc.h sparc/aout.h sparc/linux-aout.h"
-	gnu_ld=yes
-	;;
-sparc-*-linux*libc1*)	# SPARC's running GNU/Linux, libc5
-	tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/linux.h"
-	tmake_file="t-slibgcc-elf-ver t-linux t-linux-gnulibc1 sparc/t-crtfm"
-	extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-	gnu_ld=yes
+	use_fixproto=yes
 	;;
 sparc-*-linux*)		# SPARC's running GNU/Linux, libc6
 	tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/linux.h"
 	tmake_file="t-slibgcc-elf-ver t-linux sparc/t-crtfm"
 	;;
-sparc-*-lynxos*)
-	if test x$gas = xyes
-	then
-		tm_file="${tm_file} lynx.h sparc/aout.h sparc/lynx.h"
-	else
-		tm_file="${tm_file} lynx-ng.h sparc/aout.h sparc/lynx-ng.h"
-	fi
-	tmake_file=sparc/t-sunos41
-	;;
-sparc-*-rtemsaout*)	# would otherwise be caught by sparc-*-rtems*
-	echo "*** Configuration $machine not supported" 1>&2
-	exit 1
-	;;
 sparc-*-rtems*)
-	xm_defines=POSIX
 	tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h sparc/sol2.h sparc/elf.h sparc/rtemself.h rtems.h"
 	tmake_file="sparc/t-elf sparc/t-crtfm t-rtems"
 	extra_parts="crti.o crtn.o crtbegin.o crtend.o"
-	if test x$enable_threads = xyes; then
-	  thread_file='rtems'
-	fi
 	;;
 sparc64-*-solaris2* | sparcv9-*-solaris2*)
 	tm_file="sparc/biarch64.h ${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h sparc/sol2.h sparc/sol2-64.h sparc/sol2-bi.h"
@@ -2471,7 +2029,6 @@ sparc64-*-solaris2* | sparcv9-*-solaris2*)
 	if test x$gas = xyes; then
 		tm_file="${tm_file} sparc/sol2-gas-bi.h"
 	fi
-	xm_defines=POSIX
 	tmake_file="sparc/t-sol2 sparc/t-sol2-64 sparc/t-crtfm"
 	if test x$gnu_ld = xyes; then
 		tmake_file="$tmake_file t-slibgcc-elf-ver"
@@ -2492,20 +2049,8 @@ sparc64-*-solaris2* | sparcv9-*-solaris2*)
 		thread_file='solaris'
 	    fi
 	fi
+	need_64bit_hwint=yes
 	;;
-sparc-hal-solaris2*)
-        xm_defines=POSIX
-        tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h sparc/sol2.h sparc/hal.h"
-        tmake_file="sparc/t-halos sparc/t-sol2 sparc/t-crtfm"
-	if test x$gnu_ld = xyes; then
-		tm_file="${tm_file} sparc/sol2-gld.h"
-		tmake_file="$tmake_file t-slibgcc-elf-ver"
-	else
-		tmake_file="$tmake_file t-slibgcc-sld"
-	fi
-        extra_parts="crt1.o crti.o crtn.o gmon.o crtbegin.o crtend.o"
-	thread_file='solaris'
-        ;;
 sparc-*-solaris2*)
 	tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h sparc/sol2.h"
 	if test x$gnu_ld = xyes; then
@@ -2517,7 +2062,7 @@ sparc-*-solaris2*)
 	else
 		tmake_file="$tmake_file t-slibgcc-sld"
 	fi
-	case $machine in
+	case ${target} in
 	*-*-solaris2.[0-6] | *-*-solaris2.[0-6].*)
 		if test x$gnu_ld = xno; then
 			tm_file="${tm_file} sparc/sol26-sld.h"
@@ -2532,9 +2077,9 @@ sparc-*-solaris2*)
 			tm_file="${tm_file} sparc/sol2-gas-bi.h"
 		fi
 		tmake_file="$tmake_file sparc/t-sol2-64"
+		need_64bit_hwint=yes
 		;;
 	esac
-	xm_defines=POSIX
 	extra_parts="crt1.o crti.o crtn.o gcrt1.o gmon.o crtbegin.o crtend.o"
 	if test x${enable_threads} = x; then
 	    enable_threads=$have_pthread_h
@@ -2550,76 +2095,47 @@ sparc-*-solaris2*)
 	    fi
 	fi
 	;;
-sparc-*-sunos4.0*)
-	tm_file="${tm_file} sparc/aout.h sparc/sunos4.h"
-	use_collect2=yes
-	;;
-sparc-*-sunos4*)
-	tm_file="${tm_file} sparc/aout.h sparc/sunos4.h"
-	tmake_file=sparc/t-sunos41
-	use_collect2=yes
-	if test x$gas = xyes; then
-		tm_file="${tm_file} sparc/sun4gas.h"
-	fi
-	;;
-sparc-*-sunos3*)
-	tm_file="${tm_file} sparc/aout.h sparc/sun4o3.h"
-	use_collect2=yes
-	;;
 sparc-*-sysv4*)
-	tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h"
-	xm_defines=POSIX
+	tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/sysv4-only.h"
 	tmake_file=t-svr4
 	extra_parts="crtbegin.o crtend.o"
-	;;
-sparc-*-vxsim*)
-	xm_defines=POSIX
-	tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/vxsim.h"
-	tmake_file=sparc/t-vxsparc
-	;;
-sparclet-*-aout*)
-	tm_file="${tm_file} aoutos.h sparc/aout.h sparc/splet.h libgloss.h"
-	tmake_file=sparc/t-splet
+	use_fixproto=yes
 	;;
 sparclite-*-coff*)
-	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="${tm_file} gofast.h sparc/aout.h sparc/lite.h aoutos.h libgloss.h"
+	tm_file="${tm_file} sparc/lite.h svr3.h sparc/litecoff.h dbxcoff.h libgloss.h"
 	tmake_file=sparc/t-sparclite
 	;;
 sparclite-*-elf*)
-	tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h sparc/sol2.h sparc/elf.h gofast.h sparc/liteelf.h"
+	tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h sparc/sol2.h sparc/elf.h sparc/liteelf.h"
 	tmake_file="sparc/t-sparclite sparc/t-crtfm"
         extra_parts="crtbegin.o crtend.o"
-	;;
-sparc86x-*-aout*)
-	tm_file="${tm_file} gofast.h sparc/aout.h sparc/sp86x-aout.h aoutos.h libgloss.h"
-	tmake_file=sparc/t-sp86x
+	use_fixproto=yes
 	;;
 sparc86x-*-elf*)
-	tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h sparc/sol2.h sparc/elf.h gofast.h sparc/sp86x-elf.h"
+	tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h sparc/sol2.h sparc/elf.h sparc/sp86x-elf.h"
 	tmake_file="sparc/t-sp86x sparc/t-crtfm"
         extra_parts="crtbegin.o crtend.o"
+	use_fixproto=yes
 	;;
 sparc64-*-aout*)
-	tm_file="sparc/sparc.h aoutos.h sparc/aout.h sparc/sp64-aout.h"
+	tm_file="sparc/sparc.h sparc/aout.h sparc/sp64-aout.h"
+	use_fixproto=yes
 	;;
 sparc64-*-elf*)
 	tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h sparc/sol2.h sparc/sp64-elf.h"
 	tmake_file="${tmake_file} sparc/t-crtfm"
 	extra_parts="crtbegin.o crtend.o"
+	use_fixproto=yes
 	;;
 sparc64-*-freebsd*|ultrasparc-*-freebsd*)
 	tm_file="${tm_file} ${fbsd_tm_file} dbxelf.h elfos.h sparc/sysv4.h sparc/freebsd.h"
 	tmake_file="${tmake_file} sparc/t-crtfm"
-	xmake_file=none
 	case "x$with_cpu" in
 		xultrasparc) ;;
 		x) with_cpu=ultrasparc ;;
 		*) echo "$with_cpu not supported for freebsd target"; exit 1 ;;
 	esac
+	need_64bit_hwint=yes
 	;;
 sparc64-*-linux*)		# 64-bit SPARC's running GNU/Linux
 	tmake_file="t-slibgcc-elf-ver t-linux sparc/t-linux64 sparc/t-crtfm"
@@ -2636,32 +2152,31 @@ strongarm-*-elf*)
 	out_file=arm/arm.c
 	md_file=arm/arm.md
 	extra_modes=arm/arm-modes.def
-	;;
-strongarm-*-coff*)
-	tm_file="arm/semi.h arm/aout.h arm/coff.h arm/strongarm-coff.h arm/arm.h"
-	tmake_file=arm/t-strongarm-coff
-	out_file=arm/arm.c
-	md_file=arm/arm.md
-	extra_modes=arm/arm-modes.def
+	use_fixproto=yes
 	;;
 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
 	extra_modes=arm/arm-modes.def
 	extra_objs=pe.o
+	use_fixproto=yes
 	;;
-thumb*-*-*)
-	{ echo "config.gcc: error:
-*** The Thumb targets have been deprecated.  The equivalent
-*** ARM based toolchain can now generate Thumb instructions
-*** when the -mthumb switch is given to the compiler." 1>&2; exit 1; }
+strongarm-*-kaos*)
+	tm_file="arm/strongarm-elf.h dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h kaos.h arm/kaos-strongarm.h"
+	tmake_file=arm/t-strongarm-elf
+	out_file=arm/arm.c
+	md_file=arm/arm.md
+	extra_modes=arm/arm-modes.def
 	;;
-v850-*-rtems*)
-	xm_defines=POSIX
-	tm_file="dbxelf.h elfos.h svr4.h ${tm_file} v850/v850.h v850/rtems.h rtems.h"
-	tmake_file="v850/t-v850 t-rtems"
+v850e1-*-*)
+	target_cpu_default="TARGET_CPU_v850e1"
+	tm_file="dbxelf.h elfos.h svr4.h v850/v850.h"
+	tm_p_file=v850/v850-protos.h
+	tmake_file=v850/t-v850e
+	md_file=v850/v850.md
+	out_file=v850/v850.c
 	if test x$stabs = xyes
 	then
 		tm_file="${tm_file} dbx.h"
@@ -2669,12 +2184,13 @@ v850-*-rtems*)
 	use_collect2=no
 	c_target_objs="v850-c.o"
 	cxx_target_objs="v850-c.o"
+	use_fixproto=yes
 	;;
 v850e-*-*)
 	target_cpu_default="TARGET_CPU_v850e"
 	tm_file="dbxelf.h elfos.h svr4.h v850/v850.h"
 	tm_p_file=v850/v850-protos.h
-	tmake_file=v850/t-v850
+	tmake_file=v850/t-v850e
 	md_file=v850/v850.md
 	out_file=v850/v850.c
 	if test x$stabs = xyes
@@ -2684,6 +2200,7 @@ v850e-*-*)
 	use_collect2=no
 	c_target_objs="v850-c.o"
 	cxx_target_objs="v850-c.o"
+	use_fixproto=yes
 	;;
 v850-*-*)
 	target_cpu_default="TARGET_CPU_generic"
@@ -2696,18 +2213,19 @@ v850-*-*)
 	use_collect2=no
 	c_target_objs="v850-c.o"
 	cxx_target_objs="v850-c.o"
+	use_fixproto=yes
 	;;
 vax-*-bsd*)			# VAXen running BSD
 	tm_file="${tm_file} vax/bsd.h"
 	use_collect2=yes
+	use_fixproto=yes
 	;;
 vax-*-sysv*)			# VAXen running system V
 	tm_file="${tm_file} vax/vaxv.h"
-	xm_defines=POSIX
+	use_fixproto=yes
 	;;
 vax-*-netbsdelf*)
 	tm_file="${tm_file} elfos.h netbsd.h netbsd-elf.h vax/elf.h vax/netbsd-elf.h"
-	float_format=vax
 	;;
 vax-*-netbsd*)
 	tm_file="${tm_file} netbsd.h netbsd-aout.h vax/netbsd.h"
@@ -2716,17 +2234,22 @@ 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
 	tm_file="${tm_file} vax/ultrix.h"
-	;;
-vax-*-vms*)			# VAXen running VMS
-	xm_file=vax/xm-vms.h
-	tm_file=vax/vms.h
+	use_fixproto=yes
 	;;
 vax-*-*)			# VAX default entry
+    if test "x$enable_obsolete" != xyes; then
+      echo "*** Configuration ${target} is obsolete." >&2
+      echo "*** Specify --enable-obsolete to build it anyway." >&2
+      echo "*** Support will be REMOVED in the next major release of GCC," >&2
+      echo "*** unless a maintainer comes forward." >&2
+      exit 1
+    fi
+	use_fixproto=yes
 	;;
 xscale-*-elf)
 	tm_file="arm/xscale-elf.h dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h"
@@ -2734,13 +2257,15 @@ xscale-*-elf)
 	out_file=arm/arm.c
 	md_file=arm/arm.md
 	extra_modes=arm/arm-modes.def
+	use_fixproto=yes
 	;;
 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
 	extra_modes=arm/arm-modes.def
+	use_fixproto=yes
 	;;
 xstormy16-*-elf)
 	# For historical reasons, the target files omit the 'x'.
@@ -2750,301 +2275,540 @@ xstormy16-*-elf)
 	out_file=stormy16/stormy16.c
 	tmake_file="stormy16/t-stormy16"
 	extra_parts="crtbegin.o crtend.o"
+	use_fixproto=yes
 	;;
 xtensa-*-elf*)
 	tm_file="${tm_file} dbxelf.h elfos.h svr4.h xtensa/elf.h"
-	with_newlib=yes
-	tmake_file=xtensa/t-xtensa
-	extra_parts="crtbegin.o crtend.o"
-	fixincludes=Makefile.in # newlib headers should be OK
+	tmake_file="xtensa/t-xtensa xtensa/t-elf"
 	;;
 xtensa-*-linux*)
 	tm_file="${tm_file} dbxelf.h elfos.h svr4.h linux.h xtensa/linux.h"
-	tmake_file="t-slibgcc-elf-ver t-linux xtensa/t-xtensa"
+	tmake_file="t-slibgcc-elf-ver t-linux xtensa/t-xtensa xtensa/t-linux"
+	;;
+am33_2.0-*-linux*)
+	tm_file="mn10300/mn10300.h dbxelf.h elfos.h linux.h mn10300/linux.h"
+	tmake_file="t-slibgcc-elf-ver t-linux mn10300/t-linux"
+	gas=yes gnu_ld=yes
+	extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
+	use_collect2=no
 	;;
 *)
-	echo "*** Configuration $machine not supported" 1>&2
+	echo "*** Configuration ${target} not supported" 1>&2
 	exit 1
 	;;
 esac
 
-case $machine in
-*-*-sysv*)
-	install_headers_dir=install-headers-cpio
-	;;
+# Support for --with-cpu and related options (and a few unrelated options,
+# too).
+case ${with_cpu} in
+  yes | no)
+    echo "--with-cpu must be passed a value" 1>&2
+    exit 1
+    ;;
 esac
 
-# Distinguish i[34567]86
-# Also, do not run mips-tfile on MIPS if using gas.
-# Process --with-cpu= for PowerPC/rs6000
-target_cpu_default2=
-case $machine in
-i486-*-*)
-	target_cpu_default2=TARGET_CPU_DEFAULT_i486
-	;;
-i586-*-*)
-	case $target_alias in
-		k6_2-*)
-			target_cpu_default2=TARGET_CPU_DEFAULT_k6_2
+# If there is no $with_cpu option, try to infer one from ${target}.
+# This block sets nothing except for with_cpu.
+if test x$with_cpu = x ; then
+  case ${target} in
+    ep9312-*-*)
+      # A Cirrus ARM variant.
+      with_cpu="ep9312"
+      ;;
+    i486-*-*)
+      with_cpu=i486
+      ;;
+    i586-*-*)
+      case ${target_noncanonical} in
+        k6_2-*)
+          with_cpu=k6-2
+          ;;
+        k6_3-*)
+          with_cpu=k6-3
+          ;;
+        k6-*)
+          with_cpu=k6
+          ;;
+        pentium_mmx-*|winchip_c6-*|winchip2-*|c3-*)
+          with_cpu=pentium-mmx
+          ;;
+        *)
+          with_cpu=pentium
+          ;;
+      esac
+      ;;
+    i686-*-* | i786-*-*)
+      case ${target_noncanonical} in
+        k8-*|opteron-*|athlon_64-*)
+          with_cpu=k8
+          ;;
+        athlon_xp-*|athlon_mp-*|athlon_4-*)
+          with_cpu=athlon-4
+          ;;
+        athlon_tbird-*|athlon-*)
+          with_cpu=athlon
+          ;;
+        pentium2-*)
+          with_cpu=pentium2
+          ;;
+        pentium3-*|pentium3m-*)
+          with_cpu=pentium3
+          ;;
+        pentium4-*|pentium4m-*)
+          with_cpu=pentium4
+          ;;
+        prescott-*)
+          with_cpu=prescott
+          ;;
+        nocona-*)
+          with_cpu=nocona
+          ;;
+        pentium_m-*)
+          with_cpu=pentium-m
+          ;;
+        *)
+          with_cpu=pentiumpro
+          ;;
+      esac
+      ;;
+    x86_64-*-*)
+      with_cpu=k8
+      ;;
+    alphaev6[78]*-*-*)
+      with_cpu=ev67
+      ;;
+    alphaev6*-*-*)
+      with_cpu=ev6
+      ;;
+    alphapca56*-*-*)
+      with_cpu=pca56
+      ;;
+    alphaev56*-*-*)
+      with_cpu=ev56
+      ;;
+    alphaev5*-*-*)
+      with_cpu=ev5
+      ;;
+    sparc*-*-*)
+      with_cpu="`echo ${target} | sed 's/-.*$//'`"
+      if [ x$with_cpu = xsparc64 ]; then
+        with_cpu=v9
+      fi
+      ;;
+  esac
+fi
+
+	# Similarly for --with-schedule.
+	if test x$with_schedule = x; then
+		case ${target} in
+		hppa1* | parisc1*)
+			# Override default PA8000 scheduling model.
+			with_schedule=7100LC
 			;;
-		k6_3-*)
-			target_cpu_default2=TARGET_CPU_DEFAULT_k6_3
+		esac
+	fi
+
+	# Validate and mark as valid any --with options supported
+	# by this target.  In order to use a particular --with option
+	# you must list it in supported_defaults; validating the value
+	# is optional.  This case statement should set nothing besides
+	# supported_defaults.
+
+	supported_defaults=
+	case "${target}" in
+	alpha*-*-*)
+		supported_defaults="cpu tune"
+		for which in cpu tune; do
+			eval "val=\$with_$which"
+			case "$val" in
+			"" \
+			| ev4 | ev45 | 21064 | ev5 | 21164 | ev56 | 21164a \
+			| pca56 | 21164PC | 21164pc | ev6 | 21264 | ev67 \
+			| 21264a)
+				;;
+			*)
+				echo "Unknown CPU used in --with-$which=$val" 1>&2
+				exit 1
+				;;
+			esac
+		done
+		;;
+
+	arm*-*-*)
+		supported_defaults="arch cpu float tune"
+		for which in cpu tune; do
+			eval "val=\$with_$which"
+			case "$val" in
+			"" \
+			| arm[236789] | arm250 | arm[67][01]0 \
+			| arm60 | arm620 | arm7d | arm7di \
+			| arm7m | arm7dm | arm7dmi | arm[79]tdmi \
+			| arm70 | arm700i | arm710t | arm720 \
+			| arm720t | arm740t | arm710c | arm920 \
+			| arm920t | arm926ejs | arm940t | arm9e | arm10tdmi \
+			| arm7100 | arm7500 | arm7500fe | arm810 \
+			| arm1026ejs | arm1020t | arm1136js | arm1136jfs \
+			| xscale | iwmmxt \
+			| ep9312 \
+			| strongarm | strongarm110 | strongarm11[01]0)
+				# OK
+				;;
+			*)
+				echo "Unknown CPU used in --with-$which=$val" 1>&2
+				exit 1
+				;;
+			esac
+		done
+
+		case "$with_arch" in
+		"" \
+		| armv[2345] | armv2a | armv3m | armv4t | armv5t \
+		| armv5te | armv6j | ep9312)
+			# OK
 			;;
-		k6-*)
-			target_cpu_default2=TARGET_CPU_DEFAULT_k6
+		*)
+			echo "Unknown arch used in --with-arch=$with_arch" 1>&2
+			exit 1
 			;;
-		pentium_mmx-*|winchip_c6-*|winchip2-*|c3-*)
-			target_cpu_default2=TARGET_CPU_DEFAULT_pentium_mmx
+		esac
+
+		case "$with_float" in
+		"" \
+		| soft | hard)
+			# OK
 			;;
 		*)
-			target_cpu_default2=TARGET_CPU_DEFAULT_pentium
+			echo "Unknown floating point type used in --with-float=$with_float" 1>&2
+			exit 1
 			;;
-	esac
-	;;
-i686-*-* | i786-*-*)
-	case $target_alias in
-		athlon_xp-*|athlon_mp-*|athlon_4-*)
-			target_cpu_default2=TARGET_CPU_DEFAULT_athlon_sse
+		esac
+
+		if test "x$with_arch" != x && test "x$with_cpu" != x; then
+			echo "Warning: --with-arch overrides --with-cpu" 1>&2
+		fi
+		;;
+
+	hppa*-*-* | parisc*-*-*)
+		supported_defaults="arch schedule"
+
+		case "$with_arch" in
+		"" | 1.0 | 1.1 | 2.0)
+			# OK
 			;;
-		athlon_tbird-*|athlon-*)
-			target_cpu_default2=TARGET_CPU_DEFAULT_athlon
+		*)
+			echo "Unknown architecture used in --with-arch=$with_arch" 1>&2
+			exit 1
 			;;
-		pentium2-*)
-			target_cpu_default2=TARGET_CPU_DEFAULT_pentium2
+		esac
+
+		case "$with_schedule" in
+		"" | 700 | 7100 | 7100LC | 7200 | 7300 | 8000)
+			# OK
 			;;
-		pentium3-*)
-			target_cpu_default2=TARGET_CPU_DEFAULT_pentium3
+		*)
+			echo "Unknown processor used in --with-schedule=$with_schedule." 1>&2
+			exit 1
 			;;
-		pentium4-*)
-			target_cpu_default2=TARGET_CPU_DEFAULT_pentium4
+		esac
+		;;
+
+	i[34567]86-*-* | x86_64-*-*)
+		supported_defaults="arch cpu tune"
+		for which in arch cpu tune; do
+			eval "val=\$with_$which"
+			case ${val} in
+			"" | i386 | i486 \
+			| i586 | pentium | pentium-mmx | winchip-c6 | winchip2 \
+			| c3 | c3-2 | i686 | pentiumpro | pentium2 | pentium3 \
+			| pentium4 | k6 | k6-2 | k6-3 | athlon | athlon-tbird \
+			| athlon-4 | athlon-xp | athlon-mp | k8 | opteron \
+			| athlon64 | athlon-fx | prescott | pentium-m \
+			| pentium4m | pentium3m| nocona)
+				# OK
+				;;
+			*)
+				echo "Unknown CPU given in --with-$which=$val." 1>&2
+				exit 1
+				;;
+			esac
+		done
+		;;
+
+	mips*-*-*)
+		supported_defaults="abi arch float tune"
+
+		case ${with_float} in
+		"" | soft | hard)
+			# OK
 			;;
 		*)
-			target_cpu_default2=TARGET_CPU_DEFAULT_pentiumpro
+			echo "Unknown floating point type used in --with-float=$with_float" 1>&2
+			exit 1
 			;;
-	esac
-	;;
-x86_64-*-*)
-	# We should have hammer chip here, but it does not exist yet and
-	# thus it is not supported.  Athlon_SSE is probably equivalent feature
-	# wise to hammer from our point of view except for 64bit mode.
-	target_cpu_default2=TARGET_CPU_DEFAULT_athlon_sse
-	;;
-alpha*-*-*)
-	case $machine in
-		alphaev6[78]*)
-			target_cpu_default2="MASK_CPU_EV6|MASK_BWX|MASK_MAX|MASK_FIX|MASK_CIX"
+		esac
+
+		case ${with_abi} in
+		"" | 32 | o64 | n32 | 64 | eabi)
+			# OK
 			;;
-		alphaev6*)
-			target_cpu_default2="MASK_CPU_EV6|MASK_BWX|MASK_MAX|MASK_FIX"
+		*)
+			echo "Unknown ABI used in --with-abi=$with_abi" 1>&2
+			exit 1
 			;;
-		alphapca56*)
-			target_cpu_default2="MASK_CPU_EV5|MASK_BWX|MASK_MAX"
+		esac
+		;;
+
+	powerpc*-*-* | rs6000-*-*)
+		supported_defaults="cpu float tune"
+
+		for which in cpu tune; do
+			eval "val=\$with_$which"
+			case ${val} in
+			default32 | default64)
+				with_which="with_$which"
+				eval $with_which=
+				;;
+			"" | common \
+			| power | power2 | power3 | power4 \
+			| powerpc | powerpc64 \
+			| rios | rios1 | rios2 | rsc | rsc1 | rs64a \
+			| 401 | 403 | 405 | 405fp | 440 | 440fp | 505 \
+			| 601 | 602 | 603 | 603e | ec603e | 604 \
+			| 604e | 620 | 630 | 740 | 750 | 7400 | 7450 \
+			| 8540 | 801 | 821 | 823 | 860 | 970 | G3 | G4 | G5)
+				# OK
+				;;
+			*)
+				echo "Unknown cpu used in --with-$which=$val." 1>&2
+				exit 1
+				;;
+			esac
+		done
+		;;
+
+	s390*-*-*)
+		supported_defaults="arch mode tune"
+
+		for which in arch tune; do
+			eval "val=\$with_$which"
+			case ${val} in
+			"" | g5 | g6 | z900 | z990)
+				# OK
+				;;
+			*)
+				echo "Unknown cpu used in --with-$which=$val." 1>&2
+				exit 1
+				;;
+			esac
+		done
+
+		case ${with_mode} in
+		"" | esa | zarch)
+			# OK
 			;;
-		alphaev56*)
-			target_cpu_default2="MASK_CPU_EV5|MASK_BWX"
+		*)
+			echo "Unknown architecture mode used in --with-mode=$with_mode." 1>&2
+			exit 1
 			;;
-		alphaev5*)
-			target_cpu_default2="MASK_CPU_EV5"
+		esac
+		;;
+
+	sparc*-*-*)
+		supported_defaults="cpu float tune"
+
+		for which in cpu tune; do
+			eval "val=\$with_$which"
+			case ${val} in
+			"" | sparc | sparcv9 | sparc64 | sparc86x \
+			| v7 | cypress | v8 | supersparc | sparclite | f930 \
+			| f934 | hypersparc | sparclite86x | sparclet | tsc701 \
+			| v9 | ultrasparc | ultrasparc3)
+				# OK
+				;;
+			*)
+				echo "Unknown cpu used in --with-$which=$val" 1>&2
+				exit 1
+				;;
+			esac
+		done
+
+		case ${with_float} in
+		"" | soft | hard)
+			# OK
 			;;
+		*)
+			echo "Unknown floating point type used in --with-float=$with_float" 1>&2
+			exit 1
+			;;
+		esac
+		;;
+
+	v850*-*-*)
+		supported_defaults=cpu
+		case ${with_cpu} in
+		"" | v850e | v850e1)
+			# OK
+			;;
+		*)
+			echo "Unknown cpu used in --with-cpu=$with_cpu" 1>&2
+			exit 1
+			;;
+		esac
+		;;
 	esac
 
-	if test x$gas = xyes
-	then
-		if test "$target_cpu_default2" = ""
+	# Set some miscellaneous flags for particular targets.
+	target_cpu_default2=
+	case ${target} in
+	alpha*-*-*)
+		if test x$gas = xyes
 		then
 			target_cpu_default2="MASK_GAS"
-		else
-			target_cpu_default2="${target_cpu_default2}|MASK_GAS"
 		fi
-	fi
-	;;
-arm*-*-*)
-	case "x$with_cpu" in
+		;;
+
+	arm*-*-*)
+		case "x$with_cpu" in
 		x)
 			# The most generic
 			target_cpu_default2="TARGET_CPU_generic"
 			;;
 
-		# Distinguish cores, and major variants
-		# arm7m doesn't exist, but D & I don't affect code
-		xarm[236789] | xarm250 | xarm[67][01]0 \
-		| xarm7m | xarm7dm | xarm7dmi | xarm[79]tdmi \
-		| xarm7100 | xarm7500 | xarm7500fe | xarm810 \
-		| xxscale \
-		| xstrongarm | xstrongarm110 | xstrongarm1100)
+		*)
 			target_cpu_default2="TARGET_CPU_$with_cpu"
 			;;
+		esac
+		;;
 
-		xyes | xno)
-			echo "--with-cpu must be passed a value" 1>&2
-			exit 1
-			;;
+	hppa*-*-* | parisc*-*-*)
+		if test x$gas = xyes
+		then
+			target_cpu_default2="MASK_GAS|MASK_JUMP_IN_DELAY"
+		fi
+		;;
 
-		*)
-			if test x$pass2done = xyes
+	mips*-*-*)
+		case ${target} in
+		mips*-*-ecoff* | mips*-*-elf*)
+			if test x$gas = xyes
 			then
-				echo "Unknown cpu used with --with-cpu=$with_cpu" 1>&2
-				exit 1
+				if test x$gnu_ld = xyes
+				then
+					target_cpu_default2="MASK_GAS|MASK_SPLIT_ADDR"
+				else
+					target_cpu_default2="MASK_GAS"
+				fi
 			fi
 			;;
-	esac
-	;;
-
-hppa*-*-* | parisc*-*-*)
-	if test x$gas = xyes
-	then
-		target_cpu_default2="MASK_GAS|MASK_JUMP_IN_DELAY"
-	fi
-	case $machine in
-		hppa1* | parisc1*)
-			tm_defines="TARGET_SCHED_DEFAULT=\\\"7100LC\\\""
-			;;
-	esac
-	;;
-mips*-*-*)
-	case $machine in
-	mips*-*-ecoff* | mips*-*-elf*)
-		if test x$gas = xyes
-		then
-			if test x$gnu_ld = xyes
+		mips*-*-*)
+			if test x$gas = xyes
 			then
-				target_cpu_default2="MASK_GAS|MASK_SPLIT_ADDR"
-			else
 				target_cpu_default2="MASK_GAS"
 			fi
+			;;
+		esac
+		case ${target} in
+			mips*el-*-*)
+				tm_defines="TARGET_ENDIAN_DEFAULT=0 $tm_defines"
+				;;
+		esac
+		case $tm_file in
+			*mips/elf.h* | *mips/elf64.h*)
+				tm_defines="OBJECT_FORMAT_ELF $tm_defines"
+				;;
+		esac
+		if test "x$enable_gofast" = xyes
+		then
+			tm_defines="US_SOFTWARE_GOFAST $tm_defines"
+			tmake_file="mips/t-gofast $tmake_file"
+		else
+			tmake_file="mips/t-mips $tmake_file"
 		fi
 		;;
-	mips*-*-*)
-		if test x$gas = xyes
+
+	powerpc*-*-* | rs6000-*-*)
+		if test x$enable_altivec = xyes
 		then
-			target_cpu_default2="MASK_GAS"
+			tm_file="$tm_file rs6000/altivec-defs.h"
 		fi
+		# FIXME: The PowerPC port uses the value set at compile time,
+		# although it's only cosmetic.
+		if test "x$with_cpu" != x
+		then
+			target_cpu_default2="\\\"$with_cpu\\\""
+		fi
+		out_file=rs6000/rs6000.c
+		c_target_objs="${c_target_objs} rs6000-c.o"
+		cxx_target_objs="${cxx_target_objs} rs6000-c.o"
+		tmake_file="rs6000/t-rs6000 ${tmake_file}"
 		;;
-	esac
-	case $machine in
-		mips*el-*-*)
-			tm_defines="TARGET_ENDIAN_DEFAULT=0 $tm_defines"
-			;;
-	esac
-	case $tm_file in
-		*mips/elf.h* | *mips/elf64.h*)
-			tm_defines="OBJECT_FORMAT_ELF $tm_defines"
-			;;
-	esac
-	if test "x$enable_gofast" = xyes
-	then
-		tm_defines="INIT_SUBTARGET_OPTABS=INIT_GOFAST_OPTABS $tm_defines"
-		tm_file="gofast.h $tm_file"
-		tmake_file="mips/t-gofast $tmake_file"
-	else
-		tmake_file="mips/t-mips $tmake_file"
-	fi
-	;;
-powerpc*-*-* | rs6000-*-*)
-        if test x$enable_altivec = xyes
-        then
-                tm_file="$tm_file rs6000/altivec-defs.h"
-        fi
-	case "x$with_cpu" in
-		x)
-			;;
 
-		xcommon | xpower | xpower2 | xpower3 | xpowerpc | xpowerpc64 \
-		  | xrios | xrios1 | xrios2 | xrsc | xrsc1 | xrs64a \
-		  | x601 | x602 | x603 | x603e | x604 | x604e | x620 | x630 \
-		  | x740 | x750 | x7400 | x7450 | x505)
-			target_cpu_default2="\\\"$with_cpu\\\""
+	sparc*-*-*)
+		# Some standard aliases.
+		case x$with_cpu in
+		xsparc)
+			with_cpu=v7
 			;;
-
-		x401 | x403 | x405 | xec603e | x801 | x821 | x823 | x860)
-			target_cpu_default2="\\\"$with_cpu\\\""
+		xsparc86x)
+			with_cpu=sparclite86x
 			;;
-
-		xyes | xno)
-			echo "--with-cpu must be passed a value" 1>&2
-			exit 1
+		xsparcv9 | xsparc64)
+			with_cpu=v9
 			;;
+		esac
 
-		*)
-			if test x$pass2done = xyes
-			then
-				echo "Unknown cpu used with --with-cpu=$with_cpu" 1>&2
-				exit 1
-			fi
-			;;
-	esac
-	c_target_objs="${c_target_objs} rs6000-c.o"
-	cxx_target_objs="${cxx_target_objs} rs6000-c.o"
-	tmake_file="${tmake_file} rs6000/t-rs6000-c-rule"
-	;;
-sparc*-*-*)
-	case ".$with_cpu" in
-		.)
-			target_cpu_default2=TARGET_CPU_"`echo $machine | sed 's/-.*$//'`"
-			;;
-		.supersparc | .hypersparc | .ultrasparc | .v7 | .v8 | .v9)
-			target_cpu_default2="TARGET_CPU_$with_cpu"
-			;;
-		*)
-			if test x$pass2done = xyes
-			then
-				echo "Unknown cpu used with --with-cpu=$with_cpu" 1>&2
-				exit 1
-			fi
-			;;
-	esac
-	;;
-v850*-*-*)
-	case "x$with_cpu" in
+		# The Sparc port checks this value at compile-time.
+		target_cpu_default2="TARGET_CPU_$with_cpu"
+		;;
+	v850*-*-*)
+		# FIXME: The v850 is "special" in that it does not support
+		# runtime CPU selection, only --with-cpu.
+		case "x$with_cpu" in
 		x)
 			;;
 		xv850e)
 			target_cpu_default2="TARGET_CPU_$with_cpu"
 			;;
-		*)
-			if test x$pass2done = xyes
-			then
-				echo "Unknown cpu used with --with-cpu=$with_cpu" 1>&2
-				exit 1
-			fi
-			;;
+		esac
+		;;
 	esac
-	;;
-esac
 
-if test "$target_cpu_default2" != ""
-then
-	if test "$target_cpu_default" != ""
+	t=
+	all_defaults="abi cpu arch tune schedule float mode"
+	for option in $all_defaults
+	do
+		eval "val=\$with_$option"
+		if test -n "$val"; then
+			case " $supported_defaults " in
+			*" $option "*)
+				;;
+			*)
+				echo "This target does not support --with-$option." 2>&1
+				exit 1
+				;;
+			esac
+
+			if test "x$t" = x
+			then
+				t="{ \"$option\", \"$val\" }"
+			else
+				t="${t}, { \"$option\", \"$val\" }"
+			fi
+		fi
+	done
+	if test "x$t" = x
 	then
-		target_cpu_default="(${target_cpu_default}|${target_cpu_default2})"
+		configure_default_options="{ { NULL, NULL} }"
 	else
-		target_cpu_default=$target_cpu_default2
+		configure_default_options="{ ${t} }"
 	fi
-fi
 
-# Save data on machine being used to compile GCC in build_xm_file.
-# Save data on host machine in vars host_xm_file and host_xmake_file.
-if test x$pass1done = x
-then
-	if test x$xm_file != x
-	then build_xm_file=$xm_file
-	fi
-	build_xm_defines=$xm_defines
-	build_install_headers_dir=$install_headers_dir
-	build_exeext=$exeext
-	pass1done=yes
-else
-	if test x$pass2done = x
+	if test "$target_cpu_default2" != ""
 	then
-		if test x$xm_file != x
-		then host_xm_file=$xm_file
+		if test "$target_cpu_default" != ""
+		then
+			target_cpu_default="(${target_cpu_default}|${target_cpu_default2})"
+		else
+			target_cpu_default=$target_cpu_default2
 		fi
-		host_xm_defines=$xm_defines
-		host_xmake_file="$xmake_file"
-		host_truncate_target=$truncate_target
-		host_extra_gcc_objs=$extra_gcc_objs
-		host_extra_objs=$extra_host_objs
-		host_exeext=$exeext
-		pass2done=yes
 	fi
-fi