OSDN Git Service

2008-06-12 Tobias Burnus <burnus@net-b.de>
[pf3gnuchains/gcc-fork.git] / gcc / config.gcc
index fbb54e2..4e207d3 100644 (file)
 #                      This helps to keep OS specific stuff out of the CPU
 #                      defining header ${cpu_type}/${cpu_type.h}.
 #
+#                      It is possible to include automatically-generated
+#                      build-directory files by prefixing them with "./".
+#                      All other files should relative to $srcdir/config.
+#
 #  tm_p_file           Location of file with declarations for functions
 #                      in $out_file.
 #
 #  cxx_target_objs     List of extra target-dependent objects that be
 #                      linked into the C++ compiler only.
 #
+#  fortran_target_objs List of extra target-dependent objects that be
+#                      linked into the fortran compiler only.
+#
 #  target_gtfiles       List of extra source files with type information.
 #
 #  xm_defines          List of macros to define when compiling for the
 #  need_64bit_hwint    Set to yes if HOST_WIDE_INT must be 64 bits wide
 #                      for this target.  This is true iff this target
 #                      supports "long" or "wchar_t" wider than 32 bits.
+#                      The setting made here must match the one made in
+#                      other locations such as libcpp/configure.ac
 #
 #  configure_default_options
 #                      Set to an initializer for configure_default_options
@@ -167,6 +176,7 @@ extra_gcc_objs=
 extra_options=
 c_target_objs=
 cxx_target_objs=
+fortran_target_objs=
 tm_defines=
 xm_defines=
 # Set this to force installation and use of collect2.
@@ -194,64 +204,35 @@ xm_file=
 md_file=
 
 # Obsolete configurations.
-case ${target} in
-   crx-*               \
- | mt-*                        \
- | strongarm*-*                \
- | ep9312*-*           \
- | xscale*-*           \
- | parisc*-*           \
- | m680[012]0-*                \
- | *-*-beos*           \
- | *-*-kaos*           \
- | *-*-linux*aout*     \
- | *-*-linux*libc1*    \
- | *-*-solaris2.[0-6]  \
- | *-*-solaris2.[0-6].*        \
- | *-*-sysv*           \
- | *-*-windiss*                \
- | alpha*-*-unicosmk*  \
- | cris-*-aout         \
- | hppa1.1-*-pro*      \
- | hppa1.1-*-osf*      \
- | hppa1.1-*-bsd*      \
- | i[34567]86-sequent-ptx4*    \
- | i[34567]86-*-sco3.2v5*      \
- | i[34567]86-*-uwin*  \
- | powerpc-*-chorusos* \
- | vax-*-bsd*          \
- | vax-*-ultrix*       \
- )
-    if test "x$enable_obsolete" != xyes; then
-      echo "*** Configuration ${target} is obsolete." >&2
-      echo "*** Specify --enable-obsolete to build it anyway." >&2
-      echo "*** Support will be REMOVED in the next major release of GCC," >&2
-      echo "*** unless a maintainer comes forward." >&2
-      exit 1
-    fi;;
-esac
+#case ${target} in
+# )
+#    if test "x$enable_obsolete" != xyes; then
+#      echo "*** Configuration ${target} is obsolete." >&2
+#      echo "*** Specify --enable-obsolete to build it anyway." >&2
+#      echo "*** Support will be REMOVED in the next major release of GCC," >&2
+#      echo "*** unless a maintainer comes forward." >&2
+#      exit 1
+#    fi;;
+#esac
 
 # Unsupported targets list.  Do not put an entry in this list unless
 # it would otherwise be caught by a more permissive pattern.  The list
 # should be in alphabetical order.
 case ${target} in
-   alpha*-*-linux*libc1*               \
- | i[34567]86-sequent-sysv             \
- | i[34567]86-sequent-sysv[123]*       \
- | i[34567]86-go32-*                   \
+   i[34567]86-go32-*                   \
  | 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*aout*                     \
  | *-*-linux*coff*                     \
+ | *-*-linux*libc1*                    \
  | *-*-linux*oldld*                    \
  | *-*-rtemsaout*                      \
  | *-*-rtemscoff*                      \
+ | *-*-solaris2.[0-6]                  \
+ | *-*-solaris2.[0-6].*                        \
+ | *-*-sysv*           \
  | vax-*-vms*                          \
  )
        echo "*** Configuration ${target} not supported" 1>&2
@@ -277,9 +258,6 @@ alpha*-*-*)
 am33_2.0-*-linux*)
        cpu_type=mn10300
        ;;
-strongarm*-*-*)
-       cpu_type=arm
-       ;;
 arm*-*-*)
        cpu_type=arm
        extra_headers="mmintrin.h arm_neon.h"
@@ -292,46 +270,37 @@ bfin*-*)
 crisv32-*)
        cpu_type=cris
        ;;
-ep9312*-*-*)
-       cpu_type=arm
-       ;;
 frv*)  cpu_type=frv
        ;;
 fido-*-*)
        cpu_type=m68k
        extra_headers=math-68881.h
         ;;
-xscale-*-*)
-       cpu_type=arm
-       extra_headers="mmintrin.h"
-       ;;
 i[34567]86-*-*)
        cpu_type=i386
        extra_headers="cpuid.h mmintrin.h mm3dnow.h xmmintrin.h emmintrin.h
                       pmmintrin.h tmmintrin.h ammintrin.h smmintrin.h
-                      nmmintrin.h bmmintrin.h mmintrin-common.h"
+                      nmmintrin.h bmmintrin.h mmintrin-common.h
+                      wmmintrin.h"
        ;;
 x86_64-*-*)
        cpu_type=i386
        extra_headers="cpuid.h mmintrin.h mm3dnow.h xmmintrin.h emmintrin.h
                       pmmintrin.h tmmintrin.h ammintrin.h smmintrin.h
-                      nmmintrin.h bmmintrin.h mmintrin-common.h"
+                      nmmintrin.h bmmintrin.h mmintrin-common.h
+                      wmmintrin.h"
        need_64bit_hwint=yes
        ;;
 ia64-*-*)
        extra_headers=ia64intrin.h
        need_64bit_hwint=yes
        ;;
-hppa*-*-* | parisc*-*-*)
+hppa*-*-*)
        cpu_type=pa
        ;;
 m32r*-*-*)
         cpu_type=m32r
         ;;
-m680[012]0-*-*)
-       cpu_type=m68k
-       extra_headers=math-68881.h
-       ;;
 m68k-*-*)
        extra_headers=math-68881.h
        ;;
@@ -355,12 +324,9 @@ rs6000*-*-*)
 score*-*-*)
        cpu_type=score
        ;;
-sparc64*-*-*)
-       cpu_type=sparc
-       need_64bit_hwint=yes
-       ;;
 sparc*-*-*)
        cpu_type=sparc
+       need_64bit_hwint=yes
        ;;
 spu*-*-*)
        cpu_type=spu
@@ -371,7 +337,7 @@ s390*-*-*)
        need_64bit_hwint=yes
        ;;
 # Note the 'l'; we need to be able to match e.g. "shle" or "shl".
-sh[123456789lbe]*-*-*)
+sh[123456789lbe]*-*-* | sh-*-*)
        cpu_type=sh
        need_64bit_hwint=yes
        ;;
@@ -393,8 +359,16 @@ then
 fi
 
 case ${target} in
+i[34567]86-*-*)
+       if test "x$enable_cld" = xyes; then
+               tm_defines="${tm_defines} USE_IX86_CLD=1"
+       fi
+       ;;
 x86_64-*-*)
        tm_file="i386/biarch64.h ${tm_file}"
+       if test "x$enable_cld" = xyes; then
+               tm_defines="${tm_defines} USE_IX86_CLD=1"
+       fi
        ;;
 esac
 
@@ -421,6 +395,7 @@ case ${target} in
   extra_options="${extra_options} darwin.opt"
   c_target_objs="darwin-c.o"
   cxx_target_objs="darwin-c.o"
+  fortran_target_objs="darwin-f.o"
   extra_objs="darwin.o"
   extra_gcc_objs="darwin-driver.o"
   default_use_cxa_atexit=yes
@@ -481,9 +456,6 @@ case ${target} in
   esac
   fbsd_tm_file="${fbsd_tm_file} freebsd-spec.h freebsd.h"
   ;;
-*-*-linux*libc1* | *-*-linux*aout*)
-  # Avoid the generic linux case.
-  ;;
 *-*-linux* | frv-*-*linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu)
   # Must come before *-*-gnu* (because of *-*-linux-gnu* systems).
   extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o"
@@ -616,15 +588,6 @@ case ${target} in
        then tmake_file=${cpu_type}/t-$rest
        fi
        ;;
-alpha*-*-unicosmk*)
-       use_collect2=yes
-       tm_file="${tm_file} alpha/unicosmk.h"
-
-       # Don't include t-ieee for now because we don't support that yet
-       # tmake_file="alpha/t-ieee"
-       tmake_file="alpha/t-unicosmk"
-       use_fixproto=yes
-       ;;
 alpha*-*-linux*)
        tm_file="${tm_file} alpha/elf.h alpha/linux.h alpha/linux-elf.h"
        target_cpu_default="MASK_GAS"
@@ -712,7 +675,7 @@ arm-wrs-vxworks)
        tm_file="elfos.h arm/elf.h arm/aout.h ${tm_file} vx-common.h vxworks.h arm/vxworks.h"
        tmake_file="${tmake_file} arm/t-arm arm/t-vxworks"
        ;;
-arm*-*-freebsd*|strongarm*-*-freebsd*)
+arm*-*-freebsd*)
        tm_file="dbxelf.h elfos.h ${fbsd_tm_file} arm/elf.h arm/aout.h arm/freebsd.h arm/arm.h"
        tmake_file="${tmake_file} arm/t-arm arm/t-strongarm-elf"
        ;;
@@ -753,7 +716,7 @@ arm*-*-linux*)                      # ARM GNU/Linux with ELF
        tmake_file="${tmake_file} arm/t-arm-softfp soft-fp/t-softfp"
        ;;
 arm*-*-uclinux*)               # ARM ucLinux
-       tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/linux-gas.h arm/uclinux-elf.h arm/uclinux-elf.h"
+       tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/linux-gas.h arm/uclinux-elf.h"
        tmake_file="arm/t-arm arm/t-arm-elf"
        case ${target} in
        arm*-*-uclinux-*eabi)
@@ -801,7 +764,7 @@ arm*-*-rtems*)
        tmake_file="arm/t-arm arm/t-arm-elf t-rtems arm/t-rtems"
        tmake_file="${tmake_file} arm/t-arm-softfp soft-fp/t-softfp"
        ;;
-arm*-*-elf | ep9312-*-elf)
+arm*-*-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 arm/t-arm-elf"
        tmake_file="${tmake_file} arm/t-arm-softfp soft-fp/t-softfp"
@@ -818,11 +781,6 @@ arm-*-pe*)
        extra_options="${extra_options} arm/pe.opt"
        extra_objs="pe.o"
        ;;
-arm*-*-kaos*)
-       tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h kaos.h arm/kaos-arm.h"
-       tmake_file="arm/t-arm arm/t-arm-elf"
-       tmake_file="${tmake_file} arm/t-arm-softfp soft-fp/t-softfp"
-       ;;
 avr-*-rtems*)
        tm_file="avr/avr.h dbxelf.h avr/rtems.h rtems.h"
        tmake_file="avr/t-avr t-rtems avr/t-rtems"
@@ -858,12 +816,6 @@ bfin*-*)
        tmake_file=bfin/t-bfin
        use_collect2=no
        ;;
-cris-*-aout)
-       tm_file="dbxelf.h ${tm_file} cris/aout.h"
-       gas=yes
-       tmake_file="cris/t-cris cris/t-aout"
-       extra_options="${extra_options} cris/aout.opt"
-       ;;
 crisv32-*-elf | crisv32-*-none)
        tm_file="dbxelf.h elfos.h ${tm_file}"
        tmake_file="cris/t-cris"
@@ -925,7 +877,7 @@ h8300-*-*)
        tm_file="h8300/h8300.h dbxcoff.h h8300/coff.h"
        use_fixproto=yes
        ;;
-hppa*64*-*-linux* | parisc*64*-*-linux*)
+hppa*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"
@@ -933,7 +885,7 @@ hppa*64*-*-linux* | parisc*64*-*-linux*)
        gas=yes gnu_ld=yes
        need_64bit_hwint=yes
        ;;
-hppa*-*-linux* | parisc*-*-linux*)
+hppa*-*-linux*)
        target_cpu_default="MASK_PA_11|MASK_NO_SPACE_REGS"
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h linux.h pa/pa-linux.h \
                 pa/pa32-regs.h pa/pa32-linux.h"
@@ -949,24 +901,6 @@ hppa*-*-linux* | parisc*-*-linux*)
 #hppa*-*-openbsd*)
 #      target_cpu_default="MASK_PA_11"
 #      ;;
-hppa1.1-*-pro*)
-       target_cpu_default="MASK_PORTABLE_RUNTIME|MASK_NO_SPACE_REGS|MASK_SOFT_FLOAT"
-       tm_file="${tm_file} pa/pa32-regs.h dbxelf.h elfos.h pa/elf.h \
-                pa/pa-pro-end.h libgloss.h"
-       tmake_file="pa/t-pro"
-       ;;
-hppa1.1-*-osf*)
-       target_cpu_default="MASK_PA_11"
-       tm_file="${tm_file} pa/pa32-regs.h dbxelf.h pa/som.h pa/pa-osf.h"
-       tmake_file="pa/t-pa"
-       use_collect2=yes
-       ;;
-hppa1.1-*-bsd*)
-       target_cpu_default="MASK_PA_11"
-       tm_file="${tm_file} pa/pa32-regs.h dbxelf.h pa/som.h"
-       tmake_file="pa/t-pa"
-       use_collect2=yes
-       ;;
 hppa[12]*-*-hpux10*)
        case ${target} in
        hppa1.1-*-* | hppa2*-*-*)
@@ -1095,25 +1029,10 @@ x86_64-*-elf*)
        tmake_file="i386/t-i386elf t-svr4"
        use_fixproto=yes
        ;;
-i[34567]86-sequent-ptx4* | i[34567]86-sequent-sysv4*)
-       if test x$gas = xyes
-       then
-               tm_file="${tm_file} usegas.h"
-       fi
-       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"
-       use_fixproto=yes
-       ;;
 i[34567]86-*-aout*)
        tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h i386/i386-aout.h"
        use_fixproto=yes
        ;;
-i[34567]86-*-beoself* | i[34567]86-*-beos*)
-       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'
-       ;;
 i[34567]86-*-freebsd*)
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${fbsd_tm_file} i386/freebsd.h"
        ;;
@@ -1162,13 +1081,13 @@ i[34567]86-*-linux* | i[34567]86-*-kfreebsd*-gnu | i[34567]86-*-knetbsd*-gnu)
                        tm_defines="${tm_defines} TARGET_BI_ARCH=1"
                        tmake_file="${tmake_file} i386/t-linux64 i386/t-fprules-softfp64 soft-fp/t-softfp"
                        need_64bit_hwint=yes
-                       # FIXME: -m64 for i[34567]86-*-* should be allowed just
-                       # like -m32 for x86_64-*-*.
                        case X"${with_cpu}" in
                        Xgeneric|Xcore2|Xnocona|Xx86-64|Xamdfam10|Xbarcelona|Xk8|Xopteron|Xathlon64|Xathlon-fx)
                                ;;
                        X)
-                               with_cpu=generic
+                               if test x$with_cpu_64 = x; then
+                                       with_cpu_64=generic
+                               fi
                                ;;
                        *)
                                echo "Unsupported CPU used in --with-cpu=$with_cpu, supported values:" 1>&2
@@ -1244,23 +1163,9 @@ i[34567]86-*-rtems*)
        extra_parts="crtbegin.o crtend.o crti.o crtn.o"
        tmake_file="i386/t-rtems-i386 i386/t-crtstuff t-rtems"
        ;;
-i[34567]86-*-sco3.2v5*)        # 80386 running SCO Open Server 5
-       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}"
-       fi
-       tmake_file=i386/t-sco5
-       extra_parts="crtbegin.o crtend.o"
-       extra_options="${extra_options} i386/sco5.opt"
-       use_fixproto=yes
-       ;;
 i[34567]86-*-solaris2*)
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h i386/sysv4.h sol2.h"
        case ${target} in
-       *-*-solaris2.[0-6] | *-*-solaris2.[0-6].*)
-               tm_file="${tm_file} sol2-6.h"
-               ;;
        *-*-solaris2.1[0-9]*)
                tm_file="${tm_file} sol2-10.h"
                ;;
@@ -1280,24 +1185,20 @@ i[34567]86-*-solaris2*)
        if test x$gas = xyes; then
                tm_file="usegas.h ${tm_file}"
        fi
-       case ${target} in
-       *-*-solaris2.[789] | *-*-solaris2.1[0-9]*)
-               tm_file="$tm_file tm-dwarf2.h"
-               ;;
-       esac
+       tm_file="$tm_file tm-dwarf2.h"
        case ${target} in
        *-*-solaris2.1[0-9]*)
                tm_file="${tm_file} i386/x86-64.h i386/sol2-10.h"
                tm_defines="${tm_defines} TARGET_BI_ARCH=1"
                tmake_file="$tmake_file i386/t-crtstuff i386/t-sol2-10"
                need_64bit_hwint=yes
-               # FIXME: -m64 for i[34567]86-*-* should be allowed just
-               # like -m32 for x86_64-*-*.
                case X"${with_cpu}" in
                Xgeneric|Xcore2|Xnocona|Xx86-64|Xamdfam10|Xbarcelona|Xk8|Xopteron|Xathlon64|Xathlon-fx)
                        ;;
                X)
-                       with_cpu=generic
+                       if test x$with_cpu_64 = x; then
+                               with_cpu_64=generic
+                       fi
                        ;;
                *)
                        echo "Unsupported CPU used in --with-cpu=$with_cpu, supported values:" 1>&2
@@ -1315,43 +1216,13 @@ i[34567]86-*-solaris2*)
        esac
        case ${enable_threads}:${have_pthread_h}:${have_thread_h} in
          "":yes:* | yes:yes:* )
-               case ${target} in
-                 *-*-solaris2.[0-6] | *-*-solaris2.[0-6].*)
-                       thread_file=posix95
-                       ;;
-                 *)
-                       thread_file=posix
-                       ;;
-               esac
+               thread_file=posix
                ;;
          "":*:yes | yes:*:yes )
                thread_file=solaris
                ;;
        esac
        ;;
-i[34567]86-*-sysv5*)           # Intel x86 on System V Release 5
-       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
-               tm_file="${tm_file} dbx.h"
-       fi
-       tmake_file="i386/t-crtpic t-svr4"
-       extra_parts="crtbegin.o crtend.o"
-       if test x$enable_threads = xyes; then
-              thread_file='posix'
-       fi
-       use_fixproto=yes
-       ;;
-i[34567]86-*-sysv4*)           # Intel 80386's running system V.4
-       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
-               tm_file="${tm_file} dbx.h"
-       fi
-       tmake_file="i386/t-crtpic t-svr4"
-       extra_parts="crtbegin.o crtend.o"
-       use_fixproto=yes
-       ;;
 i[4567]86-wrs-vxworks|i[4567]86-wrs-vxworksae)
        tm_file="${tm_file} i386/unix.h i386/att.h elfos.h svr4.h vx-common.h"
        case ${target} in
@@ -1379,7 +1250,7 @@ i[34567]86-*-pe | i[34567]86-*-cygwin*)
                thread_file='posix'
        fi
        ;;
-i[34567]86-*-mingw32* | x86_64-*-mingw32*)
+i[34567]86-*-mingw* | x86_64-*-mingw*)
        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"
@@ -1396,23 +1267,19 @@ i[34567]86-*-mingw32* | x86_64-*-mingw32*)
          ;;
        esac
        case ${target} in
-               *mingw32crt*)
-                       tm_file="${tm_file} i386/crtdll.h"
+               x86_64-*-mingw*)
+                       tmake_file="${tmake_file} i386/t-crtfm"
                        ;;
-               *mingw32msv* | *mingw32*)
+               *)
+                       ;;
+       esac
+       case ${target} in
+               *mingw32crt*)
+                       tm_file="${tm_file} i386/crtdll.h"
+                       ;;
+               *mingw32msv* | *mingw*)
                        ;;
        esac
-       ;;
-i[34567]86-*-uwin*)
-       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
-       extra_options="${extra_options} i386/cygming.opt"
-       target_gtfiles="\$(srcdir)/config/i386/winnt.c"
-       if test x$enable_threads = xyes; then
-               thread_file='win32'
-       fi
-       use_fixproto=yes
        ;;
 i[34567]86-*-interix3*)
        tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/i386-interix.h i386/i386-interix3.h interix.h interix3.h"
@@ -1426,10 +1293,6 @@ i[34567]86-*-interix3*)
                tm_file="${tm_file} dbxcoff.h"
        fi
        ;;
-i[34567]86-*-kaos*)
-       tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h i386/i386elf.h kaos.h i386/kaos-i386.h"
-       tmake_file="i386/t-i386elf t-svr4"
-       ;;
 ia64*-*-elf*)
        tm_file="${tm_file} dbxelf.h elfos.h ia64/sysv4.h ia64/elf.h"
        tmake_file="ia64/t-ia64"
@@ -1516,19 +1379,19 @@ m32rle-*-linux*)
        ;;
 # m68hc11 and m68hc12 share the same machine description.
 m68hc11-*-*|m6811-*-*)
-       tm_file="dbxelf.h elfos.h m68hc11/m68hc11.h"
+       tm_file="dbxelf.h elfos.h usegas.h m68hc11/m68hc11.h"
        tm_p_file="m68hc11/m68hc11-protos.h"
        md_file="m68hc11/m68hc11.md"
        out_file="m68hc11/m68hc11.c"
-       tmake_file="m68hc11/t-m68hc11-gas"
+       tmake_file="m68hc11/t-m68hc11"
        use_fixproto=yes
         ;;
 m68hc12-*-*|m6812-*-*)
-       tm_file="m68hc11/m68hc12.h dbxelf.h elfos.h m68hc11/m68hc11.h"
+       tm_file="m68hc11/m68hc12.h dbxelf.h elfos.h usegas.h m68hc11/m68hc11.h"
        tm_p_file="m68hc11/m68hc11-protos.h"
        md_file="m68hc11/m68hc11.md"
        out_file="m68hc11/m68hc11.c"
-       tmake_file="m68hc11/t-m68hc11-gas"
+       tmake_file="m68hc11/t-m68hc11"
        extra_options="${extra_options} m68hc11/m68hc11.opt"
        use_fixproto=yes
         ;;
@@ -1546,7 +1409,7 @@ m68k-*-coff*)
        tm_file="${tm_file} m68k/m68k-none.h m68k/m68kemb.h dbxcoff.h m68k/coff.h dbx.h"
        use_fixproto=yes
        ;;
-m68020-*-elf* | m68k-*-elf* | fido-*-elf*)
+m68k-*-elf* | fido-*-elf*)
        case ${target} in
        fido-*-elf*)
                # Check that $with_cpu makes sense.
@@ -1578,7 +1441,7 @@ m68020-*-elf* | m68k-*-elf* | fido-*-elf*)
        esac
        extra_parts="crtbegin.o crtend.o"
        ;;
-m68010-*-netbsdelf* | m68k*-*-netbsdelf*)
+m68k*-*-netbsdelf*)
        default_m68k_cpu=68020
        default_cf_cpu=5475
        tm_file="${tm_file} dbxelf.h elfos.h netbsd.h netbsd-elf.h m68k/netbsd-elf.h"
@@ -1641,11 +1504,13 @@ mcore-*-elf)
        tm_file="dbxelf.h elfos.h svr4.h ${tm_file} mcore/mcore-elf.h"
        tmake_file=mcore/t-mcore
        use_fixproto=yes
+       inhibit_libc=true
        ;;
 mcore-*-pe*)
        tm_file="svr3.h dbxcoff.h ${tm_file} mcore/mcore-pe.h"
        tmake_file=mcore/t-mcore-pe
        use_fixproto=yes
+       inhibit_libc=true
        ;;
 mips-sgi-irix[56]*)
        tm_file="elfos.h ${tm_file} mips/iris.h"
@@ -1815,12 +1680,6 @@ mips-wrs-vxworks)
        tm_file="elfos.h ${tm_file} svr4.h mips/elf.h vx-common.h vxworks.h mips/vxworks.h"
        tmake_file="${tmake_file} mips/t-vxworks"
        ;;
-mips-wrs-windiss)      # Instruction-level simulator for VxWorks.
-       xm_defines=POSIX
-       tm_file="elfos.h mips/mips.h svr4.h mips/elf.h windiss.h mips/windiss.h"
-       tmake_file="${tmake_file} mips/t-elf mips/t-libgcc-mips16"
-       thread_file=
-       ;;
 mipstx39-*-elf* | mipstx39el-*-elf*)
        tm_file="elfos.h ${tm_file} mips/r3900.h mips/elf.h"
        tmake_file="mips/t-r3900 mips/t-libgcc-mips16"
@@ -1838,10 +1697,6 @@ mn10300-*-*)
        use_collect2=no
        use_fixproto=yes
        ;;
-mt-*-elf)
-        tm_file="dbxelf.h elfos.h svr4.h ${tm_file}"
-        tmake_file="${tmake_file} mt/t-mt"
-        ;;
 pdp11-*-bsd)
        tm_file="${tm_file} pdp11/2bsd.h"
        use_fixproto=yes
@@ -1870,12 +1725,6 @@ powerpc64-*-gnu*)
        extra_options="${extra_options} rs6000/sysv4.opt rs6000/linux64.opt"
        tmake_file="rs6000/t-fprules t-slibgcc-elf-ver t-gnu rs6000/t-linux64 rs6000/t-fprules-softfp soft-fp/t-softfp"
        ;;
-powerpc-*-beos*)
-       tm_file="${tm_file} rs6000/aix.h rs6000/beos.h rs6000/xcoff.h"
-       tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-beos"
-       extra_headers=
-       use_fixproto=yes
-       ;;
 powerpc-*-darwin*)
        extra_options="${extra_options} rs6000/darwin.opt"
        extra_parts="crt2.o"
@@ -1908,17 +1757,6 @@ powerpc-*-netbsd*)
        tmake_file="${tmake_file} rs6000/t-netbsd"
        extra_options="${extra_options} rs6000/sysv4.opt"
        ;;
-powerpc-*-chorusos*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h chorus.h"
-       tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcos rs6000/t-ppccomm"
-       extra_options="${extra_options} rs6000/sysv4.opt"
-       case ${enable_threads} in
-         yes | posix)
-           thread_file='posix'
-           ;;
-       esac
-       use_fixproto=yes
-       ;;
 powerpc-*-eabispe*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h rs6000/eabispe.h"
        extra_options="${extra_options} rs6000/sysv4.opt"
@@ -1963,7 +1801,7 @@ powerpc-*-linux*altivec*)
 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 rs6000/e500.h"
        extra_options="${extra_options} rs6000/sysv4.opt"
-       tmake_file="rs6000/t-fprules rs6000/t-fprules-softfp soft-fp/t-softfp rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"
+       tmake_file="t-dfprules rs6000/t-fprules rs6000/t-fprules-softfp soft-fp/t-softfp rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"
        ;;
 powerpc-*-linux*paired*)
         tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/linux.h rs6000/750cl.h"
@@ -2022,13 +1860,6 @@ powerpc-wrs-vxworks|powerpc-wrs-vxworksae)
            ;;
        esac
        ;;
-powerpc-wrs-windiss*)  # Instruction-level simulator for VxWorks.
-       tm_file="${tm_file} elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/windiss.h"
-       tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
-       extra_options="${extra_options} rs6000/sysv4.opt"
-       thread_file=""
-       use_fixproto=yes
-       ;;
 powerpc-*-lynxos*)
        xm_defines=POSIX
        tm_file="${tm_file} dbxelf.h elfos.h rs6000/sysv4.h rs6000/lynx.h lynx.h"
@@ -2040,12 +1871,6 @@ powerpc-*-lynxos*)
        gnu_ld=yes
        gas=yes
        ;;
-powerpcle-*-sysv*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/sysv4le.h"
-       tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcos rs6000/t-ppccomm"
-       extra_options="${extra_options} rs6000/sysv4.opt"
-       use_fixproto=yes
-       ;;
 powerpcle-*-elf*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/sysv4le.h"
        tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
@@ -2062,16 +1887,6 @@ powerpcle-*-eabi*)
        tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
        extra_options="${extra_options} rs6000/sysv4.opt"
        ;;
-powerpc-*-kaos*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h kaos.h rs6000/kaos-ppc.h"
-       tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
-       extra_options="${extra_options} rs6000/sysv4.opt"
-       ;;
-powerpcle-*-kaos*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/sysv4le.h kaos.h rs6000/kaos-ppc.h"
-       tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
-       extra_options="${extra_options} rs6000/sysv4.opt"
-       ;;
 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-fprules-fpbit rs6000/t-newas"
@@ -2148,9 +1963,9 @@ score-*-elf)
         tmake_file=score/t-score-elf
         extra_objs="score7.o score3.o"
         ;;
-sh-*-elf* | sh[12346l]*-*-elf* | sh*-*-kaos* | \
+sh-*-elf* | sh[12346l]*-*-elf* | \
 sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
-  sh-*-linux* | sh[346lbe]*-*-linux* | \
+  sh-*-linux* | sh[2346lbe]*-*-linux* | \
   sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \
    sh64-*-netbsd* | sh64l*-*-netbsd*)
        tmake_file="${tmake_file} sh/t-sh sh/t-elf"
@@ -2182,8 +1997,6 @@ sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
        case ${target} in
        sh*-*-linux*)   tmake_file="${tmake_file} sh/t-linux"
                        tm_file="${tm_file} linux.h sh/linux.h" ;;
-       sh*-*-kaos*)    tm_file="${tm_file} sh/embed-elf.h kaos.h sh/kaos-sh.h"
-                       ;;
        sh*-*-netbsd*)  tm_file="${tm_file} netbsd.h netbsd-elf.h sh/netbsd-elf.h" ;;
        sh*-superh-elf) if test x$with_libgloss != xno; then
                                with_libgloss=yes
@@ -2345,9 +2158,16 @@ sparc-*-elf*)
        use_fixproto=yes
        ;;
 sparc-*-linux*)                # SPARC's running GNU/Linux, libc6
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/linux.h"
+       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h linux.h"
        extra_options="${extra_options} sparc/long-double-switch.opt"
-       tmake_file="${tmake_file} sparc/t-linux sparc/t-crtfm"
+       tmake_file="${tmake_file} sparc/t-linux"
+       if test x$enable_targets = xall; then
+               tm_file="sparc/biarch64.h ${tm_file} sparc/linux64.h"
+               tmake_file="${tmake_file} sparc/t-linux64"
+       else
+               tm_file="${tm_file} sparc/linux.h"
+       fi
+       tmake_file="${tmake_file} sparc/t-crtfm"
        ;;
 sparc-*-rtems*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/sp-elf.h sparc/rtemself.h rtems.h"
@@ -2384,14 +2204,10 @@ sparc64-*-solaris2* | sparcv9-*-solaris2*)
          "":yes:* | yes:yes:* ) thread_file=posix ;;
          "":*:yes | yes:*:yes ) thread_file=solaris ;;
        esac
-       need_64bit_hwint=yes
        ;;
 sparc-*-solaris2*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h"
        case ${target} in
-       *-*-solaris2.[0-6] | *-*-solaris2.[0-6].*)
-               tm_file="${tm_file} sol2-6.h"
-               ;;
        *-*-solaris2.1[0-9]*)
                tm_file="${tm_file} sol2-10.h"
                ;;
@@ -2409,26 +2225,16 @@ sparc-*-solaris2*)
        else
                tmake_file="$tmake_file t-slibgcc-sld"
        fi
-       case ${target} in
-       *-*-solaris2.[0-6] | *-*-solaris2.[0-6].*)
-               if test x$gnu_ld = xno; then
-                       tm_file="${tm_file} sparc/sol26-sld.h"
-               fi
-               ;;
-       *-*-solaris2.[789] | *-*-solaris2.1[0-9]*)
-               tm_file="sparc/biarch64.h ${tm_file} sparc/sol2-bi.h"
-               if test x$gnu_ld = xyes; then
-                       tm_file="${tm_file} sparc/sol2-gld-bi.h"
-               fi
-               if test x$gas = xyes; then
-                       tm_file="${tm_file} sparc/sol2-gas-bi.h"
-               fi
-               tm_file="${tm_file} tm-dwarf2.h"
-               tmake_file="$tmake_file sparc/t-sol2-64"
-               need_64bit_hwint=yes
-               test x$with_cpu != x || with_cpu=v9
-               ;;
-       esac
+       tm_file="sparc/biarch64.h ${tm_file} sparc/sol2-bi.h"
+       if test x$gnu_ld = xyes; then
+               tm_file="${tm_file} sparc/sol2-gld-bi.h"
+       fi
+       if test x$gas = xyes; then
+               tm_file="${tm_file} sparc/sol2-gas-bi.h"
+       fi
+       tm_file="${tm_file} tm-dwarf2.h"
+       tmake_file="$tmake_file sparc/t-sol2-64"
+       test x$with_cpu != x || with_cpu=v9
        c_target_objs="sol2-c.o"
        cxx_target_objs="sol2-c.o"
        extra_objs="sol2.o"
@@ -2436,26 +2242,13 @@ sparc-*-solaris2*)
        extra_parts="crt1.o crti.o crtn.o gcrt1.o gmon.o crtbegin.o crtend.o"
        case ${enable_threads}:${have_pthread_h}:${have_thread_h} in
          "":yes:* | yes:yes:* )
-               case ${target} in
-                 *-*-solaris2.[0-6] | *-*-solaris2.[0-6].*)
-                       thread_file=posix95
-                       ;;
-                 *)
-                       thread_file=posix
-                       ;;
-               esac
+               thread_file=posix
                ;;
          "":*:yes | yes:*:yes )
                thread_file=solaris
                ;;
        esac
        ;;
-sparc-*-sysv4*)
-       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"
-       use_fixproto=yes
-       ;;
 sparc-wrs-vxworks)
        tm_file="${tm_file} elfos.h svr4.h sparc/sysv4.h vx-common.h vxworks.h sparc/vxworks.h"
        tmake_file="${tmake_file} sparc/t-vxworks"
@@ -2476,10 +2269,9 @@ 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
-       tm_file="sparc/biarch64.h ${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/linux64.h"
+       tm_file="sparc/biarch64.h ${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h linux.h sparc/linux64.h"
        extra_options="${extra_options} sparc/long-double-switch.opt"
        tmake_file="${tmake_file} sparc/t-linux sparc/t-linux64 sparc/t-crtfm"
        ;;
@@ -2497,31 +2289,6 @@ spu-*-elf*)
        c_target_objs="${c_target_objs} spu-c.o"
        cxx_target_objs="${cxx_target_objs} spu-c.o"
        ;;
-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"
-       tmake_file="arm/t-arm arm/t-strongarm-elf"
-       out_file=arm/arm.c
-       md_file=arm/arm.md
-       extra_modes=arm/arm-modes.def
-       use_fixproto=yes
-       ;;
-strongarm-*-pe)
-       tm_file="arm/semi.h arm/aout.h arm/coff.h dbxcoff.h arm/strongarm-coff.h arm/arm.h arm/pe.h arm/strongarm-pe.h"
-       tmake_file="arm/t-arm arm/t-strongarm-pe"
-       out_file=arm/arm.c
-       md_file=arm/arm.md
-       extra_modes=arm/arm-modes.def
-       extra_options="${extra_options} arm/pe.opt"
-       extra_objs=pe.o
-       use_fixproto=yes
-       ;;
-strongarm-*-kaos*)
-       tm_file="arm/strongarm-elf.h dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h kaos.h arm/kaos-strongarm.h"
-       tmake_file="arm/t-arm arm/t-strongarm-elf"
-       out_file=arm/arm.c
-       md_file=arm/arm.md
-       extra_modes=arm/arm-modes.def
-       ;;
 v850e1-*-*)
        target_cpu_default="TARGET_CPU_v850e1"
        tm_file="dbxelf.h elfos.h svr4.h v850/v850.h"
@@ -2569,17 +2336,6 @@ v850-*-*)
        cxx_target_objs="v850-c.o"
        use_fixproto=yes
        ;;
-vax-*-bsd*)                    # VAXen running BSD
-       tm_file="${tm_file} vax/bsd.h"
-       tmake_file=vax/t-memfuncs
-       use_collect2=yes
-       use_fixproto=yes
-       ;;
-vax-*-sysv*)                   # VAXen running system V
-       tm_file="${tm_file} vax/vaxv.h"
-       tmake_file=vax/t-memfuncs
-       use_fixproto=yes
-       ;;
 vax-*-netbsdelf*)
        tm_file="${tm_file} elfos.h netbsd.h netbsd-elf.h vax/elf.h vax/netbsd-elf.h"
        ;;
@@ -2593,27 +2349,6 @@ vax-*-openbsd*)
        tm_file="vax/vax.h vax/openbsd1.h openbsd.h vax/openbsd.h"
        use_collect2=yes
        ;;
-vax-*-ultrix*)                 # VAXen running ultrix
-       tm_file="${tm_file} vax/ultrix.h"
-       tmake_file=vax/t-memfuncs
-       use_fixproto=yes
-       ;;
-xscale-*-elf)
-       tm_file="arm/xscale-elf.h dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h"
-       tmake_file="arm/t-arm arm/t-xscale-elf"
-       out_file=arm/arm.c
-       md_file=arm/arm.md
-       extra_modes=arm/arm-modes.def
-       use_fixproto=yes
-       ;;
-xscale-*-coff)
-       tm_file="arm/semi.h arm/aout.h arm/coff.h dbxcoff.h arm/xscale-coff.h arm/arm.h"
-       tmake_file="arm/t-arm arm/t-xscale-coff"
-       out_file=arm/arm.c
-       md_file=arm/arm.md
-       extra_modes=arm/arm-modes.def
-       use_fixproto=yes
-       ;;
 xstormy16-*-elf)
        # For historical reasons, the target files omit the 'x'.
        tm_file="dbxelf.h elfos.h svr4.h stormy16/stormy16.h"
@@ -2653,9 +2388,6 @@ m32c-*-elf*)
 esac
 
 case ${target} in
-i[34567]86-*-linux*aout* | i[34567]86-*-linux*libc1)
-       tmake_file="${tmake_file} i386/t-gmm_malloc"
-       ;;
 i[34567]86-*-linux* | x86_64-*-linux*)
        tmake_file="${tmake_file} i386/t-pmm_malloc"
        ;;
@@ -2677,10 +2409,6 @@ esac
 # This block sets nothing except for with_cpu.
 if test x$with_cpu = x ; then
   case ${target} in
-    ep9312-*-*)
-      # A Cirrus ARM variant.
-      with_cpu="ep9312"
-      ;;
     i386-*-*)
       with_cpu=i386
       ;;
@@ -2792,9 +2520,6 @@ if test x$with_cpu = x ; then
     frv550-*-*linux*)
       with_cpu=fr550
       ;;
-    m680[012]0-*-*)
-      with_cpu=`echo ${target} | sed 's/-.*$//'`
-      ;;
     m68k*-*-*)
       case "$with_arch" in
        "cf")
@@ -2812,21 +2537,29 @@ if test x$with_cpu = x ; then
       with_cpu="`echo ${target} | sed 's/-.*$//'`"
       ;;
   esac
-fi
 
-# Similarly for --with-float
-if test x$with_float = x; then
-       case ${target} in
-       ep9312-*-*)
-               with_float=hard
-               ;;
-       esac
+  # Avoid overriding --with-cpu-32 and --with-cpu-64 values.
+  case ${target} in
+    i[34567]86-*-*|x86_64-*-*)
+      if test x$with_cpu != x; then
+        if test x$with_cpu_32 != x || test x$with_cpu_64 != x; then
+          if test x$with_cpu_32 = x; then
+            with_cpu_32=$with_cpu
+          fi
+          if test x$with_cpu_64 = x; then
+            with_cpu_64=$with_cpu
+          fi
+          with_cpu=
+        fi
+      fi
+      ;;
+  esac
 fi
 
 # Similarly for --with-schedule.
 if test x$with_schedule = x; then
        case ${target} in
-       hppa1* | parisc1*)
+       hppa1*)
                # Override default PA8000 scheduling model.
                with_schedule=7100LC
                ;;
@@ -2957,7 +2690,7 @@ case "${target}" in
                esac
                ;;
 
-       fido-*-* | m680[012]0-*-* | m68k*-*-*)
+       fido-*-* | m68k*-*-*)
                supported_defaults="arch cpu"
                case "$with_arch" in
                "" | "m68k"| "cf")
@@ -2997,7 +2730,7 @@ case "${target}" in
                esac
                ;;
 
-       hppa*-*-* | parisc*-*-*)
+       hppa*-*-*)
                supported_defaults="arch schedule"
 
                case "$with_arch" in
@@ -3022,8 +2755,8 @@ case "${target}" in
                ;;
 
        i[34567]86-*-* | x86_64-*-*)
-               supported_defaults="arch cpu tune"
-               for which in arch cpu tune; do
+               supported_defaults="arch arch_32 arch_64 cpu cpu_32 cpu_64 tune tune_32 tune_64"
+               for which in arch arch_32 arch_64 cpu cpu_32 cpu_64 tune tune_32 tune_64; do
                        eval "val=\$with_$which"
                        case ${val} in
                        i386 | i486 \
@@ -3034,8 +2767,14 @@ case "${target}" in
                        | prescott | pentium-m | pentium4m | pentium3m)
                                case "${target}" in
                                  x86_64-*-*)
-                                     echo "CPU given in --with-$which=$val doesn't support 64bit mode." 1>&2
-                                     exit 1
+                                     case "x$which" in
+                                       *_32)
+                                               ;;
+                                       *)
+                                               echo "CPU given in --with-$which=$val doesn't support 64bit mode." 1>&2
+                                               exit 1
+                                               ;;
+                                     esac
                                      ;;
                                esac
                                # OK
@@ -3101,25 +2840,6 @@ case "${target}" in
                esac
                ;;
 
-       mt-*-*)
-               supported_defaults="arch"
-
-               case "$with_arch" in
-               "" \
-               | ms1-64-001 \
-               | ms1-16-002 \
-               | ms1-16-003 \
-               | ms2 \
-               | "")
-                       # OK
-                       ;;
-               *)
-                       echo "Unknown arch used in --with-arch=$with_arch" 1>&2
-                       exit 1
-                       ;;
-               esac
-               ;;
-
        powerpc*-*-* | rs6000-*-*)
                supported_defaults="cpu float tune"
 
@@ -3137,8 +2857,8 @@ case "${target}" in
                        "" | common \
                        | power | power[23456] | power6x | powerpc | powerpc64 \
                        | rios | rios1 | rios2 | rsc | rsc1 | rs64a \
-                       | 401 | 403 | 405 | 405fp | 440 | 440fp | 505 \
-                       | 601 | 602 | 603 | 603e | ec603e | 604 \
+                       | 401 | 403 | 405 | 405fp | 440 | 440fp | 464 | 464fp \
+                       | 505 | 601 | 602 | 603 | 603e | ec603e | 604 \
                        | 604e | 620 | 630 | 740 | 750 | 7400 | 7450 | e300c[23] \
                        | 854[08] | 801 | 821 | 823 | 860 | 970 | G3 | G4 | G5 | cell)
                                # OK
@@ -3157,7 +2877,7 @@ case "${target}" in
                for which in arch tune; do
                        eval "val=\$with_$which"
                        case ${val} in
-                       "" | g5 | g6 | z900 | z990 | z9-109 | z9-ec)
+                       "" | g5 | g6 | z900 | z990 | z9-109 | z9-ec | z10)
                                # OK
                                ;;
                        *)
@@ -3277,7 +2997,7 @@ case ${target} in
                fi
                ;;
 
-       hppa*-*-* | parisc*-*-*)
+       hppa*-*-*)
                target_cpu_default2="MASK_BIG_SWITCH"
                if test x$gas = xyes
                then
@@ -3285,7 +3005,7 @@ case ${target} in
                fi
                ;;
 
-       fido*-*-* | m680[012]0-*-* | m68k*-*-*)
+       fido*-*-* | m68k*-*-*)
                target_cpu_default2=$m68k_cpu_ident
                if [ x"$m68k_arch_family" != x ]; then
                        tmake_file="m68k/t-$m68k_arch_family $tmake_file"
@@ -3362,7 +3082,7 @@ case ${target} in
 esac
 
 t=
-all_defaults="abi cpu arch tune schedule float mode fpu divide llsc"
+all_defaults="abi cpu cpu_32 cpu_64 arch arch_32 arch_64 tune tune_32 tune_64 schedule float mode fpu divide llsc"
 for option in $all_defaults
 do
        eval "val=\$with_$option"