OSDN Git Service

* config.gcc: Add a missing sparc64 case.
[pf3gnuchains/gcc-fork.git] / gcc / config.gcc
index b0fa319..b856842 100644 (file)
 #  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.
 #
 #                      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:
@@ -221,67 +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-*-*                    \
- | mn10200-*-*                 \
- | romp-*-*                    \
- | alpha*-*-interix*           \
- | alpha*-*-linux*libc1*       \
- | alpha*-*-linux*ecoff*       \
- | arm*-*-aout*                        \
- | arm*-*-conix*               \
- | arm*-*-oabi                 \
- | strongarm-*-coff*           \
- | hppa1.0-*-osf*              \
- | hppa1.0-*-bsd*              \
- | hppa1.[01]-*-hpux[789]*     \
- | hppa*-*-hiux*               \
- | hppa*-*-lites*              \
- | i?86-*-win32                        \
- | m68000-hp-bsd*              \
- | m68000-sun-sunos*           \
- | m68000-att-sysv*            \
- | m68k-atari-sysv*            \
- | m68k-motorola-sysv*         \
- | m68k-ncr-sysv*              \
- | m68k-plexus-sysv*           \
- | m68k-tti-*                  \
- | m68k-crds-unos*             \
- | m68k-cbm-sysv*              \
- | m68k-ccur-rtu*              \
- | m68k-hp-bsd*                        \
- | m68k-sun-mach*              \
- | m68k-sun-sunos*             \
- | m68k-*-linux*aout*          \
- | m68k-*-linux*libc1*         \
- | m68k-*-psos*                        \
- | mips*-*-ecoff*              \
- | mips-sni-sysv4              \
- | mips64orion-*-rtems*                \
- | ns32k-*-openbsd*            \
- | powerpc*-*-sysv*            \
- | powerpc*-*-linux*libc1*     \
- | rs6000-ibm-aix[123]*                \
- | rs6000-bull-bosx            \
- | rs6000-*-mach*              \
- | sparc-*-aout*               \
- | sparc-*-netbsd*aout*                \
- | sparc-*-bsd*                        \
- | sparc-*-chorusos*           \
- | sparc-*-linux*aout*         \
- | sparc-*-linux*libc1*                \
- | sparc-*-lynxos*             \
- | sparc-hal-solaris2*         \
- | sparc-*-sunos[34]*          \
- | sparclet-*-aout*            \
- | sparclite-*-aout*           \
- | sparc86x-*-aout*            \
- | v850-*-rtems*               \
- )
+ dummy)
     if test "x$enable_obsolete" != xyes; then
       echo "*** Configuration $machine is obsolete." >&2
       echo "*** Specify --enable-obsolete to build it anyway." >&2
@@ -291,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.
@@ -315,11 +300,11 @@ xscale-*-*)
        ;;
 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-*-*)
@@ -396,7 +381,7 @@ esac
 case $machine in
 *-*-linux*)
        case $machine in
-       *-*-linux*ecoff* | *-*-linux*libc1* | *-*-linux*oldld* | *-*-linux*aout*)
+        *-*-linux*libc1* | *-*-linux*aout*)
                ;;
        *)
                extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o"
@@ -469,6 +454,14 @@ case $machine in
                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
@@ -531,8 +524,6 @@ case $machine in
        c_target_objs="darwin-c.o"
        cxx_target_objs="darwin-c.o"
        extra_parts="crt2.o"
-       # Darwin linker does collect2 functionality
-       use_collect2=no
        extra_objs="darwin.o"
        ;;      
 *-*-vxworks*)
@@ -566,39 +557,6 @@ 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"
-
-       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"
@@ -699,10 +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-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
@@ -736,10 +690,6 @@ 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
@@ -755,14 +705,6 @@ 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
@@ -865,12 +807,6 @@ hppa1.1-*-rtems*)
          thread_file='rtems'
        fi
        ;;
-hppa1.0-*-osf*)
-       tm_file="${tm_file} pa/pa32-regs.h pa/som.h pa/pa-osf.h"
-       tmake_file="pa/t-bsd pa/t-pa"
-       xmake_file="pa/x-ada"
-       use_collect2=yes
-       ;;
 hppa1.1-*-bsd*)
        tm_file="${tm_file} pa/pa32-regs.h pa/som.h"
        target_cpu_default="MASK_PA_11"
@@ -878,52 +814,6 @@ 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"
-       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"
-       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"
-       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"
-       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"
-       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"
@@ -1013,47 +903,6 @@ 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"
-       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"
-       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"
-       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"
-       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='FATAL_EXIT_CODE=12'
        tm_file=i370/oe.h
@@ -1083,12 +932,7 @@ i[34567]86-*-elf*)
        ;;
 i[34567]86-ncr-sysv4*)         # NCR 3000 - ix86 running system V.4
        xm_defines="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
+       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
        ;;
@@ -1107,10 +951,6 @@ i[34567]86-sequent-ptx4* | i[34567]86-sequent-sysv4*)
        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-*-aout*)
        tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h i386/i386-aout.h"
        ;;
@@ -1151,10 +991,6 @@ 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"
@@ -1185,10 +1021,6 @@ x86_64-*-linux*)
        ;;
 i[34567]86-*-gnu*)
        ;;
-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
        tm_file="dbxcoff.h ${tm_file} i386/djgpp.h"
@@ -1220,11 +1052,6 @@ 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*)
        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"
@@ -1319,16 +1146,6 @@ 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_file=i386/xm-cygwin.h
-       tmake_file=i386/t-cygwin
-       tm_file="${tm_file} i386/win32.h"
-       extra_objs=winnt.o
-       if test x$enable_threads = xyes; then
-               thread_file='win32'
-       fi
-       exeext=.exe
-       ;;
 i[34567]86-*-pe | i[34567]86-*-cygwin*)
        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
@@ -1345,6 +1162,7 @@ i[34567]86-*-mingw32*)
        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-cygming i386/t-mingw32"
+       xmake_file=i386/x-mingw32
        extra_objs=winnt.o
        if test x$enable_threads = xyes; then
                thread_file='win32'
@@ -1456,7 +1274,7 @@ 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"
@@ -1472,10 +1290,6 @@ 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
        if test x$gas = xyes
        then
@@ -1487,95 +1301,11 @@ 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*)
-       if test x$gas = xyes
-       then
-               tm_file=m68k/3b1g.h
-       else
-               tm_file=m68k/3b1.h
-       fi
-       use_collect2=yes
-       ;;
-m68k-atari-sysv4*)              # Atari variant of V.4.
-       tm_file=m68k/atari.h
-       tmake_file=t-svr4
-       extra_parts="crtbegin.o crtend.o"
-       ;;
-m68k-apollo-sysv* | m68k-bull-sysv*)
-       # can otherwise be caught by m68k-*-sysv4*
-       echo "*** Configuration $machine not supported" 1>&2
-       exit 1
-       ;;
-m68k-motorola-sysv*)
-       tm_file=m68k/mot3300.h
-       if test x$gas = xyes
-       then
-               if test x$gnu_ld = xyes
-               then
-                       tmake_file=m68k/t-mot3300-gald
-               else
-                       tmake_file=m68k/t-mot3300-gas
-                       use_collect2=yes
-               fi
-       else
-               if test x$gnu_ld = xyes
-               then
-                       tmake_file=m68k/t-mot3300-gld
-               else
-                       tmake_file=m68k/t-mot3300
-                       use_collect2=yes
-               fi
-       fi
-       gdb_needs_out_file_path=yes
-       extra_parts="crt0.o mcrt0.o"
-       ;;
-m68k-ncr-sysv*)                        # NCR Tower 32 SVR3
-       tm_file=m68k/tower-as.h
-       extra_parts="crtbegin.o crtend.o"
-       ;;
-m68k-plexus-sysv*)
-       tm_file=m68k/plexus.h
-       use_collect2=yes
-       ;;
-m68k-tti-*)
-       tm_file=m68k/pbb.h
-       ;;
-m68k-crds-unos*)
-       tm_file=m68k/crds.h
-       use_collect2=yes
-       ;;
-m68k-cbm-sysv4*)               # Commodore variant of V.4.
-       tm_file=m68k/amix.h
-       tmake_file=t-svr4
-       extra_parts="crtbegin.o crtend.o"
-       ;;
-m68k-ccur-rtu)
-       tm_file=m68k/ccur-GAS.h
-       use_collect2=yes
-       ;;
-m68k-hp-bsd4.4*)               # HP 9000/3xx running 4.4bsd
-       tm_file=m68k/hp3bsd44.h
-       use_collect2=yes
-       ;;
-m68k-hp-bsd*)                  # HP 9000/3xx running Berkeley Unix
-       tm_file=m68k/hp3bsd.h
-       use_collect2=yes
-       ;;
 m68k-hp-hpux7*)        # HP 9000 series 300 running HPUX version 7.
        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
@@ -1584,37 +1314,13 @@ m68k-hp-hpux7*) # HP 9000 series 300 running HPUX version 7.
 m68k-hp-hpux*) # HP 9000 series 300
        if test x$gas = xyes
        then
-               xmake_file=m68k/x-hp320g
                tm_file=m68k/hp320g.h
        else
-               xmake_file=m68k/x-hp320
                tm_file=m68k/hp320.h
        fi
        install_headers_dir=install-headers-cpio
        use_collect2=yes
        ;;
-m68k-sun-mach*)
-       tm_file=m68k/sun3mach.h
-       use_collect2=yes
-       ;;
-m68k-sun-sunos3*)
-       if test x$with_fp = xno
-       then
-               tm_file=m68k/sun3n3.h
-       else
-               tm_file=m68k/sun3o3.h
-       fi
-       use_collect2=yes
-       ;;
-m68k-sun-sunos*)                       # For SunOS 4 (the default).
-       if test x$with_fp = xno
-       then
-               tm_file=m68k/sun3n.h
-       else
-               tm_file=m68k/sun3.h
-       fi
-       use_collect2=yes
-       ;;
 m68k-*-aout*)
        tmake_file=m68k/t-m68kbare
        tm_file="m68k/m68k-aout.h libgloss.h"
@@ -1656,34 +1362,12 @@ m68k-*-sysv4*)                  # Motorola m68k's running system V.4
        tmake_file=t-svr4
        extra_parts="crtbegin.o crtend.o"
        ;;
-m68k-*-linux*aout*)            # Motorola m68k's running GNU/Linux
-                               # with a.out format
-       tm_file=m68k/linux-aout.h
-       tmake_file="t-linux-aout"
-       gnu_ld=yes
-       ;;
-m68k-*-linux*libc1)            # Motorola m68k's running GNU/Linux
-                               # with ELF format using the
-                               # GNU/Linux C library 5
-       tm_file=m68k/linux.h
-       tmake_file="t-slibgcc-elf-ver t-linux t-linux-gnulibc1"
-       extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-       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-*-psos*)
-       tmake_file=m68k/t-m68kbare
-       tm_file=m68k/m68k-psos.h
-       ;;
-m68k-*-rtemscoff*)     # would otherwise be caught by m68k-*-rtems*
-       echo "*** Configuration $machine not supported" 1>&2
-       exit 1
-       ;;
 m68k-*-rtems*)
        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"
@@ -1692,18 +1376,6 @@ m68k-*-rtems*)
          thread_file='rtems'
        fi
        ;;
-m88k-*-aout*)
-       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*)
-       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
@@ -1757,23 +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
-        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
@@ -1796,10 +1451,6 @@ 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.
        target_cpu_default="MASK_GAS|MASK_ABICALLS"
        tm_file="elfos.h ${tm_file} mips/netbsd.h"
@@ -1807,7 +1458,7 @@ mips*-*-netbsd*)                  # NetBSD/mips, either endian.
        ;;
 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-linux mips/t-linux64"
+       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
@@ -1840,12 +1491,6 @@ mips*-*-openbsd*)                # mips big endian
        target_cpu_default="MASK_GAS|MASK_ABICALLS"
        tm_file="mips/openbsd-be.h ${tm_file}"
        ;;
-mips-*-ecoff* | mipsel-*-ecoff*)
-       if test x$stabs = xyes; then
-               tm_file="${tm_file} dbx.h"
-       fi
-       tmake_file=mips/t-ecoff
-       ;;
 mipsisa32-*-elf* | mipsisa32el-*-elf*)
        tm_file="${tm_file} mips/elf.h"
        tmake_file=mips/t-isa3264
@@ -1860,13 +1505,13 @@ mipsisa64-*-elf* | mipsisa64el-*-elf*)
        tm_file="${tm_file} mips/elf.h"
        tmake_file=mips/t-isa3264
        target_cpu_default="MASK_64BIT|MASK_FLOAT64|MASK_GAS"
-       tm_defines="MIPS_ISA_DEFAULT=64 MIPS_ABI_DEFAULT=ABI_MEABI"
+       tm_defines="MIPS_ISA_DEFAULT=64 MIPS_ABI_DEFAULT=ABI_EABI"
        ;;
 mipsisa64sr71k-*-elf*)
         tm_file="${tm_file} mips/elf.h"
         tmake_file=mips/t-sr71k
        target_cpu_default="MASK_64BIT|MASK_FLOAT64|MASK_GAS"
-       tm_defines="MIPS_ISA_DEFAULT=64 MIPS_CPU_STRING_DEFAULT=\\\"sr71000\\\" MIPS_ABI_DEFAULT=ABI_MEABI"
+       tm_defines="MIPS_ISA_DEFAULT=64 MIPS_CPU_STRING_DEFAULT=\\\"sr71000\\\" MIPS_ABI_DEFAULT=ABI_EABI"
         ;;
 mipsisa64sb1-*-elf* | mipsisa64sb1el-*-elf*)
        tm_file="${tm_file} mips/elf.h"
@@ -1896,16 +1541,6 @@ mips64orion-*-elf* | mips64orionel-*-elf*)
        target_cpu_default="MASK_64BIT|MASK_FLOAT64|MASK_GAS"
        tm_defines="MIPS_ISA_DEFAULT=3 MIPS_ABI_DEFAULT=ABI_O64"
        ;;
-mips64orion-*-rtems*)
-       tm_file="${tm_file} mips/elforion.h mips/elf64.h mips/rtems64.h rtems.h"
-       tmake_file="mips/t-elf t-rtems"
-       tmake_file=mips/t-elf
-       target_cpu_default="MASK_64BIT|MASK_FLOAT64|MASK_GAS"
-       tm_defines="MIPS_ISA_DEFAULT=3 MIPS_ABI_DEFAULT=ABI_O64"
-       if test x$enable_threads = xyes; then
-         thread_file='rtems'
-       fi
-       ;;
 mips*-*-rtems*)
        tm_file="${tm_file} mips/elf.h mips/rtems.h rtems.h"
        tmake_file="mips/t-elf t-rtems"
@@ -1920,14 +1555,6 @@ mipstx39-*-elf* | mipstx39el-*-elf*)
 mmix-knuth-mmixware)
        need_64bit_hwint=yes
        ;;
-mn10200-*-*)
-       tm_file="dbxelf.h elfos.h svr4.h ${tm_file}"
-       if test x$stabs = xyes
-       then
-               tm_file="${tm_file} dbx.h"
-       fi
-       use_collect2=no
-       ;;
 mn10300-*-*)
        tm_file="dbxelf.h elfos.h svr4.h ${tm_file}"
        if test x$stabs = xyes
@@ -1953,19 +1580,17 @@ pdp11-*-*)
        ;;
 avr-*-*)
        ;;
-ns32k-*-openbsd*)
-       # Nothing special
-       ;;
-romp-*-openbsd*)
-       # Nothing special
-       ;;
 powerpc-*-openbsd*)
-       tmake_file="${tmake_file} rs6000/t-fprules 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"
-       tmake_file="rs6000/t-fprules 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"
@@ -1990,10 +1615,6 @@ powerpc*-*-freebsd*)
        tm_file="${tm_file} dbxelf.h elfos.h ${fbsd_tm_file} rs6000/sysv4.h rs6000/freebsd.h"
        tmake_file="rs6000/t-fprules 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"
-       tmake_file="rs6000/t-fprules rs6000/t-ppcos rs6000/t-ppccomm"
-       ;;
 powerpc-*-netbsd*)
        tm_file="${tm_file} dbxelf.h elfos.h netbsd.h netbsd-elf.h freebsd-spec.h rs6000/sysv4.h rs6000/netbsd.h"
        tmake_file="${tmake_file} rs6000/t-netbsd"
@@ -2033,22 +1654,19 @@ powerpc-*-eabi*)
        ;;
 powerpc-*-rtems*)
        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-fprules rs6000/t-rtems 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"
-       tmake_file="rs6000/t-fprules 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"
        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"
        tmake_file="rs6000/t-fprules rs6000/t-ppcos t-slibgcc-elf-ver t-linux rs6000/t-ppccomm"
@@ -2096,16 +1714,6 @@ powerpcle-*-eabi*)
        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-fprules rs6000/t-ppcgas rs6000/t-ppccomm"
        ;;
-rs6000-ibm-aix3.[01]*)
-       tm_file="${tm_file} rs6000/aix.h rs6000/aix31.h rs6000/xcoff.h"
-       use_collect2=yes
-       ;;
-rs6000-ibm-aix3.2.[456789]* | powerpc-ibm-aix3.2.[456789]*)
-       tm_file="${tm_file} rs6000/aix.h rs6000/aix3newas.h rs6000/xcoff.h"
-       tmake_file="rs6000/t-fprules rs6000/t-newas"
-       use_collect2=yes
-       extra_headers=
-       ;;
 rs6000-ibm-aix4.[12]* | powerpc-ibm-aix4.[12]*)
        tm_file="${tm_file} rs6000/aix.h rs6000/aix41.h rs6000/xcoff.h"
        tmake_file="rs6000/t-fprules rs6000/t-newas"
@@ -2113,14 +1721,14 @@ rs6000-ibm-aix4.[12]* | powerpc-ibm-aix4.[12]*)
        extra_headers=
        ;;
 rs6000-ibm-aix4.[3456789]* | powerpc-ibm-aix4.[3456789]*)
-       tm_file="${tm_file} rs6000/aix.h rs6000/aix43.h rs6000/xcoff.h"
+       tm_file="rs6000/biarch64.h ${tm_file} rs6000/aix.h rs6000/aix43.h rs6000/xcoff.h"
        tmake_file=rs6000/t-aix43
        use_collect2=yes
        thread_file='aix'
        extra_headers=
        ;;
 rs6000-ibm-aix5.1.* | powerpc-ibm-aix5.1.*)
-       tm_file="${tm_file} rs6000/aix.h rs6000/aix51.h rs6000/xcoff.h"
+       tm_file="rs6000/biarch64.h ${tm_file} rs6000/aix.h rs6000/aix51.h rs6000/xcoff.h"
        tmake_file=rs6000/t-aix43
        use_collect2=yes
        thread_file='aix'
@@ -2133,18 +1741,6 @@ rs6000-ibm-aix[56789].* | powerpc-ibm-aix[56789].*)
        thread_file='aix'
        extra_headers=
        ;;
-rs6000-ibm-aix*)
-       tm_file="${tm_file} rs6000/aix.h rs6000/xcoff.h"
-       use_collect2=yes
-       ;;
-rs6000-bull-bosx)
-       tm_file="${tm_file} rs6000/aix.h rs6000/xcoff.h"
-       use_collect2=yes
-       ;;
-rs6000-*-mach*)
-       tm_file="${tm_file} rs6000/mach.h"
-       use_collect2=yes
-       ;;
 rs6000-*-lynxos*)
        tm_file="lynx.h rs6000/lynx.h"
        tmake_file=rs6000/t-fprules
@@ -2270,19 +1866,9 @@ sh-*-*)
 sparc-tti-*)
        tm_file="${tm_file} sparc/pbd.h"
        ;;
-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
-       extra_parts=""
-       use_collect2=yes
-       ;;
 sparc-*-openbsd*)
        tm_file="sparc/sparc.h ${tm_file}"
        # needed to unconfuse gdb
@@ -2295,51 +1881,15 @@ sparc64-*-openbsd*)
        gas=yes gnu_ld=yes
        with_cpu=ultrasparc
        ;;
-sparc-*-bsd*)
-       tm_file="${tm_file} sparc/bsd.h"
-       ;;
-sparc-*-chorusos*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h sparc/sol2.h sparc/elf.h chorus.h"
-       tmake_file="sparc/t-chorus-elf sparc/t-crtfm"
-       extra_parts="crti.o crtn.o crtbegin.o crtend.o"
-       case x${enable_threads} in
-         xyes | xpthreads | xposix)
-               thread_file='posix'
-               ;;
-       esac
-       ;;
 sparc-*-elf*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h sparc/sol2.h sparc/elf.h"
        tmake_file="sparc/t-elf sparc/t-crtfm"
        extra_parts="crti.o crtn.o crtbegin.o crtend.o"
        ;;
-sparc-*-linux*aout*)           # SPARC's running GNU/Linux, a.out
-       tm_file="aoutos.h sparc/sparc.h sparc/aout.h sparc/linux-aout.h"
-       gnu_ld=yes
-       ;;
-sparc-*-linux*libc1*)  # SPARC's running GNU/Linux, libc5
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/linux.h"
-       tmake_file="t-slibgcc-elf-ver t-linux t-linux-gnulibc1 sparc/t-crtfm"
-       extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-       gnu_ld=yes
-       ;;
 sparc-*-linux*)                # SPARC's running GNU/Linux, libc6
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/linux.h"
        tmake_file="t-slibgcc-elf-ver t-linux sparc/t-crtfm"
        ;;
-sparc-*-lynxos*)
-       if test x$gas = xyes
-       then
-               tm_file="${tm_file} lynx.h sparc/aout.h sparc/lynx.h"
-       else
-               tm_file="${tm_file} lynx-ng.h sparc/aout.h sparc/lynx-ng.h"
-       fi
-       tmake_file=sparc/t-sunos41
-       ;;
-sparc-*-rtemsaout*)    # would otherwise be caught by sparc-*-rtems*
-       echo "*** Configuration $machine not supported" 1>&2
-       exit 1
-       ;;
 sparc-*-rtems*)
        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"
@@ -2378,18 +1928,6 @@ sparc64-*-solaris2* | sparcv9-*-solaris2*)
        fi
        need_64bit_hwint=yes
        ;;
-sparc-hal-solaris2*)
-        tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h sparc/sol2.h sparc/hal.h"
-        tmake_file="sparc/t-halos sparc/t-sol2 sparc/t-crtfm"
-       if test x$gnu_ld = xyes; then
-               tm_file="${tm_file} sparc/sol2-gld.h"
-               tmake_file="$tmake_file t-slibgcc-elf-ver"
-       else
-               tmake_file="$tmake_file t-slibgcc-sld"
-       fi
-        extra_parts="crt1.o crti.o crtn.o gmon.o crtbegin.o crtend.o"
-       thread_file='solaris'
-        ;;
 sparc-*-solaris2*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h sparc/sol2.h"
        if test x$gnu_ld = xyes; then
@@ -2434,48 +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"
+       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"
        ;;
-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"
@@ -2516,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
@@ -2531,23 +2034,6 @@ 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*)
-       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"
-       if test x$stabs = xyes
-       then
-               tm_file="${tm_file} dbx.h"
-       fi
-       use_collect2=no
-       c_target_objs="v850-c.o"
-       cxx_target_objs="v850-c.o"
-       ;;
 v850e-*-*)
        target_cpu_default="TARGET_CPU_v850e"
        tm_file="dbxelf.h elfos.h svr4.h v850/v850.h"
@@ -2647,262 +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"
                        ;;
-               k6_3-*)
-                       target_cpu_default2=TARGET_CPU_DEFAULT_k6_3
+               i486-*-*)
+                       with_cpu=i486
                        ;;
-               k6-*)
-                       target_cpu_default2=TARGET_CPU_DEFAULT_k6
+               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
                        ;;
-               pentium_mmx-*|winchip_c6-*|winchip2-*|c3-*)
-                       target_cpu_default2=TARGET_CPU_DEFAULT_pentium_mmx
+               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
                        ;;
-               *)
-                       target_cpu_default2=TARGET_CPU_DEFAULT_pentium
+               x86_64-*-*)
+                       with_cpu=k8
                        ;;
-       esac
-       ;;
-i686-*-* | i786-*-*)
-       case $target_alias in
-               k8-*)
-                       target_cpu_default2=TARGET_CPU_DEFAULT_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
                        ;;
-               athlon_xp-*|athlon_mp-*|athlon_4-*)
-                       target_cpu_default2=TARGET_CPU_DEFAULT_athlon_sse
+               sparc*-*-*)
+                       with_cpu="`echo $machine | sed 's/-.*$//'`"
                        ;;
-               athlon_tbird-*|athlon-*)
-                       target_cpu_default2=TARGET_CPU_DEFAULT_athlon
+               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
                        ;;
-               pentium2-*)
-                       target_cpu_default2=TARGET_CPU_DEFAULT_pentium2
+               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
                        ;;
-               pentium3-*)
-                       target_cpu_default2=TARGET_CPU_DEFAULT_pentium3
+               *)
+                       echo "Unknown arch used in --with-arch=$with_arch" 1>&2
+                       exit 1
                        ;;
-               pentium4-*)
-                       target_cpu_default2=TARGET_CPU_DEFAULT_pentium4
+               esac
+
+               case "x$with_float" in
+               x \
+               | xsoft | xhard)
+                       # OK
                        ;;
                *)
-                       target_cpu_default2=TARGET_CPU_DEFAULT_pentiumpro
-                       ;;
-       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_k8
-       ;;
-alpha*-*-*)
-       case $machine in
-               alphaev6[78]*)
-                       target_cpu_default2="MASK_CPU_EV6|MASK_BWX|MASK_MAX|MASK_FIX|MASK_CIX"
+                       echo "Unknown floating point type used in --with-float=$with_float" 1>&2
+                       exit 1
                        ;;
-               alphaev6*)
-                       target_cpu_default2="MASK_CPU_EV6|MASK_BWX|MASK_MAX|MASK_FIX"
+               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
                        ;;
-               alphapca56*)
-                       target_cpu_default2="MASK_CPU_EV5|MASK_BWX|MASK_MAX"
+               *)
+                       echo "Unknown architecture used in --with-arch=$with_arch" 1>&2
+                       exit 1
                        ;;
-               alphaev56*)
-                       target_cpu_default2="MASK_CPU_EV5|MASK_BWX"
+               esac
+
+               case "x$with_schedule" in
+               x | x700 | x7100 | x7100LC | x7200 | x7300 | x8000)
+                       # OK
                        ;;
-               alphaev5*)
-                       target_cpu_default2="MASK_CPU_EV5"
+               *)
+                       echo "Unknown processor used in --with-schedule=$with_schedule." 1>&2
+                       exit 1
                        ;;
-       esac
+               esac
+               ;;
 
-       if test x$gas = xyes
-       then
-               if test "$target_cpu_default2" = ""
-               then
-                       target_cpu_default2="MASK_GAS"
-               else
-                       target_cpu_default2="${target_cpu_default2}|MASK_GAS"
-               fi
-       fi
-       ;;
-arm*-*-*)
-       case "x$with_cpu" in
-               x)
-                       # The most generic
-                       target_cpu_default2="TARGET_CPU_generic"
-                       ;;
+       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
+               ;;
 
-               # 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 \
-               | xep9312 \
-               | xstrongarm | xstrongarm110 | xstrongarm1100)
-                       target_cpu_default2="TARGET_CPU_$with_cpu"
-                       ;;
+       mips*-*-*)
+               supported_defaults="abi arch float tune"
 
-               xyes | xno)
-                       echo "--with-cpu must be passed a value" 1>&2
+               case "x$with_float" in
+               x \
+               | xsoft | xhard)
+                       # OK
+                       ;;
+               *)
+                       echo "Unknown floating point type used in --with-float=$with_float" 1>&2
                        exit 1
                        ;;
+               esac
 
+               case "x$with_abi" in
+               x \
+               | x32 | xo64 | xn32 | x64 | xeabi)
+                       # OK
+                       ;;
                *)
-                       if test x$pass2done = xyes
-                       then
-                               echo "Unknown cpu used with --with-cpu=$with_cpu" 1>&2
+                       echo "Unknown ABI used in --with-abi=$with_abi" 1>&2
+                       exit 1
+                       ;;
+               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
-                       fi
+                               ;;
+                       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
                        ;;
-       esac
-       case $machine in
-               9ep9312-*-*)
-                       target_cpu_default2="TARGET_CPU_9ep9312"
+               *)
+                       echo "Unknown floating point type used in --with-float=$with_float" 1>&2
+                       exit 1
                        ;;
-       esac
-       ;;
+               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\\\""
+       v850*-*-*)
+               supported_defaults=cpu
+               case "x$with_cpu" in
+               x | xv850e)
+                       # OK
+                       ;;
+               *)
+                       echo "Unknown cpu used in --with-cpu=$with_cpu" 1>&2
+                       exit 1
                        ;;
+               esac
+               ;;
        esac
-       ;;
-mips*-*-*)
+
+       # Set some miscellaneous flags for particular targets.
+       target_cpu_default2=
        case $machine in
-       mips*-*-ecoff* | mips*-*-elf*)
-               if test x$gas = xyes
-               then
-                       if test x$gnu_ld = xyes
-                       then
-                               target_cpu_default2="MASK_GAS|MASK_SPLIT_ADDR"
-                       else
-                               target_cpu_default2="MASK_GAS"
-                       fi
-               fi
-               ;;
-       mips*-*-*)
+       alpha*-*-*)
                if test x$gas = xyes
                then
                        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
-       ;;
-powerpc*-*-* | rs6000-*-*)
-        if test x$enable_altivec = xyes
-        then
-                tm_file="$tm_file rs6000/altivec-defs.h"
-        fi
-       case "x$with_cpu" in
+
+       arm*-*-*)
+               case "x$with_cpu" in
                x)
+                       # The most generic
+                       target_cpu_default2="TARGET_CPU_generic"
                        ;;
 
-               xcommon | xpowerpc | xpowerpc64 \
-                 | xpower | xpower2 | xpower3 | xpower4 \
-                 | xrios | xrios1 | xrios2 | xrsc | xrsc1 | xrs64a \
-                 | x601 | x602 | x603 | x603e | x604 | x604e | x620 | x630 \
-                 | x740 | x750 | x7400 | x7450 | x505)
-                       target_cpu_default2="\\\"$with_cpu\\\""
+               *)
+                       target_cpu_default2="TARGET_CPU_$with_cpu"
                        ;;
+               esac
+               ;;
 
-               x401 | x403 | x405 | xec603e | x801 | x821 | x823 | x860)
-                       target_cpu_default2="\\\"$with_cpu\\\""
-                       ;;
+       hppa*-*-* | parisc*-*-*)
+               if test x$gas = xyes
+               then
+                       target_cpu_default2="MASK_GAS|MASK_JUMP_IN_DELAY"
+               fi
+               ;;
 
-               xyes | xno)
-                       echo "--with-cpu must be passed a value" 1>&2
-                       exit 1
+       mips*-*-*)
+               case $machine in
+               mips*-*-ecoff* | mips*-*-elf*)
+                       if test x$gas = xyes
+                       then
+                               if test x$gnu_ld = xyes
+                               then
+                                       target_cpu_default2="MASK_GAS|MASK_SPLIT_ADDR"
+                               else
+                                       target_cpu_default2="MASK_GAS"
+                               fi
+                       fi
                        ;;
-
-               *)
-                       if test x$pass2done = xyes
+               mips*-*-*)
+                       if test x$gas = xyes
                        then
-                               echo "Unknown cpu used with --with-cpu=$with_cpu" 1>&2
-                               exit 1
+                               target_cpu_default2="MASK_GAS"
                        fi
                        ;;
-       esac
-       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}"
-       ;;
-sparc*-*-*)
-       case ".$with_cpu" in
-               .)
-                       target_cpu_default2=TARGET_CPU_"`echo $machine | sed 's/-.*$//'`"
+               esac
+               case $machine in
+                       mips*el-*-*)
+                               tm_defines="TARGET_ENDIAN_DEFAULT=0 $tm_defines"
+                               ;;
+               esac
+               case $tm_file in
+                       *mips/elf.h* | *mips/elf64.h*)
+                               tm_defines="OBJECT_FORMAT_ELF $tm_defines"
+                               ;;
+               esac
+               if test "x$enable_gofast" = xyes
+               then
+                       tm_defines="INIT_SUBTARGET_OPTABS=INIT_GOFAST_OPTABS $tm_defines"
+                       tm_file="gofast.h $tm_file"
+                       tmake_file="mips/t-gofast $tmake_file"
+               else
+                       tmake_file="mips/t-mips $tmake_file"
+               fi
+               ;;
+
+       powerpc*-*-* | rs6000-*-*)
+               if test x$enable_altivec = xyes
+               then
+                       tm_file="$tm_file rs6000/altivec-defs.h"
+               fi
+               # 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}"
+               ;;
+
+       sparc*-*-*)
+               # Some standard aliases.
+               case x$with_cpu in
+               xsparc)
+                       with_cpu=v7
                        ;;
-               .supersparc | .hypersparc | .ultrasparc | .v7 | .v8 | .v9)
-                       target_cpu_default2="TARGET_CPU_$with_cpu"
+               xsparc86x)
+                       with_cpu=sparclite86x
                        ;;
-               *)
-                       if test x$pass2done = xyes
-                       then
-                               echo "Unknown cpu used with --with-cpu=$with_cpu" 1>&2
-                               exit 1
-                       fi
+               xsparcv9 | xsparc64)
+                       with_cpu=v9
                        ;;
-       esac
-       ;;
-v850*-*-*)
-       case "x$with_cpu" in
+               esac
+
+               # The Sparc port checks this value at compile-time.
+               target_cpu_default2="TARGET_CPU_$with_cpu"
+               ;;
+       v850*-*-*)
+               # FIXME: The v850 is "special" in that it does not support
+               # runtime CPU selection, only --with-cpu.
+               case "x$with_cpu" in
                x)
                        ;;
                xv850e)
                        target_cpu_default2="TARGET_CPU_$with_cpu"
                        ;;
-               *)
-                       if test x$pass2done = xyes
-                       then
-                               echo "Unknown cpu used with --with-cpu=$with_cpu" 1>&2
-                               exit 1
-                       fi
-                       ;;
+               esac
+               ;;
        esac
-       ;;
-esac
 
-if test "$target_cpu_default2" != ""
-then
-       if test "$target_cpu_default" != ""
+       t=
+       all_defaults="abi cpu arch tune schedule float"
+       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