OSDN Git Service

* config.gcc: Add a missing sparc64 case.
[pf3gnuchains/gcc-fork.git] / gcc / config.gcc
index e33752b..b856842 100644 (file)
@@ -1,5 +1,6 @@
 # GCC build-, host- and target-specific configuration file.
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+# Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Free Software Foundation, Inc.
 
 #This file is part of GCC.
 
 #  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.
 #
 #                       machine modes, if necessary and different from
 #                       "$cpu_type/$cpu_type-modes.def".
 #
-#  float_format                Set to the symbolic name for the floating-point
-#                      formats used for this machine, if different from
-#                      "i64".  Used to derive a header file name to
-#                      include, like "vax" for "float-vax.h".  If no such
-#                      file is wanted, set to "none".
-#
 #  extra_objs          List of extra objects that should be linked into
 #                      the compiler proper (cc1, cc1obj, cc1plus)
 #                      depending on target.
 #  host_extra_gcc_objs List of extra host-dependent objects that should
 #                      be linked into the gcc driver.
 #
+#  out_host_hook_obj   An object file that provides the host hooks.
+#
 #  c_target_objs       List of extra target-dependent objects that be
 #                      linked into the C compiler only.
 #
 #  cxx_target_objs     List of extra target-dependent objects that be
 #                      linked into the C++ compiler only.
 #
+#  target_gtfiles       List of extra source files with type information.
+#
 #  build_xm_defines    List of macros to define when compiling for the
 #                      build machine.
 #
 #
 #  gas                 Set to yes or no depending on whether the target
 #                      system normally uses GNU as.
+#
+#  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.)
+#
+#  configure_default_options
+#                      Set to an initializer for configure_default_options
+#                      in configargs.h, based on --with-cpu et cetera.
 
 # The following variables are used in each case-construct to build up the
 # outgoing variables:
 #                      the compiler proper when this system is a host,
 #                      for host_extra_objs.
 #
+#  host_hook_obj       An object file that provides the host hooks.
+#
 #  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.
@@ -190,9 +207,9 @@ extra_host_objs=
 extra_gcc_objs=
 c_target_objs=
 cxx_target_objs=
+host_hook_obj=host-default.o
 tm_defines=
 xm_defines=
-float_format=
 # Set this to force installation and use of collect2.
 use_collect2=
 # Set this to override the default target model.
@@ -213,18 +230,17 @@ 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=
+
+# Don't carry these over build->host->target.  Please.
+xm_file=
+md_file=
 
 # Obsolete configurations.
 case $machine in
-   m88k-*-aout*     \
- | m88k-*-openbsd*  \
- | m88k-*-sysv4*    \
- | mips-sni-sysv4   \
- | mn10200-*-*      \
- | ns32k-*-openbsd* \
- | romp-*-openbsd*  \
- | vax-*-vms* \
- )
+ dummy)
     if test "x$enable_obsolete" != xyes; then
       echo "*** Configuration $machine is obsolete." >&2
       echo "*** Specify --enable-obsolete to build it anyway." >&2
@@ -234,6 +250,32 @@ 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 $machine in
+   alpha*-*-linux*libc1*               \
+ | i[34567]86-sequent-sysv*            \
+ | 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*                      \
+ )
+       echo "*** Configuration $machine 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.
@@ -242,6 +284,7 @@ cpu_type=`echo $machine | sed 's/-.*$//'`
 case $machine in
 alpha*-*-*)
        cpu_type=alpha
+       need_64bit_hwint=yes
        ;;
 strongarm*-*-*)
        cpu_type=arm
@@ -249,19 +292,24 @@ strongarm*-*-*)
 arm*-*-*)
        cpu_type=arm
        ;;
+ep9312*-*-*)
+       cpu_type=arm
+       ;;
 xscale-*-*)
        cpu_type=arm
        ;;
 i[34567]86-*-*)
        cpu_type=i386
-       extra_headers="mmintrin.h xmmintrin.h"
+       extra_headers="mmintrin.h xmmintrin.h emmintrin.h"
        ;;
 x86_64-*-*)
        cpu_type=i386
-       extra_headers="mmintrin.h xmmintrin.h"
+       extra_headers="mmintrin.h xmmintrin.h emmintrin.h"
+       need_64bit_hwint=yes
        ;;
 ia64-*-*)
        extra_headers=ia64intrin.h
+       need_64bit_hwint=yes
        ;;
 hppa*-*-* | parisc*-*-*)
        cpu_type=pa
@@ -275,18 +323,34 @@ m68k-*-*)
        ;;
 mips*-*-*)
        cpu_type=mips
+       need_64bit_hwint=yes
        ;;
 powerpc*-*-*)
        cpu_type=rs6000
-       extra_headers="ppc-asm.h altivec.h"
+       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
+        ;;
 esac
 
 tm_file=${cpu_type}/${cpu_type}.h
@@ -313,16 +377,26 @@ case $machine in
        ;;
 esac
 
-# Common parts for GNU/Linux, GNU/Hurd, OpenBSD, NetBSD, and FreeBSD systems.
+# Common parts for widely ported systems.
 case $machine in
 *-*-linux*)
-       xm_defines=POSIX
+       case $machine in
+        *-*-linux*libc1* | *-*-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
        ;;
 *-*-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.
@@ -345,7 +419,6 @@ case $machine in
 *-*-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"
@@ -353,9 +426,42 @@ case $machine in
        ;;
 *-*-netbsd*)
        tmake_file="t-slibgcc-elf-ver t-libc-ok t-netbsd"
-       xm_defines=POSIX
        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 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
+
+       # NetBSD 2.0 and later provide __cxa_atexit(), which we use by
+       # default (unless overridden by --disable-__cxa_atexit).
+       case $machine in
+       *-*-netbsd[2-9]* | *-*-netbsdelf[2-9]*)
+               default_use_cxa_atexit=yes
+               ;;
+       esac
        ;;
 *-*-freebsd[12] | *-*-freebsd[12].* | *-*-freebsd*aout*)
        # This is the place-holder for the generic a.out configuration
@@ -394,7 +500,6 @@ case $machine in
        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)
@@ -411,6 +516,22 @@ case $machine in
        esac
        fbsd_tm_file="${fbsd_tm_file} freebsd-spec.h freebsd.h"
        ;;
+*-*-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"
+       ;;      
+*-*-vxworks*)
+       tmake_file=t-vxworks
+       tm_file="${tm_file} elfos.h svr4.h vxworks.h"
+       thread_file='vxworks'
+       use_collect2=yes
+       ;;
 esac
 
 case $machine in
@@ -436,50 +557,10 @@ alpha*-*-unicosmk*)
        # 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
-       ;;
 alpha*-*-linux*)
        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 alpha/t-crtfm alpha/t-alpha 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
        ;;
 alpha*-*-gnu*)
        target_cpu_default="MASK_GAS"
@@ -505,7 +586,6 @@ alpha*-*-openbsd*)
        ;;
 
 alpha*-dec-osf[45]*)
-       xm_defines=POSIX
        if test x$stabs = xyes
        then
                tm_file="${tm_file} dbx.h"
@@ -532,25 +612,12 @@ alpha*-dec-osf[45]*)
          *-*-osf5*)
            tm_file="${tm_file} alpha/osf5.h"
            target_cpu_default=MASK_SUPPORT_ARCH
-           float_format=i128
            ;;
        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'
-       ;;
 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
@@ -566,7 +633,6 @@ alpha64-dec-*vms*)
        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"
@@ -591,15 +657,6 @@ arm-*-coff* | armel-*-coff*)
        tm_file="arm/semi.h arm/aout.h arm/arm.h arm/coff.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
@@ -609,11 +666,13 @@ arm*-*-freebsd*|strongarm*-*-freebsd*)
        tmake_file="${tmake_file} arm/t-strongarm-elf"
        ;;
 arm*-*-netbsdelf*)
-       echo "GCC does not yet support the ${machine} target"; exit 1
+       tm_file="dbxelf.h elfos.h netbsd.h netbsd-elf.h arm/elf.h arm/aout.h arm/arm.h arm/netbsd-elf.h"
+       tmake_file="${tmake_file} arm/t-netbsd"
        ;;
 arm*-*-netbsd*)
        tm_file="arm/aout.h arm/arm.h netbsd.h netbsd-aout.h arm/netbsd.h"
        tmake_file="t-netbsd arm/t-netbsd"
+       extra_parts=""
        use_collect2=yes
        ;;
 arm*-*-linux*)                 # ARM GNU/Linux with ELF
@@ -631,34 +690,21 @@ 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-*-pe*)
        tm_file="arm/semi.h arm/aout.h arm/arm.h arm/coff.h arm/pe.h"
        tmake_file=arm/t-pe
@@ -666,8 +712,7 @@ arm-*-pe*)
        ;;
 avr-*-*)
        ;;
-c4x-*-rtems*)
-       xm_defines=POSIX
+c4x-*-rtems* | tic4x-*-rtems*)
        tmake_file="c4x/t-c4x t-rtems"
        tm_file="c4x/c4x.h c4x/rtems.h rtems.h"
        if test x$enable_threads = xyes; then
@@ -676,8 +721,7 @@ c4x-*-rtems*)
        c_target_objs="c4x-c.o"
        cxx_target_objs="c4x-c.o"
        ;;
-c4x-*)
-       float_format=c4x
+c4x-* | tic4x-*)
        tmake_file=c4x/t-c4x
        c_target_objs="c4x-c.o"
        cxx_target_objs="c4x-c.o"
@@ -695,17 +739,9 @@ cris-*-elf | cris-*-none)
 cris-*-linux*)
        tm_file="dbxelf.h elfos.h svr4.h ${tm_file} linux.h cris/linux.h"
        tmake_file="cris/t-cris t-slibgcc-elf-ver cris/t-linux"
-       extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o"
-       case x${enable_threads} in
-       x | xyes | xpthreads | xposix)
-               thread_file=posix
-               ;;
-       esac
-       gas=yes
        ;;
 d30v-*)
        tm_file="dbxelf.h elfos.h svr4.h ${tm_file}"
-       float_format=i64
        ;;
 dsp16xx-*)
        ;;
@@ -714,40 +750,36 @@ fr30-*-elf)
        tmake_file=fr30/t-fr30
        extra_parts="crti.o crtn.o crtbegin.o crtend.o"
        ;;
+frv-*-elf)
+       tm_file="dbxelf.h elfos.h svr4.h ${tm_file} frv/frv-abi.h"
+       tmake_file=frv/t-frv
+       ;;
 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
-       float_format=i32
        ;;
 h8300-*-elf*)
        tmake_file="h8300/t-h8300 h8300/t-elf"
        tm_file="h8300/h8300.h h8300/elf.h"
-       float_format=i32
        ;;
 h8300-*-*)
-       float_format=i32
        ;;
 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"
+       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
        gas=yes gnu_ld=yes
+       need_64bit_hwint=yes
        ;;
 hppa*-*-linux* | parisc*-*-linux*)
-       target_cpu_default="MASK_PA_11"
+       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"
-       extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o"
-       gas=yes gnu_ld=yes
-       if test x$enable_threads = xyes; then
-               thread_file='posix'
-       fi
        ;;
 hppa*-*-openbsd*)
        target_cpu_default="MASK_PA_11"
@@ -767,17 +799,13 @@ hppa1.1-*-osf*)
        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"
+       tmake_file="pa/t-bsd pa/t-pro t-rtems"
        xmake_file="pa/x-ada"
-       ;;
-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
+       if test x$enable_threads = xyes; then
+         thread_file='rtems'
+       fi
        ;;
 hppa1.1-*-bsd*)
        tm_file="${tm_file} pa/pa32-regs.h pa/som.h"
@@ -786,62 +814,9 @@ hppa1.1-*-bsd*)
        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
-       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"
-       float_format=i128
-       xm_defines=POSIX
        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
@@ -857,8 +832,6 @@ hppa1.1-*-hpux10* | hppa2*-*-hpux10*)
        ;;
 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"
-       float_format=i128
-       xm_defines=POSIX
        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
@@ -873,13 +846,25 @@ hppa1.0-*-hpux10*)
        use_collect2=yes
        ;;
 hppa*64*-*-hpux11*)
-       xm_defines=POSIX
-       tm_file="pa/pa64-start.h ${tm_file} pa/pa64-regs.h pa/long_double.h pa/elf.h pa/pa-hpux.h pa/pa-hpux11.h pa/pa-64.h pa/pa64-hpux.h"
-       float_format=i128
+       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/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/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
+       then
+               target_cpu_default="${target_cpu_default}|MASK_GNU_LD"
+       fi
 #      if [ x$enable_threads = x ]; then
 #          enable_threads=$have_pthread_h
 #      fi
@@ -888,13 +873,10 @@ hppa*64*-*-hpux11*)
 #              tmake_file="${tmake_file} pa/t-dce-thr"
 #      fi
        install_headers_dir=install-headers-cpio
-       use_collect2=yes
        ;;
 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"
-       float_format=i128
-       xm_defines=POSIX
        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
@@ -909,8 +891,6 @@ hppa1.1-*-hpux11* | hppa2*-*-hpux11*)
        ;;
 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"
-       float_format=i128
-       xm_defines=POSIX
        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
@@ -923,60 +903,15 @@ hppa1.0-*-hpux11*)
        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'
+       xm_defines='FATAL_EXIT_CODE=12'
        tm_file=i370/oe.h
        tmake_file="i370/t-oe i370/t-i370"
        c_target_objs="i370-c.o"
        cxx_target_objs="i370-c.o"
        ;;
 i370-*-mvs*)
-       xm_defines='POSIX FATAL_EXIT_CODE=12'
+       xm_defines='FATAL_EXIT_CODE=12'
        tm_file=i370/mvs.h
        tmake_file="i370/t-i370"
        c_target_objs="i370-c.o"
@@ -986,28 +921,18 @@ i370-*-linux*)
        tm_file="dbxelf.h elfos.h svr4.h linux.h i370/linux.h ${tm_file}"
        tmake_file="t-slibgcc-elf-ver t-linux"
        # broken_install=yes
-       extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o"
-       # extra_parts="crtbegin.o crtend.o"
-       gnu_ld=yes
-       gas=yes
        elf=yes
-       if test x$enable_threads = xyes; then
-               thread_file='posix'
-       fi
+       ;;
+i[34567]86-*-darwin*)
+       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"
        ;;
 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
        ;;
@@ -1020,25 +945,16 @@ i[34567]86-sequent-ptx4* | i[34567]86-sequent-sysv4*)
        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'
-       ;;
 i[34567]86-*-aout*)
        tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h i386/i386-aout.h"
        ;;
 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'
@@ -1055,16 +971,15 @@ x86_64-*-freebsd*)
        ;;
 i[34567]86-*-netbsdelf*)
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h netbsd.h netbsd-elf.h i386/netbsd-elf.h"
-       float_format=i386
        ;;
 i[34567]86-*-netbsd*)
        tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h netbsd.h netbsd-aout.h i386/netbsd.h"
        tmake_file=t-netbsd
+       extra_parts=""
        use_collect2=yes
        ;;
 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"
-       float_format=i386
        ;;
 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}"
@@ -1076,16 +991,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
-       ;;
 i[34567]86-*-linux*aout*)      # Intel 80386's running GNU/Linux
                                # with a.out format
        tmake_file="t-linux-aout 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
-       float_format=i386
        ;;
 i[34567]86-*-linux*libc1)      # Intel 80386's running GNU/Linux
                                # with ELF format using the
@@ -1094,7 +1004,6 @@ i[34567]86-*-linux*libc1) # Intel 80386's running GNU/Linux
        tmake_file="t-slibgcc-elf-ver t-linux t-linux-gnulibc1 i386/t-crtstuff"
        extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
        gnu_ld=yes
-       float_format=i386
        if test x$enable_threads = xyes; then
                thread_file='single'
        fi
@@ -1104,30 +1013,13 @@ i[34567]86-*-linux*)    # Intel 80386's running GNU/Linux
                        # aka GNU/Linux C library 6
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h linux.h i386/linux.h"
        tmake_file="t-slibgcc-elf-ver t-linux i386/t-crtstuff"
-       extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o"
-       gnu_ld=yes
-       float_format=i386
-       if test x$enable_threads = xyes; then
-               thread_file='posix'
-       fi
        ;;
 x86_64-*-linux*)
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h linux.h \
                 i386/x86-64.h i386/linux64.h"
-       tmake_file="t-slibgcc-elf-ver t-linux i386/t-crtstuff i386/t-linux64"
-       extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o"
-       gnu_ld=yes
-       float_format=i386
-       if test x$enable_threads = xyes; then
-               thread_file='posix'
-       fi
+       tmake_file="t-slibgcc-elf-ver t-linux i386/t-linux64"
        ;;
 i[34567]86-*-gnu*)
-       float_format=i386
-       ;;
-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-pc-msdosdjgpp*)
        xm_file=i386/xm-djgpp.h
@@ -1136,7 +1028,6 @@ i[34567]86-pc-msdosdjgpp*)
        gnu_ld=yes
        gas=yes
        exeext=.exe
-       float_format=none
        case $host in *pc-msdosdjgpp*)
                target_alias=djgpp
                ;;
@@ -1161,13 +1052,7 @@ i[34567]86-*-mach*)
 #      tmake_file=t-libc-ok
        use_collect2=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-*-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"
@@ -1176,20 +1061,17 @@ i[34567]86-*-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 i386/sco5.h"
+       tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h i386/sco5.h"
        if test x$gas = xyes
        then
                tm_file="usegas.h ${tm_file}"
-               tmake_file=i386/t-sco5gas
-       else
-               tmake_file=i386/t-sco5
        fi
-       extra_parts="crti.o crtbegin.o crtend.o crtbeginS.o crtendS.o"
+       tmake_file=i386/t-sco5
+       extra_parts="crtbegin.o crtend.o"
        ;;
 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
@@ -1213,7 +1095,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
@@ -1226,7 +1107,7 @@ i[34567]86-*-sysv5*)           # Intel x86 on System V Release 5
        fi
        ;;
 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
@@ -1236,14 +1117,12 @@ i[34567]86-*-sysv4*)            # Intel 80386's running system V.4
        extra_parts="crtbegin.o crtend.o"
        ;;
 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
        ;;
 i[34567]86-*-sysv*)            # Intel 80386's running system V
-       xm_defines=POSIX
        if test x$gas = xyes
        then
                if test x$stabs = xyes
@@ -1267,36 +1146,23 @@ 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"
        ;;
-i[34567]86-*-win32)
-       xm_defines=POSIX
-       xm_file=i386/xm-cygwin.h
-       float_format=i386
-       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[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
-       float_format=i386
-       tmake_file=i386/t-cygwin
-       tm_file=i386/cygwin.h
+       tmake_file="i386/t-cygming i386/t-cygwin"
        extra_objs=winnt.o
+       c_target_objs=cygwin2.o
+       cxx_target_objs=cygwin2.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
-       float_format=i386
-       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"
+       xmake_file=i386/x-mingw32
        extra_objs=winnt.o
        if test x$enable_threads = xyes; then
                thread_file='win32'
@@ -1306,12 +1172,12 @@ i[34567]86-*-mingw32*)
                *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
@@ -1321,10 +1187,8 @@ i[34567]86-*-uwin*)
        ;;
 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"
-       extra_objs=interix.o
+       extra_objs=winnt.o
        xmake_file="x-interix"
        if test x$enable_threads = xyes ; then
                thread_file='posix'
@@ -1335,10 +1199,8 @@ 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"
-       extra_objs=interix.o
+       extra_objs=winnt.o
        if test x$enable_threads = xyes ; then
                thread_file='posix'
        fi
@@ -1346,30 +1208,6 @@ 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"
-       ;;
 i960-*-coff*)
        tm_file="${tm_file} dbxcoff.h i960/i960-coff.h libgloss.h"
        tmake_file=i960/t-960bare
@@ -1377,7 +1215,6 @@ 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
@@ -1392,11 +1229,6 @@ i960-*-*)                        # Default i960 environment.
        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"
-       ;;
 ia64*-*-elf*)
        tm_file="${tm_file} dbxelf.h elfos.h ia64/sysv4.h ia64/elf.h"
        tmake_file="ia64/t-ia64"
@@ -1409,22 +1241,22 @@ ia64*-*-elf*)
        then
                target_cpu_default="${target_cpu_default}|MASK_GNU_LD"
        fi
-       float_format=i386
+       extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtfastmath.o"
        ;;
 ia64*-*-freebsd*)
        tm_file="${tm_file} dbxelf.h elfos.h ${fbsd_tm_file} ia64/sysv4.h ia64/freebsd.h"
        target_cpu_default="MASK_GNU_AS|MASK_GNU_LD"
        tmake_file="${tmake_file} ia64/t-ia64"
-       float_format=i386
+       extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtfastmath.o"
        ;;
 ia64*-*-linux*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h linux.h ia64/sysv4.h ia64/linux.h"
        tmake_file="t-slibgcc-elf-ver t-linux ia64/t-ia64 ia64/t-glibc"
        target_cpu_default="MASK_GNU_AS|MASK_GNU_LD"
-       if test x$enable_threads = xyes; then
-               thread_file='posix'
+       extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtfastmath.o"
+       if test x"$use_libunwind_exceptions" = xyes; then
+         tmake_file="$tmake_file t-libunwind"
        fi
-       float_format=i386
        ;;
 ia64*-*-hpux*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h ia64/sysv4.h ia64/hpux.h ia64/hpux_longdouble.h"
@@ -1434,14 +1266,15 @@ ia64*-*-hpux*)
                thread_file='posix'
        fi
        use_collect2=no
-       float_format=i128
+       c_target_objs="ia64-c.o"
+       cxx_target_objs="ia64-c.o"
        ;;
-ip2k-*-elf)            
+ip2k-*-elf)
        ;;
 m32r-*-elf*)
        tm_file="dbxelf.h elfos.h svr4.h ${tm_file}"
        extra_parts="crtinit.o crtfini.o"
-       ;;
+       ;;
 # m68hc11 and m68hc12 share the same machine description.
 m68hc11-*-*|m6811-*-*)
        tm_file="dbxelf.h elfos.h m68hc11/m68hc11.h"
@@ -1457,12 +1290,7 @@ m68hc12-*-*|m6812-*-*)
        out_file="m68hc11/m68hc11.c"
        tmake_file="m68hc11/t-m68hc11-gas"
         ;;
-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
        if test x$gas = xyes
        then
                tm_file=m68k/hp310g.h
@@ -1473,174 +1301,36 @@ m68000-hp-hpux*)               # HP 9000 series 300
        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
+m68k-hp-hpux7*)        # HP 9000 series 300 running HPUX version 7.
        if test x$gas = xyes
        then
-               tm_file=m68k/3b1g.h
+               tm_file=m68k/hp320g.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"
-       float_format=m68k
-       ;;
-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"
-       float_format=m68k
-       ;;
-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"
-       float_format=m68k
-       ;;
-m68k-ccur-rtu)
-       tm_file=m68k/ccur-GAS.h
-       use_collect2=yes
-       float_format=m68k
-       ;;
-m68k-hp-bsd4.4*)               # HP 9000/3xx running 4.4bsd
-       tm_file=m68k/hp3bsd44.h
-       use_collect2=yes
-       float_format=m68k
-       ;;
-m68k-hp-bsd*)                  # HP 9000/3xx running Berkeley Unix
-       tm_file=m68k/hp3bsd.h
-       use_collect2=yes
-       float_format=m68k
-       ;;
-m68k-hp-hpux7*)        # HP 9000 series 300 running HPUX version 7.
-       xm_defines=POSIX
-       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/hpux7.h
        fi
        install_headers_dir=install-headers-cpio
        use_collect2=yes
-       float_format=m68k
        ;;
 m68k-hp-hpux*) # HP 9000 series 300
-       xm_defines=POSIX
        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
-       float_format=m68k
-       ;;
-m68k-sun-mach*)
-       tm_file=m68k/sun3mach.h
-       use_collect2=yes
-       float_format=m68k
-       ;;
-m68k-sun-sunos3*)
-       if test x$with_fp = xno
-       then
-               tm_file=m68k/sun3n3.h
-       else
-               tm_file=m68k/sun3o3.h
-               float_format=m68k
-       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
-               float_format=m68k
-       fi
-       use_collect2=yes
-       ;;
-m68k-wrs-vxworks*)
-       tm_file=m68k/vxm68k.h
-       tmake_file=m68k/t-vxworks68
-       thread_file='vxworks'
-       float_format=m68k
        ;;
 m68k-*-aout*)
        tmake_file=m68k/t-m68kbare
        tm_file="m68k/m68k-aout.h libgloss.h"
-       float_format=m68k
        ;;
 m68k-*-coff*)
        tmake_file=m68k/t-m68kbare
        tm_file="m68k/m68k-coff.h dbx.h"
-       float_format=m68k
        ;;
 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
        tmake_file=m68k/t-m68kelf
        extra_parts="crtbegin.o crtend.o"
        ;;
@@ -1654,89 +1344,38 @@ m68010-*-netbsdelf* | m68k*-*-netbsdelf*)
                target_cpu_default="MASK_68020|MASK_68881|MASK_BITFIELD"
                ;;
        esac
-       float_format=m68k
        ;;
 m68k*-*-netbsd*)
        tm_file=m68k/netbsd.h
        tmake_file=t-netbsd
-       float_format=m68k
+       extra_parts=""
        use_collect2=yes
        ;;
 m68k*-*-openbsd*)
        # needed to unconfuse gdb
        tmake_file="t-libc-ok t-openbsd m68k/t-openbsd"
-       float_format=m68k
        # 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
        tmake_file=t-svr4
        extra_parts="crtbegin.o crtend.o"
-       float_format=m68k
-       ;;
-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"
-       float_format=m68k
-       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"
-       float_format=m68k
-       gnu_ld=yes
        ;;
 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"
-       extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-       float_format=m68k
-       gnu_ld=yes
-       if test x$enable_threads = xyes; then
-               thread_file='posix'
-       fi
-       ;;
-m68k-*-psos*)
-       tmake_file=m68k/t-m68kbare
-       tm_file=m68k/m68k-psos.h
-       float_format=m68k
-       ;;
-m68k-*-rtemscoff*)     # would otherwise be caught by m68k-*-rtems*
-       echo "*** Configuration $machine not supported" 1>&2
-       exit 1
+       tmake_file="t-slibgcc-elf-ver t-linux"
        ;;
 m68k-*-rtems*)
-       xm_defines=POSIX
        tmake_file="m68k/t-m68kbare t-rtems m68k/t-crtstuff"
        tm_file="m68k/m68k-none.h m68k/m68kelf.h dbxelf.h elfos.h m68k/m68kemb.h m68k/m68020-elf.h m68k/rtemself.h rtems.h"
-       float_format=m68k
        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
@@ -1748,18 +1387,18 @@ mcore-*-pe*)
 mips-sgi-irix6*o32)            # SGI System V.4., IRIX 6, O32 ABI
        if test x$gas = xyes
        then
-               tm_file="mips/iris5.h mips/iris5gas.h"
+               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"
                fi
+               tmake_file=mips/t-iris5-gas
        else
                tm_file="mips/iris5.h mips/iris6-o32-as.h"
                tmake_file=mips/t-iris5-as
        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.
@@ -1776,22 +1415,12 @@ mips-sgi-irix6*)                # SGI System V.4., IRIX 6
                tm_file=mips/iris6.h
        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="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'
-       ;;
 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
        tmake_file="mips/t-iris mips/t-cross64"
        # See comment in mips/iris[56].h files.
@@ -1800,24 +1429,6 @@ mips-sgi-irix5cross64)           # Irix5 host, Irix 6 target, cross64
 #              thread_file='irix'
 #      fi
        ;;
-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
        if test x$gas = xyes
        then
@@ -1826,12 +1437,12 @@ mips-sgi-irix5*)                # SGI System V.4., IRIX 5
                then
                        tm_file="${tm_file} dbx.h"
                fi
+               tmake_file=mips/t-iris5-gas
        else
                tm_file=mips/iris5.h
                tmake_file=mips/t-iris5-as
        fi
        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.
@@ -1840,23 +1451,22 @@ mips-sgi-irix5*)                # SGI System V.4., IRIX 5
 #              thread_file='irix'
 #      fi
        ;;
-mips-sgi-*)    # would otherwise be caught by mips-*-elf*
-       echo "*** Configuration $machine not supported" 1>&2
-       exit 1
-       ;;
 mips*-*-netbsd*)                       # NetBSD/mips, either endian.
-       tm_file="elfos.h mips/netbsd.h"
-       tmake_file="${tmake_file} mips/t-netbsd"
+       target_cpu_default="MASK_GAS|MASK_ABICALLS"
+       tm_file="elfos.h ${tm_file} mips/netbsd.h"
+       tmake_file="${tmake_file}"
        ;;
-mips*-*-linux*)                                # Linux MIPS, either endian.
-        tm_file="dbxelf.h elfos.h svr4.h linux.h mips/linux.h"
-       case $machine in
-        mipsisa32*-*)
-                tm_file="$tm_file mips/isa32-linux.h"
-                target_cpu_default="MASK_SOFT_FLOAT"
-                ;;
-        esac
-       tmake_file="t-slibgcc-elf-ver t-linux mips/t-linux"
+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
@@ -1864,6 +1474,16 @@ mips*-*-linux*)                          # Linux MIPS, either endian.
                thread_file='posix'
        fi
        ;;
+mips*-*-linux*)                                # Linux MIPS, either endian.
+        tm_file="dbxelf.h elfos.h svr4.h linux.h ${tm_file} mips/linux.h"
+       case $machine in
+        mipsisa32*-*)
+                target_cpu_default="MASK_SOFT_FLOAT"
+               tm_defines="MIPS_ISA_DEFAULT=32"
+                ;;
+        esac
+       tmake_file="t-slibgcc-elf-ver t-linux"
+       ;;
 mips*el-*-openbsd*)    # mips little endian
        target_cpu_default="MASK_GAS|MASK_ABICALLS"
        ;;
@@ -1871,66 +1491,69 @@ mips*-*-openbsd*)               # mips big endian
        target_cpu_default="MASK_GAS|MASK_ABICALLS"
        tm_file="mips/openbsd-be.h ${tm_file}"
        ;;
-mips-*-ecoff* | mipsel-*-ecoff*)
-       tm_file="gofast.h mips/ecoff.h"
-       if test x$stabs = xyes; then
-               tm_file="${tm_file} dbx.h"
-       fi
-       tmake_file=mips/t-ecoff
-       ;;
 mipsisa32-*-elf* | mipsisa32el-*-elf*)
-       tm_file="mips/isa3264.h mips/abi64.h"
+       tm_file="${tm_file} mips/elf.h"
+       tmake_file=mips/t-isa3264
+       tm_defines="MIPS_ISA_DEFAULT=32 MIPS_ABI_DEFAULT=ABI_EABI"
+       ;;
+mipsisa32r2-*-elf* | mipsisa32r2el-*-elf*)
+       tm_file="${tm_file} mips/elf.h"
        tmake_file=mips/t-isa3264
-       target_cpu_default="MASK_SOFT_FLOAT"
+       tm_defines="MIPS_ISA_DEFAULT=33 MIPS_ABI_DEFAULT=ABI_EABI"
        ;;
 mipsisa64-*-elf* | mipsisa64el-*-elf*)
-       tm_file="mips/isa3264.h mips/abi64.h"
+       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"
+       tm_defines="MIPS_ISA_DEFAULT=64 MIPS_ABI_DEFAULT=ABI_EABI"
+       ;;
+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_EABI"
+        ;;
+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"
        ;;
 mips-*-elf* | mipsel-*-elf*)
-       tm_file="mips/elf.h"
+       tm_file="${tm_file} mips/elf.h"
        tmake_file=mips/t-elf
        ;;
 mips64-*-elf* | mips64el-*-elf*)
-       tm_file="mips/elf64.h"
+       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"
        ;;
+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
+        ;;
 mips64orion-*-elf* | mips64orionel-*-elf*)
-       tm_file="mips/elforion.h mips/elf64.h"
+       tm_file="${tm_file} mips/elforion.h mips/elf64.h"
        tmake_file=mips/t-elf
-       ;;
-mips64orion-*-rtems*)
-       xm_defines=POSIX
-       tm_file="mips/elforion.h mips/elf64.h mips/rtems64.h rtems.h"
-       tmake_file="mips/t-elf t-rtems"
-       if test x$enable_threads = xyes; then
-         thread_file='rtems'
-       fi
+       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"
        ;;
 mips*-*-rtems*)
-       xm_defines=POSIX
-       tm_file="mips/elf.h mips/rtems.h rtems.h"
+       tm_file="${tm_file} mips/elf.h mips/rtems.h rtems.h"
        tmake_file="mips/t-elf t-rtems"
        if test x$enable_threads = xyes; then
          thread_file='rtems'
        fi
        ;;
 mipstx39-*-elf* | mipstx39el-*-elf*)
-       tm_file="mips/r3900.h mips/elf.h mips/abi64.h"
+       tm_file="${tm_file} mips/r3900.h mips/elf.h"
        tmake_file=mips/t-r3900
        ;;
 mmix-knuth-mmixware)
-       ;;
-mn10200-*-*)
-       float_format=i32
-       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}"
@@ -1946,7 +1569,8 @@ ns32k-*-netbsdelf*)
 ns32k-*-netbsd*)
        tm_file="${tm_file} netbsd.h netbsd-aout.h ns32k/netbsd.h"
        # On NetBSD, the headers are already okay, except for math.h.
-       tmake_file=t-netbsd
+       tmake_file="t-netbsd ns32k/t-ns32k"
+       extra_parts=""
        use_collect2=yes
        ;;
 pdp11-*-bsd)
@@ -1956,254 +1580,175 @@ pdp11-*-*)
        ;;
 avr-*-*)
        ;;
-ns32k-*-openbsd*)
-       # Nothing special
-       ;;
-romp-*-openbsd*)
-       # Nothing special
-       ;;
 powerpc-*-openbsd*)
-       tmake_file="${tmake_file} rs6000/t-rs6000 rs6000/t-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=
        ;;
 powerpc-*-darwin*)
-       tm_file="${tm_file} darwin.h rs6000/darwin.h"
-       tm_p_file="${tm_p_file} darwin-protos.h"
-       tmake_file=rs6000/t-darwin
-       extra_objs="darwin.o"
-       config_gtfiles="${config_gtfiles} \$(srcdir)/config/darwin.c"
-       c_target_objs="darwin-c.o"
-       cxx_target_objs="darwin-c.o"
-       # Darwin linker does collect2 functionality
-       use_collect2=no
+       tm_file="${tm_file} rs6000/darwin.h"
+       tmake_file="rs6000/t-fprules t-darwin rs6000/t-darwin"
        extra_headers=altivec.h
+       # override ppc default
+       need_64bit_hwint=
+       # powerpc-darwin host support.
+       host_hook_obj=host-darwin.o
+       xmake_file=rs6000/x-darwin
        ;;
 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 svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/netbsd.h"
-       tmake_file="rs6000/t-ppcos rs6000/t-ppccomm"
+       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"
+       tmake_file="rs6000/t-fprules rs6000/t-ppcos rs6000/t-ppccomm"
        case x${enable_threads} in
          xyes | xpthreads | xposix)
                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"
+powerpc-*-eabispe*)
+       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-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"
        ;;
 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-ppcgas t-rtems rs6000/t-ppccomm"
+       tmake_file="rs6000/t-fprules t-rtems rs6000/t-ppccomm"
        if test x$enable_threads = xyes; then
          thread_file='rtems'
        fi
        ;;
-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"
-       if test x$enable_threads = xyes; then
-               thread_file='posix'
-       fi
+       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"
-       if test x$enable_threads = xyes; then
-               thread_file='posix'
-       fi
+       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'
-        ;;
+       # 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*)
-        xm_defines=POSIX
        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'
-        ;;
 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"
        ;;
 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"
        ;;
 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"
-       ;;
-rs6000-ibm-aix3.[01]*)
-       xm_defines=POSIX
-       tm_file="${tm_file} rs6000/aix.h rs6000/aix31.h rs6000/xcoff.h"
-       float_format=none
-       use_collect2=yes
-       ;;
-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
-       float_format=none
-       use_collect2=yes
-       extra_headers=
+       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
-       float_format=none
+       tmake_file="rs6000/t-fprules rs6000/t-newas"
        use_collect2=yes
        extra_headers=
        ;;
 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
-       float_format=none
        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/aix51.h rs6000/xcoff.h"
+rs6000-ibm-aix5.1.* | powerpc-ibm-aix5.1.*)
+       tm_file="rs6000/biarch64.h ${tm_file} rs6000/aix.h rs6000/aix51.h rs6000/xcoff.h"
        tmake_file=rs6000/t-aix43
-       float_format=none
        use_collect2=yes
        thread_file='aix'
        extra_headers=
        ;;
-rs6000-ibm-aix*)
-       xm_defines=POSIX
-       tm_file="${tm_file} rs6000/aix.h rs6000/xcoff.h"
-       float_format=none
-       use_collect2=yes
-       ;;
-rs6000-bull-bosx)
-       xm_defines=POSIX
-       tm_file="${tm_file} rs6000/aix.h rs6000/xcoff.h"
-       float_format=none
-       use_collect2=yes
-       ;;
-rs6000-*-mach*)
-       tm_file="${tm_file} rs6000/mach.h"
-       xm_defines=POSIX
+rs6000-ibm-aix[56789].* | powerpc-ibm-aix[56789].*)
+       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-*-lynxos*)
        tm_file="lynx.h rs6000/lynx.h"
-       tmake_file=rs6000/t-rs6000
+       tmake_file=rs6000/t-fprules
        use_collect2=yes
        ;;
 s390-*-linux*)
        tm_file="s390/s390.h dbxelf.h elfos.h svr4.h linux.h s390/linux.h"
-       tmake_file="t-slibgcc-elf-ver t-linux s390/t-linux"
-       extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o"
-       if test x$enable_threads = xyes; then
-               thread_file='posix'
-       fi
+       tmake_file="t-slibgcc-elf-ver t-linux s390/t-crtstuff"
        ;;
 s390x-*-linux*)
        tm_file="s390/s390x.h s390/s390.h dbxelf.h elfos.h svr4.h linux.h s390/linux.h"
@@ -2211,11 +1756,7 @@ s390x-*-linux*)
        md_file=s390/s390.md
        extra_modes=s390/s390-modes.def
        out_file=s390/s390.c
-       tmake_file="t-slibgcc-elf-ver t-linux s390/t-linux s390/t-linux64"
-       extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o"
-       if test x$enable_threads = xyes; then
-               thread_file='posix'
-       fi
+       tmake_file="t-slibgcc-elf-ver t-linux s390/t-crtstuff s390/t-linux64"
        ;;
 sh-*-elf* | sh[2346l]*-*-elf*)
        tmake_file="sh/t-sh sh/t-elf"
@@ -2226,7 +1767,6 @@ sh-*-elf* | sh[2346l]*-*-elf*)
                ;;
        esac
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h sh/embed-elf.h"
-       float_format=sh
        case $machine in
        sh64*)
                tmake_file="${tmake_file} sh/t-sh64"
@@ -2237,6 +1777,7 @@ 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
@@ -2244,25 +1785,21 @@ sh-*-elf* | sh[2346l]*-*-elf*)
        esac
        ;;
 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"
-       float_format=sh
        if test x$enable_threads = xyes; then
          thread_file='rtems'
        fi
        ;;
 sh-*-rtems*)
-       xm_defines=POSIX
        tmake_file="sh/t-sh t-rtems"
        tm_file="${tm_file} sh/coff.h sh/rtems.h rtems.h"
-       float_format=sh
        if test x$enable_threads = xyes; then
          thread_file='rtems'
        fi
        ;;
 sh-*-linux* | sh[2346lbe]*-*-linux*)
-       tmake_file="sh/t-sh sh/t-elf sh/t-linux"
+       tmake_file="sh/t-sh sh/t-elf t-slibgcc-elf-ver t-linux sh/t-linux"
        case $machine in
        sh*be-*-* | sh*eb-*-*) ;;
        *)
@@ -2271,11 +1808,6 @@ sh-*-linux* | sh[2346lbe]*-*-linux*)
                ;;
        esac
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h sh/elf.h sh/linux.h"
-       gas=yes gnu_ld=yes
-       if test x$enable_threads = xyes; then
-               thread_file='posix'
-       fi
-       float_format=sh
        case $machine in
        sh64*)
                tmake_file="${tmake_file} sh/t-sh64"
@@ -2288,6 +1820,9 @@ 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
@@ -2310,7 +1845,7 @@ sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \
        case $machine 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*-*)
@@ -2324,39 +1859,16 @@ sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \
                tmake_file="${tmake_file} sh/t-netbsd"
                ;;
        esac
-       float_format=sh
        ;;
 sh-*-*)
        tm_file="${tm_file} sh/coff.h"
-       float_format=sh
        ;;
 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"
        ;;
 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
-       use_collect2=yes
-       ;;
 sparc-*-openbsd*)
        tm_file="sparc/sparc.h ${tm_file}"
        # needed to unconfuse gdb
@@ -2366,73 +1878,22 @@ sparc-*-openbsd*)
        ;;
 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
        gas=yes gnu_ld=yes
        with_cpu=ultrasparc
-       float_format=i128
-       ;;
-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"
-       float_format=i64
-       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"
-       #float_format=i128
-       float_format=i64
        ;;
-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
-       float_format=sparc
-       ;;
-sparc-*-linux*)                # Sparc's running GNU/Linux, libc6
+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"
-       extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o"
-       gnu_ld=yes
-       if test x$enable_threads = xyes; then
-               thread_file='posix'
-       fi
-       float_format=sparc
-       ;;
-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"
-       #float_format=i128
-       float_format=i64
        if test x$enable_threads = xyes; then
          thread_file='rtems'
        fi
@@ -2445,7 +1906,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"
@@ -2453,7 +1913,6 @@ sparc64-*-solaris2* | sparcv9-*-solaris2*)
                tmake_file="$tmake_file t-slibgcc-sld"
        fi
        extra_parts="crt1.o crti.o crtn.o gcrt1.o crtbegin.o crtend.o"
-       float_format=i128
        if test x${enable_threads} = x ; then
            enable_threads=$have_pthread_h
            if test x${enable_threads} = x ; then
@@ -2467,21 +1926,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"
-       float_format=i128
-       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
@@ -2508,11 +1954,10 @@ 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"
-       float_format=i128
        if test x${enable_threads} = x; then
            enable_threads=$have_pthread_h
            if test x${enable_threads} = x; then
@@ -2527,54 +1972,20 @@ 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
-       ;;
 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"
-       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"
        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
-       ;;
 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"
        tmake_file="sparc/t-sp86x sparc/t-crtfm"
@@ -2597,22 +2008,16 @@ sparc64-*-freebsd*|ultrasparc-*-freebsd*)
                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
+sparc64-*-linux*)              # 64-bit SPARC's running GNU/Linux
        tmake_file="t-slibgcc-elf-ver t-linux sparc/t-linux64 sparc/t-crtfm"
        tm_file="sparc/biarch64.h ${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/linux64.h"
-       extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o"
-       gnu_ld=yes
-       if test x$enable_threads = xyes; then
-               thread_file='posix'
-       fi
-       float_format=sparc
        ;;
 sparc64-*-netbsd*)
        tmake_file="${tmake_file} sparc/t-netbsd64"
        tm_file="sparc/biarch64.h ${tm_file}"
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h netbsd.h netbsd-elf.h sparc/netbsd-elf.h"
-       float_format=sparc
        ;;
 strongarm-*-elf*)
        tm_file="arm/strongarm-elf.h dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h"
@@ -2621,13 +2026,6 @@ strongarm-*-elf*)
        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
-       ;;
 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"
        tmake_file=arm/t-strongarm-pe
@@ -2636,16 +2034,13 @@ strongarm-*-pe)
        extra_modes=arm/arm-modes.def
        extra_objs=pe.o
        ;;
-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; }
-       ;;
-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"
+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
+       md_file=v850/v850.md
+       out_file=v850/v850.c
        if test x$stabs = xyes
        then
                tm_file="${tm_file} dbx.h"
@@ -2669,38 +2064,31 @@ v850-*-*)
 vax-*-bsd*)                    # VAXen running BSD
        tm_file="${tm_file} vax/bsd.h"
        use_collect2=yes
-       float_format=vax
        ;;
 vax-*-sysv*)                   # VAXen running system V
        tm_file="${tm_file} vax/vaxv.h"
-       xm_defines=POSIX
-       float_format=vax
        ;;
 vax-*-netbsdelf*)
-       echo "GCC does not yet support the ${machine} target"; exit 1
+       tm_file="${tm_file} elfos.h netbsd.h netbsd-elf.h vax/elf.h vax/netbsd-elf.h"
        ;;
 vax-*-netbsd*)
        tm_file="${tm_file} netbsd.h netbsd-aout.h vax/netbsd.h"
        tmake_file=t-netbsd
-       float_format=vax
+       extra_parts=""
        use_collect2=yes
        ;;
 vax-*-openbsd*)
        tm_file="vax/vax.h vax/openbsd1.h openbsd.h ${tm_file}"
-       float_format=vax
        use_collect2=yes
        ;;
 vax-*-ultrix*)                 # VAXen running ultrix
        tm_file="${tm_file} vax/ultrix.h"
-       float_format=vax
        ;;
 vax-*-vms*)                    # VAXen running VMS
-       xm_file=vax/xm-vms.h
-       tm_file=vax/vms.h
-       float_format=vax
+       echo "Configuration $machine no longer supported" 1>&2
+       exit 1
        ;;
 vax-*-*)                       # VAX default entry
-       float_format=vax
        ;;
 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"
@@ -2727,19 +2115,11 @@ xstormy16-*-elf)
        ;;
 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-linux xtensa/t-xtensa"
-       extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o"
-       gas=yes gnu_ld=yes
-       if test x$enable_threads = xyes; then
-               thread_file='posix'
-       fi
+       tmake_file="t-slibgcc-elf-ver t-linux xtensa/t-xtensa xtensa/t-linux"
        ;;
 *)
        echo "*** Configuration $machine not supported" 1>&2
@@ -2753,222 +2133,491 @@ case $machine in
        ;;
 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
+# Support for --with-cpu and related options (and a few unrelated options,
+# too).  Only do this if $machine is the target, or we'll try to validate
+# the CPU argument against the wrong machine type.
+
+if test "x$pass2done" = xyes
+then
+       case "x$with_cpu" in
+       xyes | xno)
+               echo "--with-cpu must be passed a value" 1>&2
+               exit 1
+               ;;
+       esac
+
+       # If there is no $with_cpu option, try to infer one from ${machine}.
+       # This block sets nothing except for with_cpu.
+       if test x$with_cpu = x
+       then
+               case $machine in
+               ep9312-*-*)
+                       # A Cirrus ARM variant.
+                       with_cpu="ep9312"
+                       ;;
+               i486-*-*)
+                       with_cpu=i486
+                       ;;
+               i586-*-*)
+                       case $target_alias 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_alias in
+                       k8-*)
+                               with_cpu=k8
+                               ;;
+                       athlon_xp-*|athlon_mp-*|athlon_4-*)
+                               with_cpu=athlon-4
+                               ;;
+                       athlon_tbird-*|athlon-*)
+                               with_cpu=athlon
+                               ;;
+                       pentium2-*)
+                               with_cpu=pentium2
+                               ;;
+                       pentium3-*)
+                               with_cpu=pentium3
+                               ;;
+                       pentium4-*)
+                               with_cpu=pentium4
+                               ;;
+                       *)
+                               with_cpu=pentiumpro
+                               ;;
+                       esac
+                       ;;
+               x86_64-*-*)
+                       with_cpu=k8
+                       ;;
+               alpha*-*-*)
+                       case $machine in
+                       alphaev6[78]*)
+                               with_cpu=ev67
+                               ;;
+                       alphaev6*)
+                               with_cpu=ev6
+                               ;;
+                       alphapca56*)
+                               with_cpu=pca56
+                               ;;
+                       alphaev56*)
+                               with_cpu=ev56
+                               ;;
+                       alphaev5*)
+                               with_cpu=ev5
+                               ;;
+                       esac
+                       ;;
+               sparc*-*-*)
+                       with_cpu="`echo $machine | sed 's/-.*$//'`"
+                       ;;
+               esac
+       fi
+
+       # Similarly for --with-schedule.
+       if test x$with_schedule = x; then
+               case $machine 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 "$machine" in
+       alpha*-*-*)
+               supported_defaults="cpu tune"
+               for which in cpu tune; do
+                       eval "val=\$with_$which"
+                       case "x$val" in
+                       x \
+                       | xev4 | xev45 | x21064 | xev5 | x21164 | xev56 | x21164a \
+                       | xpca56 | x21164PC | x21164pc | xev6 | x21264 | xev67 \
+                       | x21264a)
+                               ;;
+                       *)
+                               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 "x$val" in
+                       x \
+                       | xarm[236789] | xarm250 | xarm[67][01]0 \
+                       | xarm60 | xarm620 | xarm7d | xarm7di \
+                       | xarm7m | xarm7dm | xarm7dmi | xarm[79]tdmi \
+                       | xarm70 | xarm700i | xarm710t | xarm720 \
+                       | xarm720t | xarm740t | xarm710c | xarm920 \
+                       | xarm920t | xarm940t | xarm9e | xarm10tdmi \
+                       | xarm7100 | xarm7500 | xarm7500fe | xarm810 \
+                       | xarm1020t \
+                       | xxscale \
+                       | xep9312 \
+                       | xstrongarm | xstrongarm110 | xstrongarm11[01]0)
+                               # OK
+                               ;;
+                       *)
+                               echo "Unknown CPU used in --with-$which=$val" 1>&2
+                               exit 1
+                               ;;
+                       esac
+               done
+
+               case "x$with_arch" in
+               x \
+               | xarmv[2345] | xarmv2a | xarmv3m | xarmv4t | xarmv5t \
+               | xarmv5te | 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-*)
-                       target_cpu_default2=TARGET_CPU_DEFAULT_pentium_mmx
+               esac
+
+               case "x$with_float" in
+               x \
+               | xsoft | xhard)
+                       # 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 "x$with_arch" in
+               x | x1.0 | x1.1 | x2.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 "x$with_schedule" in
+               x | x700 | x7100 | x7100LC | x7200 | x7300 | x8000)
+                       # 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 "x$val" in
+                       x \
+                       | xi386 | xi486 \
+                       | xi586 | xpentium | xpentium-mmx | xwinchip-c6 | xwinchip2 \
+                       | xc3 | xc3-2 | xi686 | xpentiumpro | xpentium2 | xpentium3 \
+                       | xpentium4 | xk6 | xk6-2 | xk6-3 | xathlon | xathlon-tbird \
+                       | xathlon-4 | xathlon-xp | xathlon-mp | xk8)
+                               # OK
+                               ;;
+                       *)
+                               echo "Unknown CPU given in --with-$which=$val." 1>&2
+                               exit 1
+                               ;;
+                       esac
+               done
+               ;;
+
+       mips*-*-*)
+               supported_defaults="abi arch float tune"
+
+               case "x$with_float" in
+               x \
+               | xsoft | xhard)
+                       # 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 "x$with_abi" in
+               x \
+               | x32 | xo64 | xn32 | x64 | xeabi)
+                       # OK
+                       ;;
+               *)
+                       echo "Unknown ABI used in --with-abi=$with_abi" 1>&2
+                       exit 1
                        ;;
-               alphaev6*)
-                       target_cpu_default2="MASK_CPU_EV6|MASK_BWX|MASK_MAX|MASK_FIX"
+               esac
+               ;;
+
+       powerpc*-*-* | rs6000-*-*)
+               supported_defaults="cpu float tune"
+
+               for which in cpu tune; do
+                       eval "val=\$with_$which"
+                       case "x$val" in
+                       x \
+                       | xdefault32 | xdefault64 \
+                       | xcommon \
+                       | xpower | xpower2 | xpower3 | xpower4 \
+                       | xpowerpc | xpowerpc64 \
+                       | xrios | xrios1 | xrios2 | xrsc | xrsc1 | xrs64a \
+                       | x401 | x403 | x405 | x405fp | x440 | x440fp | x505 \
+                       | x601 | x602 | x603 | x603e | xec603e | x604 \
+                       | x604e | x620 | x630 | x740 | x750 | x7400 | x7450 \
+                       | x8540 | x801 | x821 | x823 | x860)
+                               # OK
+                               ;;
+                       *)
+                               echo "Unknown cpu used in --with-$which=$val." 1>&2
+                               exit 1
+                               ;;
+                       esac
+               done
+               ;;
+
+       sparc*-*-*)
+               supported_defaults="cpu float tune"
+
+               for which in cpu tune; do
+                       eval "val=\$with_$which"
+                       case x$val in
+                       x \
+                       | xsparc | xsparcv9 | xsparc64 | xsparc86x \
+                       | xv7 | xcypress | xv8 | xsupersparc | xsparclite | xf930 \
+                       | xf934 | xhypersparc | xsparclite86x | xsparclet | tsc701 \
+                       | xv9 | xultrasparc | xultrasparc3)
+                               # OK
+                               ;;
+                       *)
+                               echo "Unknown cpu used in --with-$which=$val" 1>&2
+                               exit 1
+                               ;;
+                       esac
+               done
+
+               case "x$with_float" in
+               x \
+               | xsoft | xhard)
+                       # OK
                        ;;
-               alphapca56*)
-                       target_cpu_default2="MASK_CPU_EV5|MASK_BWX|MASK_MAX"
+               *)
+                       echo "Unknown floating point type used in --with-float=$with_float" 1>&2
+                       exit 1
                        ;;
-               alphaev56*)
-                       target_cpu_default2="MASK_CPU_EV5|MASK_BWX"
+               esac
+               ;;
+
+       v850*-*-*)
+               supported_defaults=cpu
+               case "x$with_cpu" in
+               x | xv850e)
+                       # OK
                        ;;
-               alphaev5*)
-                       target_cpu_default2="MASK_CPU_EV5"
+               *)
+                       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 $machine 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 $machine 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 $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
                ;;
-       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
-       ;;
-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/-.*$//'`"
+               # 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)
                        ;;
-               .supersparc | .hypersparc | .ultrasparc | .v7 | .v8 | .v9)
+               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"
+       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
+
+       if test "$target_cpu_default2" != ""
+       then
+               if test "$target_cpu_default" != ""
+               then
+                       target_cpu_default="(${target_cpu_default}|${target_cpu_default2})"
+               else
+                       target_cpu_default=$target_cpu_default2
+               fi
        fi
 fi
 
@@ -2995,6 +2644,7 @@ else
                host_extra_gcc_objs=$extra_gcc_objs
                host_extra_objs=$extra_host_objs
                host_exeext=$exeext
+               out_host_hook_obj=$host_hook_obj
                pass2done=yes
        fi
 fi