OSDN Git Service

gcc/
[pf3gnuchains/gcc-fork.git] / gcc / config.gcc
index 735013e..ded0b1c 100644 (file)
@@ -204,16 +204,32 @@ xm_file=
 md_file=
 
 # Obsolete configurations.
-#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
+case ${target} in
+# Avoid generic cases below matching.
+   h8300-*-rtems* | h8300-*-elf* \
+ | sh-*-elf* | sh-*-symbianelf* | sh-*-linux* | sh-*-netbsdelf* \
+ | sh-*-rtems* | sh-wrs-vxworks) ;;
+   arm-*-coff*         \
+ | armel-*-coff*       \
+ | h8300-*-*           \
+ | i[34567]86-*-aout*  \
+ | i[34567]86-*-coff*  \
+ | m68k-*-aout*                \
+ | m68k-*-coff*                \
+ | sh-*-*              \
+ | mips-sgi-irix[56]*  \
+ | pdp11-*-bsd         \
+ | rs6000-ibm-aix4.[12]* \
+ | powerpc-ibm-aix4.[12]* \
+ )
+    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
@@ -278,17 +294,21 @@ fido-*-*)
         ;;
 i[34567]86-*-*)
        cpu_type=i386
+       c_target_objs="i386-c.o"
+       cxx_target_objs="i386-c.o"
        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"
+                      wmmintrin.h gmmintrin.h cross-stdarg.h"
        ;;
 x86_64-*-*)
        cpu_type=i386
+       c_target_objs="i386-c.o"
+       cxx_target_objs="i386-c.o"
        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"
+                      wmmintrin.h gmmintrin.h cross-stdarg.h"
        need_64bit_hwint=yes
        ;;
 ia64-*-*)
@@ -307,13 +327,17 @@ m68k-*-*)
 mips*-*-*)
        cpu_type=mips
        need_64bit_hwint=yes
+       extra_headers="loongson.h"
        ;;
+picochip-*-*)
+        cpu_type=picochip
+        ;;
 powerpc*-*-*)
        cpu_type=rs6000
        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|xcell)
+           xpowerpc64|xdefault64|x6[23]0|x970|xG5|xpower[34567]|xpower6x|xrs64a|xcell)
                cpu_is_64bit=yes
                ;;
        esac
@@ -384,7 +408,7 @@ case ${target} in
 *-*-darwin*)
   tm_file="${tm_file} darwin.h"
   case ${target} in
-  *-*-darwin9*)
+  *-*-darwin[912]*)
     tm_file="${tm_file} darwin9.h"
     ;;
   esac
@@ -393,8 +417,8 @@ case ${target} in
   tmake_file="t-darwin ${cpu_type}/t-darwin t-slibgcc-darwin"
   target_gtfiles="\$(srcdir)/config/darwin.c"
   extra_options="${extra_options} darwin.opt"
-  c_target_objs="darwin-c.o"
-  cxx_target_objs="darwin-c.o"
+  c_target_objs="${c_target_objs} darwin-c.o"
+  cxx_target_objs="${cxx_target_objs} darwin-c.o"
   fortran_target_objs="darwin-f.o"
   extra_objs="darwin.o"
   extra_gcc_objs="darwin-driver.o"
@@ -456,16 +480,28 @@ case ${target} in
   esac
   fbsd_tm_file="${fbsd_tm_file} freebsd-spec.h freebsd.h"
   ;;
-*-*-linux* | frv-*-*linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu)
-  # Must come before *-*-gnu* (because of *-*-linux-gnu* systems).
+*-*-linux* | frv-*-*linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu | *-*-gnu*)
   extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o"
-  extra_options="${extra_options} linux.opt"
   gas=yes
   gnu_ld=yes
   case ${enable_threads} in
     "" | yes | posix) thread_file='posix' ;;
   esac
   tmake_file="t-slibgcc-elf-ver t-linux"
+  case $target in
+    *-*-linux* | frv-*-*linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu)
+      :;;
+    *-*-gnu*)
+      tmake_file="$tmake_file t-gnu";;
+  esac
+  # glibc / uclibc switch.  uclibc isn't usable for GNU/Hurd and neither for
+  # GNU/k*BSD.
+  case $target in
+    *linux*)
+      extra_options="$extra_options linux.opt";;
+    *)
+      tm_defines="$tm_defines OPTION_GLIBC=1";;
+  esac
   case ${target} in
     *-*-*uclibc*)
       tm_defines="${tm_defines} UCLIBC_DEFAULT=1"
@@ -478,30 +514,6 @@ case ${target} in
   default_use_cxa_atexit=yes
   use_gcc_tgmath=no
   ;;
-*-*-gnu*)
-  # On the Hurd, the setup is just about the same on
-  # each different CPU.  The specific machines that we
-  # support are matched above and just set $cpu_type.
-  tm_file="${cpu_type}/gnu.h"
-  extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o"
-  # GNU tools are the only tools.
-  gas=yes
-  gnu_ld=yes
-  # These details are the same as for Linux.
-  # But here we need a little extra magic.
-  tmake_file="t-slibgcc-elf-ver t-linux t-gnu"
-  case ${target} in
-    alpha*)
-      tm_file="${cpu_type}/${cpu_type}.h alpha/elf.h alpha/linux.h alpha/linux-elf.h gnu.h ${tm_file}"
-      ;;
-    i[34567]86-*-*)
-      tm_file="${cpu_type}/${cpu_type}.h i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h linux.h i386/linux.h gnu.h ${tm_file}"
-      ;;
-  esac
-  # 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"
   gas=yes
@@ -594,6 +606,7 @@ alpha*-*-linux*)
        tmake_file="${tmake_file} alpha/t-crtfm alpha/t-alpha alpha/t-ieee alpha/t-linux"
        ;;
 alpha*-*-gnu*)
+       tm_file="$tm_file alpha/elf.h alpha/linux.h alpha/linux-elf.h gnu.h alpha/gnu.h"
        target_cpu_default="MASK_GAS"
        tmake_file="${tmake_file} alpha/t-crtfm alpha/t-alpha alpha/t-ieee"
        ;;
@@ -665,7 +678,6 @@ 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"
@@ -719,7 +731,7 @@ 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"
        tmake_file="arm/t-arm arm/t-arm-elf"
        case ${target} in
-       arm*-*-uclinux-*eabi)
+       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
@@ -747,7 +759,9 @@ arm*-*-eabi* | arm*-*-symbianelf* )
        tmake_file="arm/t-arm arm/t-arm-elf"
        case ${target} in
        arm*-*-eabi*)
+         tm_file="$tm_file arm/eabi.h"
          tmake_file="${tmake_file} arm/t-bpabi"
+         extra_options="${extra_options} arm/eabi.opt"
          ;;
        arm*-*-symbianelf*)
          tm_file="${tm_file} arm/symbian.h"
@@ -787,7 +801,6 @@ avr-*-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"
@@ -852,12 +865,10 @@ 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} \
@@ -871,11 +882,9 @@ 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*)
        target_cpu_default="MASK_PA_11|MASK_PA_20"
@@ -934,7 +943,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*)
@@ -1012,26 +1020,23 @@ i[34567]86-*-darwin*)
        # then this file using that to set --with-cpu=i386 which has no -m64
        # support.
        with_cpu=${with_cpu:-generic}
-       tmake_file="${tmake_file} i386/t-fprules-softfp64 soft-fp/t-softfp i386/t-crtpc i386/t-crtfm"
+       tmake_file="${tmake_file} i386/t-crtpc i386/t-crtfm"
        ;;
 x86_64-*-darwin*)
        with_cpu=${with_cpu:-generic}
-       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"
+       tmake_file="${tmake_file} t-darwin ${cpu_type}/t-darwin64 t-slibgcc-darwin 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
+       tmake_file="${tmake_file} i386/t-i386elf t-svr4"
        ;;
 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"
-       use_fixproto=yes
+       tmake_file="${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-*-freebsd*)
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${fbsd_tm_file} i386/freebsd.h"
@@ -1045,7 +1050,7 @@ i[34567]86-*-netbsdelf*)
        ;;
 i[34567]86-*-netbsd*)
        tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h netbsd.h netbsd-aout.h i386/netbsd.h"
-       tmake_file=t-netbsd
+       tmake_file="${tmake_file} t-netbsd"
        extra_parts=""
        use_collect2=yes
        ;;
@@ -1056,7 +1061,7 @@ x86_64-*-netbsd*)
 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"
        # needed to unconfuse gdb
-       tmake_file="t-libc-ok t-openbsd i386/t-openbsd"
+       tmake_file="${tmake_file} t-libc-ok t-openbsd i386/t-openbsd"
        # we need collect2 until our bug is fixed...
        use_collect2=yes
        ;;
@@ -1068,9 +1073,8 @@ 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)
+i[34567]86-*-linux* | i[34567]86-*-kfreebsd*-gnu | i[34567]86-*-knetbsd*-gnu | i[34567]86-*-gnu*)
                        # Intel 80386's running GNU/*
                        # with ELF format using glibc 2
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h linux.h"
@@ -1079,15 +1083,15 @@ 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 i386/t-fprules-softfp64 soft-fp/t-softfp"
+                       tmake_file="${tmake_file} i386/t-linux64"
                        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
@@ -1101,6 +1105,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" ;;
+       i[34567]86-*-gnu*) tm_file="$tm_file i386/linux.h gnu.h i386/gnu.h";;
        esac
        tmake_file="${tmake_file} i386/t-crtstuff i386/t-crtpc i386/t-crtfm t-dfprules"
        ;;
@@ -1111,14 +1116,12 @@ 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-crtstuff i386/t-crtpc i386/t-crtfm i386/t-fprules-softfp64 soft-fp/t-softfp t-dfprules"
-       ;;
-i[34567]86-*-gnu*)
+       tmake_file="${tmake_file} i386/t-linux64 i386/t-crtstuff i386/t-crtpc i386/t-crtfm t-dfprules"
        ;;
 i[34567]86-pc-msdosdjgpp*)
        xm_file=i386/xm-djgpp.h
        tm_file="dbxcoff.h ${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/djgpp.h"
-       tmake_file=i386/t-djgpp
+       tmake_file="${tmake_file} i386/t-djgpp"
        extra_options="${extra_options} i386/djgpp.opt"
        gnu_ld=yes
        gas=yes
@@ -1126,7 +1129,7 @@ i[34567]86-pc-msdosdjgpp*)
 i[34567]86-*-lynxos*)
        xm_defines=POSIX
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h i386/lynx.h lynx.h"
-       tmake_file="i386/t-crtstuff t-lynx"
+       tmake_file="${tmake_file} i386/t-crtstuff t-lynx"
        extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
        extra_options="${extra_options} lynx.opt"
        thread_file=lynx
@@ -1135,7 +1138,7 @@ i[34567]86-*-lynxos*)
        ;;
 i[3456x]86-*-netware*)
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h tm-dwarf2.h i386/netware.h"
-       tmake_file=i386/t-netware
+       tmake_file="${tmake_file} i386/t-netware"
        extra_objs=netware.o
        case /${with_ld} in
        */nwld)
@@ -1154,14 +1157,14 @@ i[3456x]86-*-netware*)
        ;;
 i[34567]86-*-nto-qnx*)
        tm_file="${tm_file} i386/att.h dbxelf.h tm-dwarf2.h elfos.h svr4.h i386/unix.h i386/nto.h"
-       tmake_file=i386/t-nto
+       tmake_file="${tmake_file} i386/t-nto"
        gnu_ld=yes
        gas=yes
        ;;
 i[34567]86-*-rtems*)
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h i386/i386elf.h i386/rtemself.h rtems.h"
        extra_parts="crtbegin.o crtend.o crti.o crtn.o"
-       tmake_file="i386/t-rtems-i386 i386/t-crtstuff t-rtems"
+       tmake_file="${tmake_file} i386/t-rtems-i386 i386/t-crtstuff t-rtems"
        ;;
 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"
@@ -1171,9 +1174,9 @@ i[34567]86-*-solaris2*)
                ;;
        esac
        tm_file="${tm_file} i386/sol2.h"
-       tmake_file="t-sol2 i386/t-sol2 t-svr4"
-       c_target_objs="sol2-c.o"
-       cxx_target_objs="sol2-c.o"
+       tmake_file="${tmake_file} t-sol2 i386/t-sol2 t-svr4"
+       c_target_objs="${c_target_objs} sol2-c.o"
+       cxx_target_objs="${cxx_target_objs} sol2-c.o"
        extra_objs="sol2.o"
        tm_p_file="${tm_p_file} sol2-protos.h"
        if test x$gnu_ld = xyes; then
@@ -1192,13 +1195,13 @@ i[34567]86-*-solaris2*)
                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
@@ -1239,12 +1242,12 @@ i[4567]86-wrs-vxworks|i[4567]86-wrs-vxworksae)
 i[34567]86-*-pe | i[34567]86-*-cygwin*)
        tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h dbxcoff.h i386/cygming.h i386/cygwin.h"
        xm_file=i386/xm-cygwin.h
-       tmake_file="i386/t-cygwin i386/t-cygming"
+       tmake_file="${tmake_file} i386/t-cygwin i386/t-cygming"
        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 msformat-c.o"
-       cxx_target_objs="cygwin2.o winnt-cxx.o msformat-c.o"
+       c_target_objs="${c_target_objs} cygwin2.o msformat-c.o"
+       cxx_target_objs="${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'
@@ -1253,12 +1256,12 @@ i[34567]86-*-pe | i[34567]86-*-cygwin*)
 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"
+       tmake_file="${tmake_file} i386/t-cygming i386/t-mingw32"
        target_gtfiles="\$(srcdir)/config/i386/winnt.c"
-       extra_options="${extra_options} i386/cygming.opt"
+       extra_options="${extra_options} i386/cygming.opt i386/mingw.opt"
        extra_objs="winnt.o winnt-stubs.o"
-       c_target_objs="msformat-c.o"
-       cxx_target_objs="winnt-cxx.o msformat-c.o"
+       c_target_objs="${c_target_objs} msformat-c.o"
+       cxx_target_objs="${cxx_target_objs} winnt-cxx.o msformat-c.o"
        default_use_cxa_atexit=yes
        case ${enable_threads} in
          "" | yes | win32)
@@ -1283,7 +1286,7 @@ i[34567]86-*-mingw* | x86_64-*-mingw*)
        ;;
 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"
-       tmake_file="i386/t-interix"
+       tmake_file="${tmake_file} i386/t-interix"
        extra_objs=winnt.o
        target_gtfiles="\$(srcdir)/config/i386/winnt.c"
        if test x$enable_threads = xyes ; then
@@ -1306,7 +1309,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"
@@ -1336,33 +1338,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
@@ -1372,7 +1367,6 @@ 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
@@ -1384,7 +1378,6 @@ m68hc11-*-*|m6811-*-*)
        md_file="m68hc11/m68hc11.md"
        out_file="m68hc11/m68hc11.c"
        tmake_file="m68hc11/t-m68hc11"
-       use_fixproto=yes
         ;;
 m68hc12-*-*|m6812-*-*)
        tm_file="m68hc11/m68hc12.h dbxelf.h elfos.h usegas.h m68hc11/m68hc11.h"
@@ -1393,7 +1386,6 @@ m68hc12-*-*|m6812-*-*)
        out_file="m68hc11/m68hc11.c"
        tmake_file="m68hc11/t-m68hc11"
        extra_options="${extra_options} m68hc11/m68hc11.opt"
-       use_fixproto=yes
         ;;
 m68k-*-aout*)
        default_m68k_cpu=68020
@@ -1407,7 +1399,6 @@ m68k-*-coff*)
        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"
-       use_fixproto=yes
        ;;
 m68k-*-elf* | fido-*-elf*)
        case ${target} in
@@ -1465,7 +1456,6 @@ m68k-*-uclinuxoldabi*)            # Motorola m68k/ColdFire running uClinux
        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"
-       use_fixproto=no
        ;;
 m68k-*-uclinux*)               # Motorola m68k/ColdFire running uClinux
                                # with uClibc, using the new GNU/Linux-style
@@ -1476,16 +1466,17 @@ m68k-*-uclinux*)                # Motorola m68k/ColdFire running uClinux
        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"
-       use_fixproto=no
        ;;
 m68k-*-linux*)         # Motorola m68k's running GNU/Linux
                                # with ELF format using glibc 2
                                # aka the GNU/Linux C library 6.
        default_m68k_cpu=68020
        default_cf_cpu=5475
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h linux.h m68k/linux.h"
+       with_arch=${with_arch:-m68k}
+       tm_file="${tm_file} dbxelf.h elfos.h svr4.h linux.h m68k/linux.h ./sysroot-suffix.h"
        extra_options="${extra_options} m68k/ieee.opt"
        tm_defines="${tm_defines} MOTOROLA=1"
+       tmake_file="${tmake_file} m68k/t-floatlib m68k/t-linux m68k/t-mlibs"
        # if not configured with --enable-sjlj-exceptions, bump the
        # libgcc version number
        if test x$sjlj != x1; then
@@ -1503,13 +1494,11 @@ m68k-*-rtems*)
 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]*)
@@ -1544,16 +1533,30 @@ mips*-*-netbsd*)                        # NetBSD/mips, either endian.
        target_cpu_default="MASK_ABICALLS"
        tm_file="elfos.h ${tm_file} mips/elf.h netbsd.h netbsd-elf.h mips/netbsd.h"
        ;;
-mips64*-*-linux*)
+mips64*-*-linux* | mipsisa64*-*-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"
+       tmake_file="${tmake_file} mips/t-linux64 mips/t-libgcc-mips16"
        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"
+                       ;;
+               mips64octeon*-*-linux*)
+                       tm_defines="${tm_defines} MIPS_CPU_STRING_DEFAULT=\\\"octeon\\\""
+                       target_cpu_default=MASK_SOFT_FLOAT_ABI
+                       ;;
+               mipsisa64r2*-*-linux*)
+                       tm_defines="${tm_defines} MIPS_ISA_DEFAULT=65"
+                       ;;
+       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"
+       tmake_file="${tmake_file} mips/t-libgcc-mips16"
        case ${target} in
         mipsisa32r2*)
                tm_defines="${tm_defines} MIPS_ISA_DEFAULT=33"
@@ -1599,6 +1602,9 @@ mips*-sde-elf*)
          mipsisa32*)
            tm_defines="MIPS_ISA_DEFAULT=32 MIPS_ABI_DEFAULT=ABI_32"
            ;;
+         mipsisa64r2*)
+           tm_defines="MIPS_ISA_DEFAULT=65 MIPS_ABI_DEFAULT=ABI_N32"
+           ;;
          mipsisa64*)
            tm_defines="MIPS_ISA_DEFAULT=64 MIPS_ABI_DEFAULT=ABI_N32"
            ;;
@@ -1606,7 +1612,8 @@ mips*-sde-elf*)
        ;;
 mipsisa32-*-elf* | mipsisa32el-*-elf* | \
 mipsisa32r2-*-elf* | mipsisa32r2el-*-elf* | \
-mipsisa64-*-elf* | mipsisa64el-*-elf*)
+mipsisa64-*-elf* | mipsisa64el-*-elf* | \
+mipsisa64r2-*-elf* | mipsisa64r2el-*-elf*)
        tm_file="elfos.h ${tm_file} mips/elf.h"
        tmake_file="mips/t-isa3264 mips/t-libgcc-mips16"
        case ${target} in
@@ -1616,6 +1623,9 @@ mipsisa64-*-elf* | mipsisa64el-*-elf*)
          mipsisa32*)
            tm_defines="${tm_defines} MIPS_ISA_DEFAULT=32"
            ;;
+         mipsisa64r2*)
+           tm_defines="${tm_defines} MIPS_ISA_DEFAULT=65"
+           ;;
          mipsisa64*)
            tm_defines="${tm_defines} MIPS_ISA_DEFAULT=64"
            ;;
@@ -1639,38 +1649,32 @@ mipsisa64sr71k-*-elf*)
         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-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 mips/t-libgcc-mips16"
-       use_fixproto=yes
        ;;
 mips64-*-elf* | mips64el-*-elf*)
        tm_file="elfos.h ${tm_file} mips/elf.h"
        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"
+        tm_file="elfos.h ${tm_file} mips/vr.h 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 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"
@@ -1683,7 +1687,6 @@ mips-wrs-vxworks)
 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"
-       use_fixproto=yes
        ;;
 mmix-knuth-mmixware)
        need_64bit_hwint=yes
@@ -1695,15 +1698,16 @@ mn10300-*-*)
                tm_file="${tm_file} dbx.h"
        fi
        use_collect2=no
-       use_fixproto=yes
        ;;
 pdp11-*-bsd)
        tm_file="${tm_file} pdp11/2bsd.h"
        use_fixproto=yes
         ;;
 pdp11-*-*)
-       use_fixproto=yes
        ;;
+picochip-*)
+        # Nothing special
+        ;;
 # port not yet contributed
 #powerpc-*-openbsd*)
 #      tmake_file="${tmake_file} rs6000/t-fprules rs6000/t-fprules-fpbit "
@@ -1768,23 +1772,27 @@ powerpc-*-eabisimaltivec*)
        tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcendian rs6000/t-ppccomm"
        ;;
 powerpc-*-eabisim*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h rs6000/eabisim.h"
+       tm_file="${tm_file} dbxelf.h elfos.h usegas.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h rs6000/eabisim.h"
        extra_options="${extra_options} rs6000/sysv4.opt"
        tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
        ;;
 powerpc-*-elf*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h"
+       tm_file="${tm_file} dbxelf.h elfos.h usegas.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"
        extra_options="${extra_options} rs6000/sysv4.opt"
        tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcendian rs6000/t-ppccomm"
        ;;
+powerpc-xilinx-eabi*)
+       tm_file="${tm_file} dbxelf.h elfos.h usegas.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rs6000/singlefp.h"
+       extra_options="${extra_options} rs6000/sysv4.opt"
+       tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
+       ;;
 powerpc-*-eabi*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h"
+       tm_file="${tm_file} dbxelf.h elfos.h usegas.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h"
        extra_options="${extra_options} rs6000/sysv4.opt"
        tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
        ;;
@@ -1872,21 +1880,25 @@ powerpc-*-lynxos*)
        gas=yes
        ;;
 powerpcle-*-elf*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/sysv4le.h"
+       tm_file="${tm_file} dbxelf.h elfos.h usegas.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"
+       tm_file="${tm_file} dbxelf.h elfos.h usegas.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/sysv4le.h rs6000/eabi.h rs6000/e500.h rs6000/eabisim.h"
        tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
        extra_options="${extra_options} rs6000/sysv4.opt"
        ;;
 powerpcle-*-eabi*)
-       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"
+       tm_file="${tm_file} dbxelf.h elfos.h usegas.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/sysv4le.h rs6000/eabi.h rs6000/e500.h"
        tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
        extra_options="${extra_options} rs6000/sysv4.opt"
        ;;
+powerpc-xilinx-eabi*)
+       tm_file="${tm_file} dbxelf.h elfos.h usegas.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rs6000/singlefp.h rs6000/xfpu.h"
+       extra_options="${extra_options} rs6000/sysv4.opt"
+       tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
+       ;;
 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"
@@ -2127,7 +2139,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-*-rtems*)
        tmake_file="sh/t-sh sh/t-elf t-rtems sh/t-rtems"
@@ -2139,7 +2150,6 @@ sh-wrs-vxworks)
        ;;
 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"
@@ -2155,7 +2165,6 @@ 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 linux.h"
@@ -2258,7 +2267,6 @@ sparc64-*-elf*)
        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"
@@ -2304,7 +2312,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"
@@ -2321,7 +2328,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"
@@ -2334,7 +2340,6 @@ v850-*-*)
        use_collect2=no
        c_target_objs="v850-c.o"
        cxx_target_objs="v850-c.o"
-       use_fixproto=yes
        ;;
 vax-*-netbsdelf*)
        tm_file="${tm_file} elfos.h netbsd.h netbsd-elf.h vax/elf.h vax/netbsd-elf.h"
@@ -2358,13 +2363,12 @@ xstormy16-*-elf)
        extra_options=stormy16/stormy16.opt
        tmake_file="stormy16/t-stormy16"
        extra_parts="crtbegin.o crtend.o"
-       use_fixproto=yes
        ;;
-xtensa-*-elf*)
+xtensa*-*-elf*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h xtensa/elf.h"
        tmake_file="xtensa/t-xtensa xtensa/t-elf"
        ;;
-xtensa-*-linux*)
+xtensa*-*-linux*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h linux.h xtensa/linux.h"
        tmake_file="${tmake_file} xtensa/t-xtensa xtensa/t-linux"
        ;;
@@ -2379,7 +2383,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
@@ -2389,10 +2392,10 @@ esac
 
 case ${target} in
 i[34567]86-*-linux* | x86_64-*-linux*)
-       tmake_file="${tmake_file} i386/t-pmm_malloc"
+       tmake_file="${tmake_file} i386/t-pmm_malloc i386/t-i386"
        ;;
 i[34567]86-*-* | x86_64-*-*)
-       tmake_file="${tmake_file} i386/t-gmm_malloc"
+       tmake_file="${tmake_file} i386/t-gmm_malloc i386/t-i386"
        ;;
 esac
 
@@ -2537,6 +2540,23 @@ if test x$with_cpu = x ; then
       with_cpu="`echo ${target} | sed 's/-.*$//'`"
       ;;
   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.
@@ -2636,7 +2656,7 @@ case "${target}" in
 
                case "$with_abi" in
                "" \
-               | apcs-gnu | atpcs | aapcs | iwmmxt )
+               | apcs-gnu | atpcs | aapcs | iwmmxt | aapcs-linux )
                        #OK
                        ;;
                *)
@@ -2738,8 +2758,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 \
@@ -2750,8 +2770,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
@@ -2768,7 +2794,7 @@ case "${target}" in
                ;;
 
        mips*-*-*)
-               supported_defaults="abi arch float tune divide llsc"
+               supported_defaults="abi arch float tune divide llsc mips-plt"
 
                case ${with_float} in
                "" | soft | hard)
@@ -2815,6 +2841,21 @@ case "${target}" in
                        exit 1
                        ;;
                esac
+
+               case ${with_mips_plt} in
+               yes)
+                       with_mips_plt=plt
+                       ;;
+               no)
+                       with_mips_plt=no-plt
+                       ;;
+               "")
+                       ;;
+               *)
+                       echo "Unknown --with-mips-plt argument: $with_mips_plt" 1>&2
+                       exit 1
+                       ;;
+               esac
                ;;
 
        powerpc*-*-* | rs6000-*-*)
@@ -2832,12 +2873,13 @@ case "${target}" in
                                eval "with_$which=405"
                                ;;
                        "" | common \
-                       | power | power[23456] | power6x | powerpc | powerpc64 \
+                       | power | power[234567] | power6x | powerpc | powerpc64 \
                        | rios | rios1 | rios2 | rsc | rsc1 | rs64a \
                        | 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)
+                       | 604e | 620 | 630 | 740 | 750 | 7400 | 7450 \
+                       | e300c[23] | 854[08] | e500mc \
+                       | 801 | 821 | 823 | 860 | 970 | G3 | G4 | G5 | cell)
                                # OK
                                ;;
                        *)
@@ -2989,6 +3031,13 @@ case ${target} in
                fi
                ;;
 
+       i[34567]86-*-darwin* | x86_64-*-darwin*)
+               tmake_file="${tmake_file} i386/t-fprules-softfp soft-fp/t-softfp"
+               ;;
+       i[34567]86-*-linux* | x86_64-*-linux*)
+               tmake_file="${tmake_file} i386/t-fprules-softfp soft-fp/t-softfp i386/t-linux"
+               ;;
+
        mips*-*-*)
                if test x$gnu_ld = xyes
                then
@@ -3059,10 +3108,10 @@ 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 mips-plt"
 for option in $all_defaults
 do
-       eval "val=\$with_$option"
+       eval "val=\$with_"`echo $option | sed s/-/_/g`
        if test -n "$val"; then
                case " $supported_defaults " in
                *" $option "*)