OSDN Git Service

* config.gcc (hppa[12]*-*-hpux10*): Don't use fixproto.
[pf3gnuchains/gcc-fork.git] / gcc / config.gcc
index 28d6f27..b659fc3 100644 (file)
@@ -1,12 +1,12 @@
 # GCC target-specific configuration file.
-# Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
-# Free Software Foundation, Inc.
+# Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+# 2008 Free Software Foundation, Inc.
 
 #This file is part of GCC.
 
 #GCC is free software; you can redistribute it and/or modify it under
 #the terms of the GNU General Public License as published by the Free
-#Software Foundation; either version 2, or (at your option) any later
+#Software Foundation; either version 3, or (at your option) any later
 #version.
 
 #GCC is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,8 @@
 #for more details.
 
 #You should have received a copy of the GNU General Public License
-#along with GCC; see the file COPYING.  If not, write to the Free
-#Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-#02110-1301, USA.
+#along with GCC; see the file COPYING3.  If not see
+#<http://www.gnu.org/licenses/>.
 
 # This is the GCC target-specific configuration file
 # where a configuration type is mapped to different system-specific
 #                      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.
 #
 #  extra_headers       List of used header files from the directory
 #                      config/${cpu_type}.
 #
+#  use_gcc_tgmath      If set, add tgmath.h to the list of used header
+#                      files.
+#
 #  extra_passes                List of extra executables compiled for this target
 #                      machine, used for compiling from source to object.
 #
 #  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
 out_file=
 tmake_file=
 extra_headers=
+use_gcc_tgmath=yes
 extra_passes=
 extra_parts=
 extra_programs=
@@ -164,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.
@@ -191,40 +204,35 @@ xm_file=
 md_file=
 
 # Obsolete configurations.
-case ${target} in
-   c4x-*               \
- | tic4x-*             \
- )
-    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
@@ -250,63 +258,63 @@ alpha*-*-*)
 am33_2.0-*-linux*)
        cpu_type=mn10300
        ;;
-strongarm*-*-*)
-       cpu_type=arm
-       ;;
 arm*-*-*)
        cpu_type=arm
-       extra_headers="mmintrin.h"
+       extra_headers="mmintrin.h arm_neon.h"
+       c_target_objs="arm-c.o"
+       cxx_target_objs="arm-c.o"
        ;;
 bfin*-*)
        cpu_type=bfin
        ;;
-ep9312*-*-*)
-       cpu_type=arm
+crisv32-*)
+       cpu_type=cris
        ;;
 frv*)  cpu_type=frv
        ;;
-xscale-*-*)
-       cpu_type=arm
-       extra_headers="mmintrin.h"
-       ;;
+fido-*-*)
+       cpu_type=m68k
+       extra_headers=math-68881.h
+        ;;
 i[34567]86-*-*)
        cpu_type=i386
-       extra_headers="mmintrin.h mm3dnow.h xmmintrin.h emmintrin.h
-                      pmmintrin.h tmmintrin.h"
+       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
+                      wmmintrin.h"
        ;;
 x86_64-*-*)
        cpu_type=i386
-       extra_headers="mmintrin.h mm3dnow.h xmmintrin.h emmintrin.h
-                      pmmintrin.h tmmintrin.h"
+       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
+                      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
        ;;
 mips*-*-*)
        cpu_type=mips
        need_64bit_hwint=yes
+       extra_headers="loongson.h"
        ;;
 powerpc*-*-*)
        cpu_type=rs6000
-       extra_headers="ppc-asm.h altivec.h spe.h"
+       extra_headers="ppc-asm.h altivec.h spe.h ppu_intrinsics.h paired.h spu2vmx.h vec_types.h si2vmx.h"
        need_64bit_hwint=yes
        case x$with_cpu in
-           xpowerpc64|xdefault64|x6[23]0|x970|xG5|xpower[3456]|xpower6x|xrs64a)
+           xpowerpc64|xdefault64|x6[23]0|x970|xG5|xpower[3456]|xpower6x|xrs64a|xcell)
                cpu_is_64bit=yes
                ;;
        esac
@@ -317,12 +325,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
@@ -333,13 +338,10 @@ 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
        ;;
-tic4x-*-*)
-        cpu_type=c4x
-        ;;
 esac
 
 tm_file=${cpu_type}/${cpu_type}.h
@@ -358,8 +360,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
 
@@ -386,7 +396,9 @@ 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
   case ${enable_threads} in
     "" | yes | posix) thread_file='posix' ;;
@@ -420,26 +432,8 @@ case ${target} in
   gas=yes
   gnu_ld=yes
   extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
-  case ${target} in
-    *-*-freebsd3 | *-*-freebsd[3].*)
-      tm_defines="${tm_defines} FBSD_MAJOR=3" ;;
-    *-*-freebsd4 | *-*-freebsd[4].*)
-      tm_defines="${tm_defines} FBSD_MAJOR=4" ;;
-    *-*-freebsd5 | *-*-freebsd[5].*)
-      tm_defines="${tm_defines} FBSD_MAJOR=5" ;;
-    *-*-freebsd6 | *-*-freebsd[6].*)
-      tm_defines="${tm_defines} FBSD_MAJOR=6" ;;
-    *-*-freebsd7 | *-*-freebsd[7].*)
-      tm_defines="${tm_defines} FBSD_MAJOR=7" ;;
-    *-*-freebsd8 | *-*-freebsd[8].*)
-      tm_defines="${tm_defines} FBSD_MAJOR=8" ;;
-    *-*-freebsd9 | *-*-freebsd[9].*)
-      tm_defines="${tm_defines} FBSD_MAJOR=9" ;;
-    *)
-      echo 'Please update *-*-freebsd* in gcc/config.gcc'
-      exit 1
-      ;;
-  esac
+  fbsd_major=`echo ${target} | sed -e 's/.*freebsd//g' | sed -e 's/\..*//g'`
+  tm_defines="${tm_defines} FBSD_MAJOR=${fbsd_major}"
   tmake_file="t-slibgcc-elf-ver t-freebsd"
   case ${enable_threads} in
     no)
@@ -463,9 +457,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"
@@ -486,6 +477,7 @@ case ${target} in
   esac
   # Assume that glibc or uClibc are being used and so __cxa_atexit is provided.
   default_use_cxa_atexit=yes
+  use_gcc_tgmath=no
   ;;
 *-*-gnu*)
   # On the Hurd, the setup is just about the same on
@@ -509,6 +501,7 @@ case ${target} in
   esac
   # Assume that glibc is being used and so __cxa_atexit is provided.
   default_use_cxa_atexit=yes
+  use_gcc_tgmath=no
   ;;
 *-*-netbsd*)
   tmake_file="t-slibgcc-elf-ver t-libc-ok t-netbsd t-libgcc-pic"
@@ -569,9 +562,9 @@ case ${target} in
   ;;
 *-*-vxworks*)
   tmake_file=t-vxworks
-  tm_file="${tm_file} elfos.h svr4.h"
   xm_defines=POSIX
   extra_options="${extra_options} vxworks.opt"
+  extra_objs=vxworks.o
   case ${enable_threads} in
     no) ;;
     "" | yes | vxworks) thread_file='vxworks' ;;
@@ -596,15 +589,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"
@@ -682,21 +666,16 @@ alpha*-dec-*vms*)
 arc-*-elf*)
        tm_file="dbxelf.h elfos.h svr4.h ${tm_file}"
        extra_parts="crtinit.o crtfini.o"
-       use_fixproto=yes
        ;;
 arm-*-coff* | armel-*-coff*)
        tm_file="arm/semi.h arm/aout.h arm/arm.h arm/coff.h dbxcoff.h"
        tmake_file="arm/t-arm arm/t-arm-coff"
        ;;
-arm-semi-aof | armel-semi-aof)
-       tm_file="arm/semiaof.h arm/aof.h arm/arm.h"
-       tmake_file="arm/t-arm arm/t-semi"
-       ;;
 arm-wrs-vxworks)
-       tm_file="dbxelf.h elfos.h svr4.h vxworks.h arm/elf.h arm/aout.h arm/arm.h arm/vxworks.h"
+       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"
        ;;
@@ -712,6 +691,11 @@ arm*-*-netbsd*)
        ;;
 arm*-*-linux*)                 # ARM GNU/Linux with ELF
        tm_file="dbxelf.h elfos.h linux.h arm/elf.h arm/linux-gas.h arm/linux-elf.h"
+       case $target in
+       arm*b-*)
+               tm_defines="${tm_defines} TARGET_BIG_ENDIAN_DEFAULT=1"
+               ;;
+       esac
        tmake_file="${tmake_file} t-linux arm/t-arm"
        case ${target} in
        arm*-*-linux-*eabi)
@@ -729,14 +713,29 @@ arm*-*-linux*)                    # ARM GNU/Linux with ELF
            ;;
        esac
        tm_file="$tm_file arm/aout.h arm/arm.h"
+       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/aout.h arm/arm.h arm/linux-gas.h arm/linux-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)
+           tm_file="$tm_file arm/bpabi.h arm/uclinux-eabi.h"
+           tmake_file="$tmake_file arm/t-bpabi"
+           # The BPABI long long divmod functions return a 128-bit value in
+           # registers r0-r3.  Correctly modeling that requires the use of
+           # TImode.
+           need_64bit_hwint=yes
+           # The EABI requires the use of __cxa_atexit.
+           default_use_cxa_atexit=yes
+       esac
+       tm_file="$tm_file arm/aout.h arm/arm.h"
+       tmake_file="${tmake_file} arm/t-arm-softfp soft-fp/t-softfp"
        ;;
 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 arm/t-arm-elf"
+       tmake_file="${tmake_file} arm/t-arm-softfp soft-fp/t-softfp"
        ;;
 arm*-*-eabi* | arm*-*-symbianelf* )
        # The BPABI long long divmod functions return a 128-bit value in
@@ -758,14 +757,17 @@ arm*-*-eabi* | arm*-*-symbianelf* )
          ;;
        esac
        tm_file="${tm_file} arm/aout.h arm/arm.h"
+       tmake_file="${tmake_file} arm/t-arm-softfp soft-fp/t-softfp"
        ;;
 arm*-*-rtems*)
        tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h arm/rtems-elf.h rtems.h"
        tmake_file="arm/t-arm 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"
        ;;
 arm*-wince-pe*)
        tm_file="arm/semi.h arm/aout.h arm/arm.h arm/coff.h dbxcoff.h arm/pe.h arm/wince-pe.h"
@@ -779,53 +781,46 @@ 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"
-       ;;
 avr-*-rtems*)
        tm_file="avr/avr.h dbxelf.h avr/rtems.h rtems.h"
        tmake_file="avr/t-avr t-rtems avr/t-rtems"
        ;;
 avr-*-*)
        tm_file="avr/avr.h dbxelf.h"
-       use_fixproto=yes
        ;;
 bfin*-elf*)
        tm_file="${tm_file} dbxelf.h elfos.h bfin/elf.h"
-        tmake_file=bfin/t-bfin-elf
-        use_collect2=no
-        ;;
+       tmake_file=bfin/t-bfin-elf
+       use_collect2=no
+       ;;
 bfin*-uclinux*)
-       tm_file="${tm_file} dbxelf.h elfos.h bfin/elf.h bfin/uclinux.h"
-        tmake_file=bfin/t-bfin-elf
-        use_collect2=no
-        ;;
+       tm_file="${tm_file} dbxelf.h elfos.h bfin/elf.h linux.h bfin/uclinux.h"
+       tmake_file=bfin/t-bfin-uclinux
+       tm_defines="${tm_defines} UCLIBC_DEFAULT=1"
+       extra_options="${extra_options} linux.opt"
+       use_collect2=no
+       ;;
+bfin*-linux-uclibc*)
+       tm_file="${tm_file} dbxelf.h elfos.h bfin/elf.h linux.h bfin/linux.h ./linux-sysroot-suffix.h"
+       tmake_file="t-slibgcc-elf-ver bfin/t-bfin-linux"
+       extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
+       use_collect2=no
+       ;;
 bfin*-rtems*)
        tm_file="${tm_file} dbxelf.h elfos.h bfin/elf.h bfin/rtems.h rtems.h"
        tmake_file="bfin/t-bfin t-rtems bfin/t-rtems"
-        ;;
+       ;;
 bfin*-*)
        tm_file="${tm_file} dbxelf.h elfos.h bfin/elf.h"
-        tmake_file=bfin/t-bfin
-        use_collect2=no
-        ;;
-c4x-*-rtems* | tic4x-*-rtems*)
-       tmake_file="c4x/t-c4x t-rtems c4x/t-rtems"
-       tm_file="c4x/c4x.h c4x/rtems.h rtems.h"
-       c_target_objs="c4x-c.o"
-       cxx_target_objs="c4x-c.o"
-       ;;
-c4x-* | tic4x-*)
-       tmake_file=c4x/t-c4x
-       c_target_objs="c4x-c.o"
-       cxx_target_objs="c4x-c.o"
-       ;;
-cris-*-aout)
-       tm_file="dbxelf.h ${tm_file} cris/aout.h"
+       tmake_file=bfin/t-bfin
+       use_collect2=no
+       ;;
+crisv32-*-elf | crisv32-*-none)
+       tm_file="dbxelf.h elfos.h ${tm_file}"
+       tmake_file="cris/t-cris"
+       target_cpu_default=32
        gas=yes
-       tmake_file="cris/t-cris cris/t-aout"
-       extra_options="${extra_options} cris/aout.opt"
+       extra_options="${extra_options} cris/elf.opt"
        ;;
 cris-*-elf | cris-*-none)
        tm_file="dbxelf.h elfos.h ${tm_file}"
@@ -833,11 +828,19 @@ cris-*-elf | cris-*-none)
        gas=yes
        extra_options="${extra_options} cris/elf.opt"
        ;;
-cris-*-linux*)
+crisv32-*-linux* | cris-*-linux*)
        tm_file="dbxelf.h elfos.h svr4.h ${tm_file} linux.h cris/linux.h"
        # We need to avoid using t-linux, so override default tmake_file
        tmake_file="cris/t-cris t-slibgcc-elf-ver cris/t-linux"
        extra_options="${extra_options} cris/linux.opt"
+       case $target in
+         cris-*-*)
+               target_cpu_default=10
+               ;;
+         crisv32-*-*)
+               target_cpu_default=32
+               ;;
+       esac
        ;;
 crx-*-elf)
        tm_file="elfos.h ${tm_file}"
@@ -848,22 +851,16 @@ fr30-*-elf)
        tm_file="dbxelf.h elfos.h svr4.h ${tm_file}"
        tmake_file=fr30/t-fr30
        extra_parts="crti.o crtn.o crtbegin.o crtend.o"
-       use_fixproto=yes
        ;;
 frv-*-elf)
        tm_file="dbxelf.h elfos.h svr4.h ${tm_file} frv/frv-abi.h"
        tmake_file=frv/t-frv
-       use_fixproto=yes
        ;;
 frv-*-*linux*)
        tm_file="dbxelf.h elfos.h svr4.h ${tm_file} \
                 linux.h frv/linux.h frv/frv-abi.h"
        tmake_file="${tmake_file} frv/t-frv frv/t-linux"
        ;;
-h8300-*-rtemscoff*)
-       tmake_file="h8300/t-h8300 t-rtems h8300/t-rtems"
-       tm_file="h8300/h8300.h dbxcoff.h h8300/coff.h h8300/rtems.h rtems.h"
-       ;;
 h8300-*-rtems*)
        tmake_file="h8300/t-h8300 h8300/t-elf t-rtems h8300/t-rtems"
        tm_file="h8300/h8300.h dbxelf.h elfos.h h8300/elf.h h8300/rtems.h rtems.h"
@@ -871,13 +868,11 @@ h8300-*-rtems*)
 h8300-*-elf*)
        tmake_file="h8300/t-h8300 h8300/t-elf"
        tm_file="h8300/h8300.h dbxelf.h elfos.h h8300/elf.h"
-       use_fixproto=yes
        ;;
 h8300-*-*)
        tm_file="h8300/h8300.h dbxcoff.h h8300/coff.h"
-       use_fixproto=yes
        ;;
-hppa*64*-*-linux* | parisc*64*-*-linux*)
+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"
@@ -885,7 +880,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"
@@ -901,24 +896,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*-*-*)
@@ -952,7 +929,6 @@ hppa[12]*-*-hpux10*)
            tmake_file="$tmake_file pa/t-slibgcc-dwarf-ver"
        fi
        use_collect2=yes
-       use_fixproto=yes
        gas=yes
        ;;
 hppa*64*-*-hpux11*)
@@ -1029,44 +1005,31 @@ i[34567]86-*-darwin*)
        # config.guess deciding that the configuration is i386-*-darwin* and
        # then this file using that to set --with-cpu=i386 which has no -m64
        # support.
-       with_arch=${with_arch:-nocona}
        with_cpu=${with_cpu:-generic}
+       tmake_file="${tmake_file} i386/t-fprules-softfp64 soft-fp/t-softfp i386/t-crtpc i386/t-crtfm"
        ;;
 x86_64-*-darwin*)
-       with_arch=${with_arch:-nocona}
        with_cpu=${with_cpu:-generic}
-       tmake_file="t-darwin ${cpu_type}/t-darwin64 t-slibgcc-darwin"
+       tmake_file="t-darwin ${cpu_type}/t-darwin64 t-slibgcc-darwin i386/t-fprules-softfp64 soft-fp/t-softfp i386/t-crtpc i386/t-crtfm"
        tm_file="${tm_file} ${cpu_type}/darwin64.h"
        ;;
 i[34567]86-*-elf*)
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h i386/i386elf.h"
        tmake_file="i386/t-i386elf t-svr4"
-       use_fixproto=yes
        ;;
-i[34567]86-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
+x86_64-*-elf*)
+       tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h i386/i386elf.h i386/x86-64.h"
+       tmake_file="i386/t-i386elf t-svr4"
        ;;
 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"
        ;;
 x86_64-*-freebsd*)
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${fbsd_tm_file} i386/x86-64.h i386/freebsd.h i386/freebsd64.h"
+       tmake_file="${tmake_file} i386/t-crtstuff"
        ;;
 i[34567]86-*-netbsdelf*)
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h netbsd.h netbsd-elf.h i386/netbsd-elf.h"
@@ -1079,6 +1042,7 @@ i[34567]86-*-netbsd*)
        ;;
 x86_64-*-netbsd*)
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h netbsd.h netbsd-elf.h i386/x86-64.h i386/netbsd64.h"
+       tmake_file="${tmake_file} i386/t-crtstuff"
        ;;
 i[34567]86-*-openbsd2.*|i[34567]86-*openbsd3.[0123])
        tm_file="i386/i386.h i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h openbsd-oldgas.h openbsd.h i386/openbsd.h"
@@ -1095,7 +1059,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"
-       use_fixproto=yes
        ;;
 i[34567]86-*-linux* | i[34567]86-*-kfreebsd*-gnu | i[34567]86-*-knetbsd*-gnu)
                        # Intel 80386's running GNU/*
@@ -1106,19 +1069,19 @@ i[34567]86-*-linux* | i[34567]86-*-kfreebsd*-gnu | i[34567]86-*-knetbsd*-gnu)
                if test x$enable_targets = xall; then
                        tm_file="${tm_file} i386/x86-64.h i386/linux64.h"
                        tm_defines="${tm_defines} TARGET_BI_ARCH=1"
-                       tmake_file="${tmake_file} i386/t-linux64"
+                       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|Xnocona|Xx86-64|Xk8|Xopteron|Xathlon64|Xathlon-fx)
+                       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
-                               echo "generic nocona x86-64 k8 opteron athlon64 athlon-fx" 1>&2
+                               echo "generic core2 nocona x86-64 amdfam10 barcelona k8 opteron athlon64 athlon-fx" 1>&2
                                exit 1
                                ;;
                        esac
@@ -1129,7 +1092,7 @@ i[34567]86-*-linux* | i[34567]86-*-kfreebsd*-gnu | i[34567]86-*-knetbsd*-gnu)
        i[34567]86-*-knetbsd*-gnu) tm_file="${tm_file} i386/linux.h knetbsd-gnu.h i386/knetbsd-gnu.h" ;;
        i[34567]86-*-kfreebsd*-gnu) tm_file="${tm_file} i386/linux.h kfreebsd-gnu.h i386/kfreebsd-gnu.h" ;;
        esac
-       tmake_file="${tmake_file} i386/t-crtstuff i386/t-crtfm t-dfprules"
+       tmake_file="${tmake_file} i386/t-crtstuff i386/t-crtpc i386/t-crtfm t-dfprules"
        ;;
 x86_64-*-linux* | x86_64-*-kfreebsd*-gnu | x86_64-*-knetbsd*-gnu)
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h linux.h \
@@ -1138,7 +1101,7 @@ x86_64-*-linux* | x86_64-*-kfreebsd*-gnu | x86_64-*-knetbsd*-gnu)
        x86_64-*-kfreebsd*-gnu) tm_file="${tm_file} kfreebsd-gnu.h" ;;
        x86_64-*-knetbsd*-gnu) tm_file="${tm_file} knetbsd-gnu.h" ;;
        esac
-       tmake_file="${tmake_file} i386/t-linux64 i386/t-crtfm t-dfprules"
+       tmake_file="${tmake_file} i386/t-linux64 i386/t-crtstuff i386/t-crtpc i386/t-crtfm i386/t-fprules-softfp64 soft-fp/t-softfp t-dfprules"
        ;;
 i[34567]86-*-gnu*)
        ;;
@@ -1190,23 +1153,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"
                ;;
@@ -1226,28 +1175,24 @@ 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-sol2-10"
+               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|Xnocona|Xx86-64|Xk8|Xopteron|Xathlon64|Xathlon-fx)
+               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
-                       echo "generic nocona x86-64 k8 opteron athlon64 athlon-fx" 1>&2
+                       echo "generic core2 nocona x86-64 amdfam10 barcelona k8 opteron athlon64 athlon-fx" 1>&2
                        exit 1
                        ;;
                esac
@@ -1261,52 +1206,22 @@ 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/sysv4.h i386/unix.h i386/att.h vx-common.h"
+       tm_file="${tm_file} i386/unix.h i386/att.h elfos.h svr4.h vx-common.h"
        case ${target} in
          *-vxworksae*)
-           tm_file="${tm_file} vxworksae.h i386/vxworksae.h"
+           tm_file="${tm_file} vxworksae.h i386/vx-common.h i386/vxworksae.h"
            tmake_file="${tmake_file} i386/t-vxworks i386/t-vxworksae"
            ;;
          *)
-           tm_file="${tm_file} vxworks.h i386/vxworks.h"
+           tm_file="${tm_file} vxworks.h i386/vx-common.h i386/vxworks.h"
            tmake_file="${tmake_file} i386/t-vxworks"
            ;;
        esac
@@ -1318,21 +1233,22 @@ i[34567]86-*-pe | i[34567]86-*-cygwin*)
        target_gtfiles="\$(srcdir)/config/i386/winnt.c"
        extra_options="${extra_options} i386/cygming.opt"
        extra_objs="winnt.o winnt-stubs.o"
-       c_target_objs=cygwin2.o
-       cxx_target_objs="cygwin2.o winnt-cxx.o"
+       c_target_objs="cygwin2.o msformat-c.o"
+       cxx_target_objs="cygwin2.o winnt-cxx.o msformat-c.o"
        extra_gcc_objs=cygwin1.o
        if test x$enable_threads = xyes; then
                thread_file='posix'
        fi
        ;;
-i[34567]86-*-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"
        target_gtfiles="\$(srcdir)/config/i386/winnt.c"
        extra_options="${extra_options} i386/cygming.opt"
        extra_objs="winnt.o winnt-stubs.o"
-       cxx_target_objs=winnt-cxx.o
+       c_target_objs="msformat-c.o"
+       cxx_target_objs="winnt-cxx.o msformat-c.o"
        default_use_cxa_atexit=yes
        case ${enable_threads} in
          "" | yes | win32)
@@ -1341,23 +1257,19 @@ i[34567]86-*-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"
@@ -1371,10 +1283,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"
@@ -1388,7 +1296,6 @@ ia64*-*-elf*)
                target_cpu_default="${target_cpu_default}|MASK_GNU_LD"
        fi
        extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtfastmath.o"
-       use_fixproto=yes
        ;;
 ia64*-*-freebsd*)
        tm_file="${tm_file} dbxelf.h elfos.h ${fbsd_tm_file} ia64/sysv4.h ia64/freebsd.h"
@@ -1410,7 +1317,7 @@ ia64*-*-hpux*)
        tmake_file="ia64/t-ia64 ia64/t-hpux"
        target_cpu_default="MASK_GNU_AS"
        case x$enable_threads in
-       xyes | xposix )
+       x | xyes | xposix )
                thread_file=posix
                ;;
        esac
@@ -1418,33 +1325,26 @@ ia64*-*-hpux*)
        c_target_objs="ia64-c.o"
        cxx_target_objs="ia64-c.o"
        extra_options="${extra_options} ia64/ilp32.opt"
-       # If we decide to run fixproto we should define FIXPROTO_DEFINES
-       # in ia64/t-hpux, and also fix the definition of putenv in
-       # sys-protos.h (const char not char).
        ;;
 iq2000*-*-elf*)
         tm_file="svr4.h elfos.h iq2000/iq2000.h"
         tmake_file=iq2000/t-iq2000
         out_file=iq2000/iq2000.c
         md_file=iq2000/iq2000.md
-       use_fixproto=yes
         ;;
 m32r-*-elf*)
        tm_file="dbxelf.h elfos.h svr4.h ${tm_file}"
        extra_parts="crtinit.o crtfini.o"
-       use_fixproto=yes
        ;;
 m32rle-*-elf*)
        tm_file="dbxelf.h elfos.h svr4.h m32r/little.h ${tm_file}"
        extra_parts="crtinit.o crtfini.o m32rx/crtinit.o m32rx/crtfini.o"
-       use_fixproto=yes
        ;;
 m32r-*-linux*)
        tm_file="dbxelf.h elfos.h svr4.h linux.h ${tm_file} m32r/linux.h"
        # We override the tmake_file for linux -- why?
        tmake_file="t-slibgcc-elf-ver m32r/t-linux"
        gnu_ld=yes
-       use_fixproto=yes
        if test x$enable_threads = xyes; then
                thread_file='posix'
        fi
@@ -1454,77 +1354,114 @@ m32rle-*-linux*)
        # We override the tmake_file for linux -- why?
        tmake_file="t-slibgcc-elf-ver m32r/t-linux"
        gnu_ld=yes
-       use_fixproto=yes
        if test x$enable_threads = xyes; then
                thread_file='posix'
        fi
        ;;
 # m68hc11 and m68hc12 share the same machine description.
 m68hc11-*-*|m6811-*-*)
-       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"
-       use_fixproto=yes
+       tmake_file="m68hc11/t-m68hc11"
         ;;
 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
         ;;
 m68k-*-aout*)
-       tmake_file=m68k/t-m68kbare
-       tm_file="m68k/m68k.h m68k/m68k-none.h m68k/m68kemb.h m68k/m68k-aout.h libgloss.h"
+       default_m68k_cpu=68020
+       default_cf_cpu=5206
+       tmake_file="m68k/t-floatlib m68k/t-m68kbare m68k/t-mlibs"
+       tm_file="${tm_file} m68k/m68k-none.h m68k/m68kemb.h m68k/m68k-aout.h libgloss.h"
        ;;
 m68k-*-coff*)
-       tmake_file=m68k/t-m68kbare
-       tm_defines="${tm_defines} MOTOROLA USE_GAS"
-       tm_file="m68k/m68k.h m68k/m68k-none.h m68k/m68kemb.h dbxcoff.h m68k/coff.h dbx.h"
-       use_fixproto=yes
-       ;;
-m68020-*-elf* | m68k-*-elf*)
-       tm_file="m68k/m68k.h m68k/m68k-none.h m68k/m68kelf.h dbxelf.h elfos.h m68k/m68kemb.h m68k/m68020-elf.h"
-       tm_defines="${tm_defines} MOTOROLA USE_GAS"
-       tmake_file=m68k/t-m68kelf
-       extra_parts="crtbegin.o crtend.o"
+       default_m68k_cpu=68020
+       default_cf_cpu=5206
+       tmake_file="m68k/t-floatlib m68k/t-m68kbare m68k/t-mlibs"
+       tm_defines="${tm_defines} MOTOROLA=1"
+       tm_file="${tm_file} m68k/m68k-none.h m68k/m68kemb.h dbxcoff.h m68k/coff.h dbx.h"
        ;;
-m68010-*-netbsdelf* | m68k*-*-netbsdelf*)
-       tm_file="${tm_file} dbxelf.h elfos.h netbsd.h netbsd-elf.h m68k/netbsd-elf.h"
-       tm_defines="${tm_defines} MOTOROLA USE_GAS"
+m68k-*-elf* | fido-*-elf*)
+       case ${target} in
+       fido-*-elf*)
+               # Check that $with_cpu makes sense.
+               case $with_cpu in
+               "" | "fidoa")
+                       ;;
+               *)
+                       echo "Cannot accept --with-cpu=$with_cpu"
+                       exit 1
+                       ;;
+               esac
+               with_cpu=fidoa
+               ;;
+       *)
+               default_m68k_cpu=68020
+               default_cf_cpu=5206
+               ;;
+       esac
+       tm_file="${tm_file} m68k/m68k-none.h m68k/m68kelf.h dbxelf.h elfos.h m68k/m68kemb.h m68k/m68020-elf.h"
+       tm_defines="${tm_defines} MOTOROLA=1"
+       tmake_file="m68k/t-floatlib m68k/t-m68kbare m68k/t-m68kelf"
+       # Add multilibs for targets other than fido.
        case ${target} in
-       m68010*)
-               target_cpu_default="MASK_68010"
+       fido-*-elf*)
                ;;
        *)
-               target_cpu_default="MASK_68020|MASK_68010|MASK_68881|MASK_BITFIELD"
+               tmake_file="$tmake_file m68k/t-mlibs"
                ;;
        esac
+       extra_parts="crtbegin.o crtend.o"
+       ;;
+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"
+       tm_defines="${tm_defines} MOTOROLA=1"
        ;;
 m68k*-*-openbsd*)
+       default_m68k_cpu=68020
+       default_cf_cpu=5475
        # needed to unconfuse gdb
-       tm_defines="${tm_defines} OBSD_OLD_GAS TARGET_DEFAULT=(MASK_68020|MASK_68010|MASK_68881|MASK_BITFIELD)"
-       tm_file="m68k/m68k.h openbsd.h m68k/openbsd.h"
+       tm_defines="${tm_defines} OBSD_OLD_GAS"
+       tm_file="${tm_file} openbsd.h m68k/openbsd.h"
        tmake_file="t-libc-ok t-openbsd m68k/t-openbsd"
        # we need collect2 until our bug is fixed...
        use_collect2=yes
        ;;
-m68k-*-uclinux*)               # Motorola m68k/ColdFire running uClinux with uClibc
-       tm_file="m68k/m68k.h m68k/m68k-none.h m68k/m68kelf.h dbxelf.h elfos.h m68k/uclinux.h"
-       tm_defines="${tm_defines} MOTOROLA USE_GAS"
-       tmake_file=m68k/t-uclinux
-       use_fixproto=no
+m68k-*-uclinuxoldabi*)         # Motorola m68k/ColdFire running uClinux
+                               # with uClibc, using the original
+                               # m68k-elf-based ABI
+       default_m68k_cpu=68020
+       default_cf_cpu=5206
+       tm_file="${tm_file} m68k/m68k-none.h m68k/m68kelf.h dbxelf.h elfos.h m68k/uclinux-oldabi.h"
+       tm_defines="${tm_defines} MOTOROLA=1"
+       tmake_file="m68k/t-floatlib m68k/t-uclinux"
+       ;;
+m68k-*-uclinux*)               # Motorola m68k/ColdFire running uClinux
+                               # with uClibc, using the new GNU/Linux-style
+                               # ABI.
+       default_m68k_cpu=68020
+       default_cf_cpu=5206
+       tm_file="${tm_file} dbxelf.h elfos.h svr4.h linux.h flat.h m68k/linux.h m68k/uclinux.h ./sysroot-suffix.h"
+       tm_defines="${tm_defines} MOTOROLA=1 UCLIBC_DEFAULT=1"
+       extra_options="${extra_options} linux.opt"
+       tmake_file="m68k/t-floatlib m68k/t-uclinux m68k/t-mlibs"
        ;;
 m68k-*-linux*)         # Motorola m68k's running GNU/Linux
                                # with ELF format using glibc 2
                                # aka the GNU/Linux C library 6.
-       tm_file="m68k/m68k.h dbxelf.h elfos.h svr4.h linux.h m68k/linux.h"
+       default_m68k_cpu=68020
+       default_cf_cpu=5475
+       tm_file="${tm_file} dbxelf.h elfos.h svr4.h linux.h m68k/linux.h"
        extra_options="${extra_options} m68k/ieee.opt"
-       tm_defines="${tm_defines} MOTOROLA USE_GAS"
+       tm_defines="${tm_defines} MOTOROLA=1"
        # if not configured with --enable-sjlj-exceptions, bump the
        # libgcc version number
        if test x$sjlj != x1; then
@@ -1532,20 +1469,22 @@ m68k-*-linux*)          # Motorola m68k's running GNU/Linux
        fi
        ;;
 m68k-*-rtems*)
-       tmake_file="m68k/t-m68kbare m68k/t-crtstuff t-rtems m68k/t-rtems"
-       tm_file="m68k/m68k.h m68k/m68k-none.h m68k/m68kelf.h dbxelf.h elfos.h m68k/m68kemb.h m68k/m68020-elf.h m68k/rtemself.h rtems.h"
-       tm_defines="${tm_defines} MOTOROLA USE_GAS"
+       default_m68k_cpu=68020
+       default_cf_cpu=5206
+       tmake_file="m68k/t-floatlib m68k/t-m68kbare m68k/t-crtstuff t-rtems m68k/t-rtems m68k/t-mlibs"
+       tm_file="${tm_file} m68k/m68k-none.h m68k/m68kelf.h dbxelf.h elfos.h m68k/m68kemb.h m68k/m68020-elf.h m68k/rtemself.h rtems.h"
+       tm_defines="${tm_defines} MOTOROLA=1"
        extra_parts="crtbegin.o crtend.o"
        ;;
 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"
@@ -1570,9 +1509,9 @@ mips-sgi-irix[56]*)
        then
                tm_defines="${tm_defines} IRIX_USING_GNU_LD"
        fi
-#      if test x$enable_threads = xyes; then
-#              thread_file='irix'
-#      fi
+       case ${enable_threads}:${have_pthread_h} in
+         "":yes | yes:yes ) thread_file=posix ;;
+       esac
        use_fixproto=yes
        ;;
 mips*-*-netbsd*)                       # NetBSD/mips, either endian.
@@ -1583,17 +1522,26 @@ mips64*-*-linux*)
        tm_file="dbxelf.h elfos.h svr4.h linux.h ${tm_file} mips/linux.h mips/linux64.h"
        tmake_file="${tmake_file} mips/t-linux64"
        tm_defines="${tm_defines} MIPS_ABI_DEFAULT=ABI_N32"
+       case ${target} in
+               mips64el-st-linux-gnu)
+                       tm_file="${tm_file} mips/st.h"
+                       tmake_file="${tmake_file} mips/t-st"
+                       ;;
+       esac
        gnu_ld=yes
        gas=yes
+       test x$with_llsc != x || with_llsc=yes
        ;;
 mips*-*-linux*)                                # Linux MIPS, either endian.
         tm_file="dbxelf.h elfos.h svr4.h linux.h ${tm_file} mips/linux.h"
        case ${target} in
-        mipsisa32*-*)
-                target_cpu_default="MASK_SOFT_FLOAT"
-               tm_defines="${tm_defines} MIPS_ISA_DEFAULT=32"
+        mipsisa32r2*)
+               tm_defines="${tm_defines} MIPS_ISA_DEFAULT=33"
                 ;;
+        mipsisa32*)
+               tm_defines="${tm_defines} MIPS_ISA_DEFAULT=32"
         esac
+       test x$with_llsc != x || with_llsc=yes
        ;;
 mips*-*-openbsd*)
        tm_defines="${tm_defines} OBSD_HAS_DECLARE_FUNCTION_NAME OBSD_HAS_DECLARE_OBJECT OBSD_HAS_CORRECT_SPECS"
@@ -1605,83 +1553,110 @@ mips*-*-openbsd*)
        *)  tm_defines="${tm_defines} TARGET_ENDIAN_DEFAULT=MASK_BIG_ENDIAN";;
         esac
        ;;
-mipsisa32-*-elf* | mipsisa32el-*-elf*)
-       tm_file="elfos.h ${tm_file} mips/elf.h"
-       tmake_file=mips/t-isa3264
-       tm_defines="${tm_defines} MIPS_ISA_DEFAULT=32 MIPS_ABI_DEFAULT=ABI_EABI"
-       use_fixproto=yes
-       ;;
-mipsisa32r2-*-elf* | mipsisa32r2el-*-elf*)
-       tm_file="elfos.h ${tm_file} mips/elf.h"
-       tmake_file=mips/t-isa3264
-       tm_defines="${tm_defines} MIPS_ISA_DEFAULT=33 MIPS_ABI_DEFAULT=ABI_EABI"
-       use_fixproto=yes
+mips*-sde-elf*)
+       tm_file="elfos.h ${tm_file} mips/elf.h mips/sde.h"
+       tmake_file="mips/t-sde mips/t-libgcc-mips16"
+       case "${with_newlib}" in
+         yes)
+           # newlib / libgloss.
+           ;;
+         *)
+           # MIPS toolkit libraries.
+           tm_file="$tm_file mips/sdemtk.h"
+           tmake_file="$tmake_file mips/t-sdemtk"
+           extra_options="$extra_options mips/sdemtk.opt"
+           case ${enable_threads} in
+             "" | yes | mipssde)
+               thread_file='mipssde'
+               ;;
+           esac
+           ;;
+       esac
+       case ${target} in
+         mipsisa32r2*)
+           tm_defines="MIPS_ISA_DEFAULT=33 MIPS_ABI_DEFAULT=ABI_32"
+           ;;
+         mipsisa32*)
+           tm_defines="MIPS_ISA_DEFAULT=32 MIPS_ABI_DEFAULT=ABI_32"
+           ;;
+         mipsisa64*)
+           tm_defines="MIPS_ISA_DEFAULT=64 MIPS_ABI_DEFAULT=ABI_N32"
+           ;;
+       esac
        ;;
+mipsisa32-*-elf* | mipsisa32el-*-elf* | \
+mipsisa32r2-*-elf* | mipsisa32r2el-*-elf* | \
 mipsisa64-*-elf* | mipsisa64el-*-elf*)
        tm_file="elfos.h ${tm_file} mips/elf.h"
-       tmake_file=mips/t-isa3264
-       target_cpu_default="MASK_64BIT|MASK_FLOAT64"
-       tm_defines="${tm_defines} MIPS_ISA_DEFAULT=64 MIPS_ABI_DEFAULT=ABI_EABI"
-       use_fixproto=yes
+       tmake_file="mips/t-isa3264 mips/t-libgcc-mips16"
+       case ${target} in
+         mipsisa32r2*)
+           tm_defines="${tm_defines} MIPS_ISA_DEFAULT=33"
+           ;;
+         mipsisa32*)
+           tm_defines="${tm_defines} MIPS_ISA_DEFAULT=32"
+           ;;
+         mipsisa64*)
+           tm_defines="${tm_defines} MIPS_ISA_DEFAULT=64"
+           ;;
+       esac
+       case ${target} in
+         mipsisa32*-*-elfoabi*)
+           tm_defines="${tm_defines} MIPS_ABI_DEFAULT=ABI_32"
+           tm_file="${tm_file} mips/elfoabi.h"
+           ;;
+         mipsisa64*-*-elfoabi*)
+           tm_defines="${tm_defines} MIPS_ABI_DEFAULT=ABI_O64"
+           tm_file="${tm_file} mips/elfoabi.h"
+           ;;
+         *-*-elf*)
+           tm_defines="${tm_defines} MIPS_ABI_DEFAULT=ABI_EABI"
+           ;;
+       esac
        ;;
 mipsisa64sr71k-*-elf*)
         tm_file="elfos.h ${tm_file} mips/elf.h"
         tmake_file=mips/t-sr71k
        target_cpu_default="MASK_64BIT|MASK_FLOAT64"
        tm_defines="${tm_defines} MIPS_ISA_DEFAULT=64 MIPS_CPU_STRING_DEFAULT=\\\"sr71000\\\" MIPS_ABI_DEFAULT=ABI_EABI"
-       use_fixproto=yes
         ;;
 mipsisa64sb1-*-elf* | mipsisa64sb1el-*-elf*)
        tm_file="elfos.h ${tm_file} mips/elf.h"
-       tmake_file="mips/t-elf mips/t-sb1"
+       tmake_file="mips/t-elf mips/t-libgcc-mips16 mips/t-sb1"
        target_cpu_default="MASK_64BIT|MASK_FLOAT64"
        tm_defines="${tm_defines} MIPS_ISA_DEFAULT=64 MIPS_CPU_STRING_DEFAULT=\\\"sb1\\\" MIPS_ABI_DEFAULT=ABI_O64"
-       use_fixproto=yes
        ;;
 mips-*-elf* | mipsel-*-elf*)
        tm_file="elfos.h ${tm_file} mips/elf.h"
-       tmake_file=mips/t-elf
-       use_fixproto=yes
+       tmake_file="mips/t-elf mips/t-libgcc-mips16"
        ;;
 mips64-*-elf* | mips64el-*-elf*)
        tm_file="elfos.h ${tm_file} mips/elf.h"
-       tmake_file=mips/t-elf
+       tmake_file="mips/t-elf mips/t-libgcc-mips16"
        target_cpu_default="MASK_64BIT|MASK_FLOAT64"
        tm_defines="${tm_defines} MIPS_ISA_DEFAULT=3 MIPS_ABI_DEFAULT=ABI_O64"
-       use_fixproto=yes
        ;;
 mips64vr-*-elf* | mips64vrel-*-elf*)
         tm_file="mips/vr.h elfos.h ${tm_file} mips/elf.h"
         tmake_file=mips/t-vr
-       use_fixproto=yes
         ;;
 mips64orion-*-elf* | mips64orionel-*-elf*)
        tm_file="elfos.h ${tm_file} mips/elforion.h mips/elf.h"
-       tmake_file=mips/t-elf
+       tmake_file="mips/t-elf mips/t-libgcc-mips16"
        target_cpu_default="MASK_64BIT|MASK_FLOAT64"
        tm_defines="${tm_defines} MIPS_ISA_DEFAULT=3 MIPS_ABI_DEFAULT=ABI_O64"
-       use_fixproto=yes
        ;;
 mips*-*-rtems*)
        tm_file="elfos.h ${tm_file} mips/elf.h mips/rtems.h rtems.h"
-       tmake_file="mips/t-elf t-rtems mips/t-rtems"
+       tmake_file="mips/t-elf mips/t-libgcc-mips16 t-rtems mips/t-rtems"
        ;;
 mips-wrs-vxworks)
-       # We want vxworks.h after mips/elf.h, which unfortunately means we
-       # have to redo the tm_file list from scratch.
-       tm_file="elfos.h mips/mips.h svr4.h mips/elf.h vxworks.h mips/vxworks.h"
+       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"
-       thread_file=
-       ;;
 mipstx39-*-elf* | mipstx39el-*-elf*)
        tm_file="elfos.h ${tm_file} mips/r3900.h mips/elf.h"
-       tmake_file=mips/t-r3900
-       use_fixproto=yes
+       tmake_file="mips/t-r3900 mips/t-libgcc-mips16"
        ;;
 mmix-knuth-mmixware)
        need_64bit_hwint=yes
@@ -1693,28 +1668,12 @@ mn10300-*-*)
                tm_file="${tm_file} dbx.h"
        fi
        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"
-        ;;
-ns32k-*-netbsdelf*)
-       echo "GCC does not yet support the ${target} target"; exit 1
-       ;;
-ns32k-*-netbsd*)
-       tm_file="${tm_file} netbsd.h netbsd-aout.h ns32k/netbsd.h"
-       # On NetBSD, the headers are already okay, except for math.h.
-       tmake_file="t-netbsd ns32k/t-ns32k"
-       extra_parts=""
-       use_collect2=yes
        ;;
 pdp11-*-bsd)
        tm_file="${tm_file} pdp11/2bsd.h"
        use_fixproto=yes
         ;;
 pdp11-*-*)
-       use_fixproto=yes
        ;;
 # port not yet contributed
 #powerpc-*-openbsd*)
@@ -1737,12 +1696,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"
@@ -1775,17 +1728,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"
@@ -1805,7 +1747,6 @@ powerpc-*-elf*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h"
        extra_options="${extra_options} rs6000/sysv4.opt"
        tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
-       use_fixproto=yes
        ;;
 powerpc-*-eabialtivec*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h rs6000/eabialtivec.h"
@@ -1830,8 +1771,13 @@ 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"
+        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"
+        ;;
 powerpc-*-linux*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h"
        extra_options="${extra_options} rs6000/sysv4.opt"
@@ -1870,9 +1816,7 @@ powerpc-*-gnu*)
        fi
        ;;
 powerpc-wrs-vxworks|powerpc-wrs-vxworksae)
-       # We want vxworks.h after rs6000/sysv4.h, which unfortunately
-       # means we have to redo the tm_file list from scratch.
-       tm_file="rs6000/rs6000.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h"
+       tm_file="${tm_file} elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h"
        tmake_file="${tmake_file} rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppccomm rs6000/t-vxworks"
        extra_options="${extra_options} rs6000/sysv4.opt"
        extra_headers=ppc-asm.h
@@ -1886,13 +1830,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"
@@ -1904,17 +1841,10 @@ 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"
        extra_options="${extra_options} rs6000/sysv4.opt"
-       use_fixproto=yes
        ;;
 powerpcle-*-eabisim*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/sysv4le.h rs6000/eabi.h rs6000/e500.h rs6000/eabisim.h"
@@ -1926,16 +1856,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"
@@ -1960,7 +1880,7 @@ rs6000-ibm-aix5.1.* | powerpc-ibm-aix5.1.*)
        thread_file='aix'
        extra_headers=
        ;;
-rs6000-ibm-aix[56789].* | powerpc-ibm-aix[56789].*)
+rs6000-ibm-aix5.2.* | powerpc-ibm-aix5.2.*)
        tm_file="${tm_file} rs6000/aix.h rs6000/aix52.h rs6000/xcoff.h"
        tmake_file=rs6000/t-aix52
        extra_options="${extra_options} rs6000/aix64.opt"
@@ -1968,6 +1888,22 @@ rs6000-ibm-aix[56789].* | powerpc-ibm-aix[56789].*)
        thread_file='aix'
        extra_headers=
        ;;
+rs6000-ibm-aix5.3.* | powerpc-ibm-aix5.3.*)
+       tm_file="${tm_file} rs6000/aix.h rs6000/aix53.h rs6000/xcoff.h"
+       tmake_file=rs6000/t-aix52
+       extra_options="${extra_options} rs6000/aix64.opt"
+       use_collect2=yes
+       thread_file='aix'
+       extra_headers=altivec.h
+       ;;
+rs6000-ibm-aix[6789].* | powerpc-ibm-aix[6789].*)
+       tm_file="${tm_file} rs6000/aix.h rs6000/aix61.h rs6000/xcoff.h"
+       tmake_file=rs6000/t-aix52
+       extra_options="${extra_options} rs6000/aix64.opt"
+       use_collect2=yes
+       thread_file='aix'
+       extra_headers=altivec.h
+       ;;
 s390-*-linux*)
        tm_file="s390/s390.h dbxelf.h elfos.h svr4.h linux.h s390/linux.h"
        tmake_file="${tmake_file} t-dfprules s390/t-crtstuff s390/t-linux"
@@ -1994,11 +1930,11 @@ s390x-ibm-tpf*)
 score-*-elf)
         tm_file="dbxelf.h elfos.h score/elf.h score/score.h"
         tmake_file=score/t-score-elf
-        extra_objs="score-mdaux.o"
+        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"
@@ -2030,8 +1966,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
@@ -2118,7 +2052,7 @@ sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
          sh5-32media-nofpu | sh5-32media | sh5-compact-nofpu | sh5-compact | \
          sh2a-single-only | sh2a-single | sh2a-nofpu | sh2a | \
          sh4a-single-only | sh4a-single | sh4a-nofpu | sh4a | sh4al | \
-         sh4-single-only | sh4-single | sh4-nofpu | sh4 | \
+         sh4-single-only | sh4-single | sh4-nofpu | sh4 | sh4-300 | \
          sh3e | sh3 | sh2e | sh2 | sh1) ;;
        "")     sh_cpu_default=${sh_cpu_target} ;;
        *)      echo "with_cpu=$with_cpu not supported"; exit 1 ;;
@@ -2144,7 +2078,7 @@ sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
        for sh_multilib in ${sh_multilibs}; do
                case ${sh_multilib} in
                sh1 | sh2 | sh2e | sh3 | sh3e | \
-               sh4 | sh4-single | sh4-single-only | sh4-nofpu | \
+               sh4 | sh4-single | sh4-single-only | sh4-nofpu | sh4-300 |\
                sh4a | sh4a-single | sh4a-single-only | sh4a-nofpu | sh4al | \
                sh2a | sh2a-single | sh2a-single-only | sh2a-nofpu | \
                sh5-64media | sh5-64media-nofpu | \
@@ -2162,11 +2096,6 @@ sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
        if test x${enable_incomplete_targets} = xyes ; then
                tm_defines="$tm_defines SUPPORT_SH1=1 SUPPORT_SH2E=1 SUPPORT_SH4=1 SUPPORT_SH4_SINGLE=1 SUPPORT_SH2A=1 SUPPORT_SH2A_SINGLE=1 SUPPORT_SH5_32MEDIA=1 SUPPORT_SH5_32MEDIA_NOFPU=1 SUPPORT_SH5_64MEDIA=1 SUPPORT_SH5_64MEDIA_NOFPU=1"
        fi
-       use_fixproto=yes
-       ;;
-sh-*-rtemscoff*)
-       tmake_file="sh/t-sh t-rtems sh/t-rtems"
-       tm_file="${tm_file} dbxcoff.h sh/coff.h sh/rtems.h rtems.h"
        ;;
 sh-*-rtems*)
        tmake_file="sh/t-sh sh/t-elf t-rtems sh/t-rtems"
@@ -2174,11 +2103,10 @@ sh-*-rtems*)
        ;;
 sh-wrs-vxworks)
        tmake_file="$tmake_file sh/t-sh sh/t-elf sh/t-vxworks"
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sh/embed-elf.h sh/vxworks.h"
+       tm_file="${tm_file} elfos.h svr4.h sh/elf.h sh/embed-elf.h vx-common.h vxworks.h sh/vxworks.h"
        ;;
 sh-*-*)
        tm_file="${tm_file} dbxcoff.h sh/coff.h"
-       use_fixproto=yes
        ;;
 sparc-*-netbsdelf*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h netbsd.h netbsd-elf.h sparc/netbsd-elf.h"
@@ -2194,12 +2122,18 @@ sparc-*-elf*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/sp-elf.h"
        tmake_file="sparc/t-elf sparc/t-crtfm"
        extra_parts="crti.o crtn.o crtbegin.o crtend.o"
-       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"
@@ -2236,14 +2170,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"
                ;;
@@ -2261,26 +2191,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"
@@ -2288,32 +2208,22 @@ 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"
        ;;
 sparc64-*-elf*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/sp64-elf.h"
        extra_options="${extra_options} sparc/little-endian.opt"
        tmake_file="${tmake_file} sparc/t-crtfm"
        extra_parts="crtbegin.o crtend.o"
-       use_fixproto=yes
        ;;
 sparc64-*-freebsd*|ultrasparc-*-freebsd*)
        tm_file="${tm_file} ${fbsd_tm_file} dbxelf.h elfos.h sparc/sysv4.h sparc/freebsd.h"
@@ -2324,10 +2234,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"
        ;;
@@ -2345,31 +2254,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"
@@ -2385,7 +2269,6 @@ v850e1-*-*)
        use_collect2=no
        c_target_objs="v850-c.o"
        cxx_target_objs="v850-c.o"
-       use_fixproto=yes
        ;;
 v850e-*-*)
        target_cpu_default="TARGET_CPU_v850e"
@@ -2402,7 +2285,6 @@ v850e-*-*)
        use_collect2=no
        c_target_objs="v850-c.o"
        cxx_target_objs="v850-c.o"
-       use_fixproto=yes
        ;;
 v850-*-*)
        target_cpu_default="TARGET_CPU_generic"
@@ -2415,18 +2297,6 @@ v850-*-*)
        use_collect2=no
        c_target_objs="v850-c.o"
        cxx_target_objs="v850-c.o"
-       use_fixproto=yes
-       ;;
-vax-*-bsd*)                    # VAXen running BSD
-       tm_file="${tm_file} vax/bsd.h"
-       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"
@@ -2441,27 +2311,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"
@@ -2471,7 +2320,6 @@ xstormy16-*-elf)
        extra_options=stormy16/stormy16.opt
        tmake_file="stormy16/t-stormy16"
        extra_parts="crtbegin.o crtend.o"
-       use_fixproto=yes
        ;;
 xtensa-*-elf*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h xtensa/elf.h"
@@ -2492,7 +2340,6 @@ m32c-*-elf*)
        tm_file="dbxelf.h elfos.h svr4.h ${tm_file}"
        c_target_objs="m32c-pragma.o"
        cxx_target_objs="m32c-pragma.o"
-       use_fixproto=yes
        ;;
 *)
        echo "*** Configuration ${target} not supported" 1>&2
@@ -2501,9 +2348,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"
        ;;
@@ -2525,10 +2369,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
       ;;
@@ -2556,6 +2396,9 @@ if test x$with_cpu = x ; then
       ;;
     i686-*-* | i786-*-*)
       case ${target_noncanonical} in
+        amdfam10-*|barcelona-*)
+          with_cpu=amdfam10
+          ;;
         k8-*|opteron-*|athlon_64-*)
           with_cpu=k8
           ;;
@@ -2565,6 +2408,9 @@ if test x$with_cpu = x ; then
         athlon_tbird-*|athlon-*)
           with_cpu=athlon
           ;;
+       geode-*)
+         with_cpu=geode
+         ;;
         pentium2-*)
           with_cpu=pentium2
           ;;
@@ -2580,6 +2426,9 @@ if test x$with_cpu = x ; then
         nocona-*)
           with_cpu=nocona
           ;;
+       core2-*)
+         with_cpu=core2
+         ;;
         pentium_m-*)
           with_cpu=pentium-m
           ;;
@@ -2593,12 +2442,18 @@ if test x$with_cpu = x ; then
       ;;
     x86_64-*-*)
       case ${target_noncanonical} in
+        amdfam10-*|barcelona-*)
+          with_cpu=amdfam10
+          ;;
         k8-*|opteron-*|athlon_64-*)
           with_cpu=k8
           ;;
         nocona-*)
           with_cpu=nocona
           ;;
+       core2-*)
+         with_cpu=core2
+         ;;
         *)
           with_cpu=generic
           ;;
@@ -2625,25 +2480,46 @@ if test x$with_cpu = x ; then
     frv550-*-*linux*)
       with_cpu=fr550
       ;;
+    m68k*-*-*)
+      case "$with_arch" in
+       "cf")
+         with_cpu=${default_cf_cpu}
+         ;;
+       "" | "m68k")
+         with_cpu=m${default_m68k_cpu}
+         ;;
+      esac
+      ;;
+    mips*-*-vxworks)
+      with_arch=mips2
+      ;;
     sparc*-*-*)
       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
                ;;
@@ -2702,7 +2578,8 @@ case "${target}" in
                case "$with_arch" in
                "" \
                | armv[23456] | armv2a | armv3m | armv4t | armv5t \
-               | armv5te | armv6j |armv6k | armv6z | armv6zk \
+               | armv5te | armv6j |armv6k | armv6z | armv6zk | armv6-m \
+               | armv7 | armv7-a | armv7-r | armv7-m \
                | iwmmxt | ep9312)
                        # OK
                        ;;
@@ -2725,7 +2602,7 @@ case "${target}" in
 
                case "$with_fpu" in
                "" \
-               | fpa | fpe2 | fpe3 | maverick | vfp )
+               | fpa | fpe2 | fpe3 | maverick | vfp | vfp3 | neon )
                        # OK
                        ;;
                *)
@@ -2773,21 +2650,47 @@ case "${target}" in
                esac
                ;;
 
-       m68k*-linux*)
-               supported_defaults="cpu"
-               case "$with_cpu" in
-               "" | "m68020" | "m68030" | "m68040" | "m68060" | "m68020-40" | "m68020-60")
-                       # OK
+       fido-*-* | m68k*-*-*)
+               supported_defaults="arch cpu"
+               case "$with_arch" in
+               "" | "m68k"| "cf")
+                       m68k_arch_family="$with_arch"
                        ;;
                *)
-                       echo "Unknown CPU used in --with-cpu=$with_cpu, known values:"  1>&2
-                       echo "m68020 m68030 m68040 m68060 m68020-40 m68020-60" 1>&2
+                       echo "Invalid --with-arch=$with_arch" 1>&2
                        exit 1
                        ;;
                esac
+
+               # We always have a $with_cpu setting here.
+               case "$with_cpu" in
+               "m68000" | "m68010" | "m68020" | "m68030" | "m68040" | "m68060")
+                       m68k_cpu_ident=$with_cpu
+                       ;;
+               "m68020-40")
+                       m68k_cpu_ident=m68020
+                       tm_defines="$tm_defines M68K_DEFAULT_TUNE=u68020_40"
+                       ;;
+               "m68020-60")
+                       m68k_cpu_ident=m68020
+                       tm_defines="$tm_defines M68K_DEFAULT_TUNE=u68020_60"
+                       ;;
+               *)
+                       # We need the C identifier rather than the string.
+                       m68k_cpu_ident=`awk -v arg="\"$with_cpu\"" \
+                          'BEGIN { FS="[ \t]*[,()][ \t]*" }; \
+                           $1 == "M68K_DEVICE" && $2 == arg { print $3 }' \
+                                ${srcdir}/config/m68k/m68k-devices.def`
+                       if [ x"$m68k_cpu_ident" = x ] ; then
+                               echo "Unknown CPU used in --with-cpu=$with_cpu" 1>&2
+                               exit 1
+                       fi
+                       with_cpu="mcpu=$with_cpu"
+                       ;;
+               esac
                ;;
 
-       hppa*-*-* | parisc*-*-*)
+       hppa*-*-*)
                supported_defaults="arch schedule"
 
                case "$with_arch" in
@@ -2812,25 +2715,31 @@ 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 \
                        | i586 | pentium | pentium-mmx | winchip-c6 | winchip2 \
                        | c3 | c3-2 | i686 | pentiumpro | pentium2 | pentium3 \
                        | pentium4 | k6 | k6-2 | k6-3 | athlon | athlon-tbird \
-                       | athlon-4 | athlon-xp | athlon-mp \
+                       | athlon-4 | athlon-xp | athlon-mp | geode \
                        | 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
                                ;;
-                       "" | k8 | opteron | athlon64 | athlon-fx | nocona | generic)
+                       "" | amdfam10 | barcelona | k8 | opteron | athlon64 | athlon-fx | nocona | core2 | generic)
                                # OK
                                ;;
                        *)
@@ -2842,7 +2751,7 @@ case "${target}" in
                ;;
 
        mips*-*-*)
-               supported_defaults="abi arch float tune divide"
+               supported_defaults="abi arch float tune divide llsc"
 
                case ${with_float} in
                "" | soft | hard)
@@ -2871,23 +2780,21 @@ case "${target}" in
                *)
                        echo "Unknown division check type use in --with-divide=$with_divide" 1>&2
                        exit 1
+                       ;;
                esac
-               ;;
 
-       mt-*-*)
-               supported_defaults="arch"
-
-               case "$with_arch" in
-               "" \
-               | ms1-64-001 \
-               | ms1-16-002 \
-               | ms1-16-003 \
-               | ms2 \
-               | "")
+               case ${with_llsc} in
+               yes)
+                       with_llsc=llsc
+                       ;;
+               no)
+                       with_llsc="no-llsc"
+                       ;;
+               "")
                        # OK
                        ;;
                *)
-                       echo "Unknown arch used in --with-arch=$with_arch" 1>&2
+                       echo "Unknown llsc type used in --with-llsc" 1>&2
                        exit 1
                        ;;
                esac
@@ -2910,10 +2817,10 @@ 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 \
-                       | 604e | 620 | 630 | 740 | 750 | 7400 | 7450 \
-                       | 854[08] | 801 | 821 | 823 | 860 | 970 | G3 | G4 | G5)
+                       | 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
                                ;;
                        *)
@@ -2930,7 +2837,7 @@ case "${target}" in
                for which in arch tune; do
                        eval "val=\$with_$which"
                        case ${val} in
-                       "" | g5 | g6 | z900 | z990 | z9-109)
+                       "" | g5 | g6 | z900 | z990 | z9-109 | z9-ec | z10)
                                # OK
                                ;;
                        *)
@@ -2979,7 +2886,7 @@ case "${target}" in
                        "" | sparc | sparcv9 | sparc64 | sparc86x \
                        | v7 | cypress | v8 | supersparc | sparclite | f930 \
                        | f934 | hypersparc | sparclite86x | sparclet | tsc701 \
-                       | v9 | ultrasparc | ultrasparc3 | niagara)
+                       | v9 | ultrasparc | ultrasparc3 | niagara | niagara2)
                                # OK
                                ;;
                        *)
@@ -3000,6 +2907,23 @@ case "${target}" in
                esac
                ;;
 
+       spu-*-*)
+               supported_defaults="arch tune"
+
+               for which in arch tune; do
+                       eval "val=\$with_$which"
+                       case ${val} in
+                       "" | cell | celledp)
+                               # OK
+                               ;;
+                       *)
+                               echo "Unknown cpu used in --with-$which=$val." 1>&2
+                               exit 1
+                               ;;
+                       esac
+               done
+               ;;
+
        v850*-*-*)
                supported_defaults=cpu
                case ${with_cpu} in
@@ -3033,38 +2957,7 @@ case ${target} in
                fi
                ;;
 
-       m68k*-linux*)
-               case "x$with_cpu" in
-               x)
-                       # The most generic
-                       target_cpu_default2="(MASK_68020|MASK_68010|MASK_68881|MASK_BITFIELD)"
-                       ;;
-               xm68020)
-                       target_cpu_default2="(MASK_68020|MASK_68010|MASK_68881|MASK_BITFIELD)"
-                       ;;
-               xm68030)
-                       target_cpu_default2="(MASK_68030|MASK_68020|MASK_68010|MASK_68881|MASK_BITFIELD)"
-                       ;;
-               xm68040)
-                       target_cpu_default2="(MASK_68040|MASK_68040_ONLY|MASK_68020|MASK_68010|MASK_68881|MASK_BITFIELD)"
-                       ;;
-               xm68060)
-                       target_cpu_default2="(MASK_68060|MASK_68040_ONLY|MASK_68020|MASK_68010|MASK_68881|MASK_BITFIELD)"
-                       ;;
-               xm68020-40)
-                       target_cpu_default2="(MASK_BITFIELD|MASK_68881|MASK_68020|MASK_68010|MASK_68040)"
-                       ;;
-               xm68020-60)
-                       target_cpu_default2="(MASK_BITFIELD|MASK_68881|MASK_68020|MASK_68010|MASK_68040|MASK_68060)"
-                       ;;
-               *)
-                       echo "Unknown CPU used in --with-cpu=$with_cpu"  1>&2
-                       exit 1
-                       ;;
-               esac
-               ;;
-
-       hppa*-*-* | parisc*-*-*)
+       hppa*-*-*)
                target_cpu_default2="MASK_BIG_SWITCH"
                if test x$gas = xyes
                then
@@ -3072,6 +2965,13 @@ case ${target} in
                fi
                ;;
 
+       fido*-*-* | m68k*-*-*)
+               target_cpu_default2=$m68k_cpu_ident
+               if [ x"$m68k_arch_family" != x ]; then
+                       tmake_file="m68k/t-$m68k_arch_family $tmake_file"
+               fi
+               ;;
+
        mips*-*-*)
                if test x$gnu_ld = xyes
                then
@@ -3142,7 +3042,7 @@ case ${target} in
 esac
 
 t=
-all_defaults="abi cpu arch tune schedule float mode fpu divide"
+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"