OSDN Git Service

2005-03-22 James A. Morrison <phython@gcc.gnu.org>
[pf3gnuchains/gcc-fork.git] / gcc / config.gcc
index 6df545c..3eb9004 100644 (file)
@@ -1,5 +1,5 @@
 # GCC target-specific configuration file.
-# Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+# Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 # Free Software Foundation, Inc.
 
 #This file is part of GCC.
@@ -98,6 +98,8 @@
 #
 #  extra_programs      Like extra_passes, but these are used when linking.
 #
+#  extra_options       List of target-dependent .opt files.
+#
 #  c_target_objs       List of extra target-dependent objects that be
 #                      linked into the C compiler only.
 #
@@ -151,6 +153,7 @@ extra_parts=
 extra_programs=
 extra_objs=
 extra_gcc_objs=
+extra_options=
 c_target_objs=
 cxx_target_objs=
 tm_defines=
@@ -181,7 +184,11 @@ md_file=
 
 # Obsolete configurations.
 case ${target} in
- dummy*)
+   sparclite-*-coff*   \
+ | sparclite-*-elf*    \
+ | sparc86x-*-elf*     \
+ | sparc-*-openbsd*    \
+ )
     if test "x$enable_obsolete" != xyes; then
       echo "*** Configuration ${target} is obsolete." >&2
       echo "*** Specify --enable-obsolete to build it anyway." >&2
@@ -314,6 +321,10 @@ if test -f ${srcdir}/config/${cpu_type}/${cpu_type}-modes.def
 then
        extra_modes=${cpu_type}/${cpu_type}-modes.def
 fi
+if test -f ${srcdir}/config/${cpu_type}/${cpu_type}.opt
+then
+       extra_options="${extra_options} ${cpu_type}/${cpu_type}.opt"
+fi
 
 case ${target} in
 x86_64-*-*)
@@ -332,8 +343,10 @@ esac
 case ${target} in
 *-*-darwin*)
   case ${target} in
+    *-darwin1[0-9]*) tm_file="${tm_file} darwin8.h" ;;
     *-darwin[0-6]*) ;;
-    *) tm_file="${tm_file} darwin7.h" ;;
+    *-darwin7*) tm_file="${tm_file} darwin7.h" ;;
+    *) tm_file="${tm_file} darwin8.h" ;;
   esac
   tm_file="${tm_file} darwin.h"
   tm_p_file="${tm_p_file} darwin-protos.h"
@@ -493,6 +506,10 @@ case ${target} in
       tmake_file="${tmake_file} t-openbsd-thread"
       ;;
   esac
+  case ${target} in
+    *-*-openbsd2.*|*-*-openbsd3.[012])
+      tm_defines="${tm_defines} HAS_LIBC_R=1" ;;
+  esac
   ;;
 *-*-rtems*)
   case ${enable_threads} in
@@ -652,9 +669,30 @@ 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"
        ;;
+arm*-*-eabi* | arm*-*-symbianelf* )
+       # 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
+       default_use_cxa_atexit=yes
+       tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/bpabi.h"
+       tmake_file="arm/t-arm arm/t-arm-elf"
+       case ${target} in
+       arm*-*-eabi*)
+         tmake_file="${tmake_file} arm/t-bpabi"
+         ;;
+       arm*-*-symbianelf*)
+         tm_file="${tm_file} arm/symbian.h"
+         # We do not include t-bpabi for Symbian OS because the system
+         # provides its own implementation of the BPABI functions.
+         tmake_file="${tmake_file} t-slibgcc-elf-ver arm/t-symbian"
+         ;;
+       esac
+       tm_file="${tm_file} arm/aout.h arm/arm.h"
+       ;;
 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"
+       tmake_file="arm/t-arm arm/t-arm-elf t-rtems arm/t-rtems"
        ;;
 arm*-*-elf | ep9312-*-elf)
        tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h"
@@ -674,12 +712,16 @@ 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
        ;;
 c4x-*-rtems* | tic4x-*-rtems*)
-       tmake_file="c4x/t-c4x t-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"
@@ -721,7 +763,7 @@ frv-*-*linux*)
        tmake_file="${tmake_file} frv/t-frv frv/t-linux"
        ;;
 h8300-*-rtems*)
-       tmake_file="h8300/t-h8300 t-rtems"
+       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-*-elf*)
@@ -734,7 +776,7 @@ h8300-*-*)
        use_fixproto=yes
        ;;
 hppa*64*-*-linux* | parisc*64*-*-linux*)
-       target_cpu_default="(MASK_PA_11 | MASK_PA_20 | MASK_BIG_SWITCH)"
+       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"
        tmake_file="${tmake_file} pa/t-linux64"
@@ -742,7 +784,7 @@ hppa*64*-*-linux* | parisc*64*-*-linux*)
        need_64bit_hwint=yes
        ;;
 hppa*-*-linux* | parisc*-*-linux*)
-       target_cpu_default="(MASK_PA_11 | MASK_NO_SPACE_REGS | MASK_BIG_SWITCH)"
+       target_cpu_default="MASK_PA_11|MASK_NO_SPACE_REGS"
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h linux.h pa/pa-linux.h \
                 pa/pa32-regs.h pa/pa32-linux.h"
        tmake_file="${tmake_file} pa/t-linux"
@@ -754,49 +796,45 @@ hppa*-*-linux* | parisc*-*-linux*)
        ;;
 # port not yet contributed.
 #hppa*-*-openbsd*)
-#      target_cpu_default="(MASK_PA_11 | MASK_BIG_SWITCH)"
+#      target_cpu_default="MASK_PA_11"
 #      ;;
 hppa1.1-*-pro*)
-       target_cpu_default="(MASK_JUMP_IN_DELAY | MASK_PORTABLE_RUNTIME | MASK_GAS | MASK_NO_SPACE_REGS | MASK_SOFT_FLOAT | MASK_BIG_SWITCH)"
-       tm_file="${tm_file} pa/pa32-regs.h dbxelf.h elfos.h pa/elf.h pa/pa-pro-end.h libgloss.h"
+       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 | MASK_BIG_SWITCH)"
+       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-*-rtems*)
-       target_cpu_default="(MASK_JUMP_IN_DELAY | MASK_PORTABLE_RUNTIME | MASK_GAS | MASK_NO_SPACE_REGS | MASK_SOFT_FLOAT | MASK_BIG_SWITCH)"
-       tm_file="${tm_file} pa/pa32-regs.h dbxelf.h elfos.h pa/elf.h pa/pa-pro-end.h libgloss.h pa/rtems.h rtems.h"
+       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 pa/rtems.h rtems.h"
        tmake_file="pa/t-pro t-rtems"
        ;;
 hppa1.1-*-bsd*)
-       target_cpu_default="(MASK_PA_11 | MASK_BIG_SWITCH)"
+       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
        ;;
-hppa1.1-*-hpux10* | hppa2*-*-hpux10*)
-       target_cpu_default="(MASK_PA_11 | MASK_BIG_SWITCH)"
-       tm_file="${tm_file} pa/pa32-regs.h dbxelf.h pa/som.h pa/pa-hpux.h pa/pa-hpux10.h"
-       tmake_file="pa/t-pa pa/t-pa-hpux pa/t-hpux-shlib"
-       case ${enable_threads} in
-         "")
-           if test x$have_pthread_h = xyes ; then
-             tmake_file="${tmake_file} pa/t-dce-thr"
-           fi
-           ;;
-         yes | dce)
-           tmake_file="${tmake_file} pa/t-dce-thr"
-           ;;
+hppa[12]*-*-hpux10*)
+       case ${target} in
+       hppa1.1-*-* | hppa2*-*-*)
+               target_cpu_default="MASK_PA_11"
+               ;;
+       esac
+       tm_file="${tm_file} pa/pa32-regs.h dbxelf.h pa/som.h \
+                pa/pa-hpux.h pa/pa-hpux10.h"
+       case ${target} in
+       *-*-hpux10.[1-9]*)
+               tm_file="${tm_file} pa/pa-hpux1010.h"
+               ;;
        esac
-       use_collect2=yes
-       use_fixproto=yes
-       ;;
-hppa1.0-*-hpux10*)
-       tm_file="${tm_file} pa/pa32-regs.h dbxelf.h pa/som.h pa/pa-hpux.h pa/pa-hpux10.h"
        tmake_file="pa/t-pa pa/t-pa-hpux pa/t-hpux-shlib"
        case ${enable_threads} in
          "")
@@ -812,24 +850,29 @@ hppa1.0-*-hpux10*)
        use_fixproto=yes
        ;;
 hppa*64*-*-hpux11*)
+       target_cpu_default="MASK_PA_11|MASK_PA_20"
        if test x$gnu_ld = xyes
        then
-               target_cpu_default="(MASK_PA_11 | MASK_PA_20 | MASK_GAS | MASK_GNU_LD | MASK_BIG_SWITCH)"
-       else
-               target_cpu_default="(MASK_PA_11 | MASK_PA_20 | MASK_GAS | MASK_BIG_SWITCH)"
+               target_cpu_default="${target_cpu_default}|MASK_GNU_LD"
        fi
        if test x$gas = xyes
        then
-               tm_file="pa/pa64-start.h ${tm_file} dbxelf.h elfos.h  \
-                        pa/pa64-regs.h pa/pa-hpux.h \
-                        pa/pa-hpux11.h pa/pa-64.h pa/pa64-hpux.h"
+               tm_file="pa/pa64-start.h ${tm_file} dbxelf.h elfos.h \
+                        pa/pa64-regs.h pa/pa-hpux.h pa/pa-hpux11.h"
        else
                tm_file="pa/pa64-start.h ${tm_file} dbxelf.h pa/elf.h \
-                        pa/pa64-regs.h pa/pa-hpux.h \
-                        pa/pa-hpux11.h pa/pa-64.h pa/pa64-hpux.h"
+                        pa/pa64-regs.h pa/pa-hpux.h pa/pa-hpux11.h"
        fi
+       case ${target} in
+       *-*-hpux11.[1-9]*)
+               tm_file="${tm_file} pa/pa-hpux1111.h pa/pa-64.h pa/pa64-hpux.h"
+               ;;
+       *)
+               tm_file="${tm_file} pa/pa-64.h pa/pa64-hpux.h"
+               ;;
+       esac
        need_64bit_hwint=yes
-       tmake_file="pa/t-pa64 pa/t-pa-hpux"
+       tmake_file="pa/t-pa64 pa/t-pa-hpux pa/t-hpux-shlib"
        extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o"
        case x${enable_threads} in
        xyes | xposix )
@@ -837,19 +880,19 @@ hppa*64*-*-hpux11*)
                ;;
        esac
        ;;
-hppa1.1-*-hpux11* | hppa2*-*-hpux11*)
-       target_cpu_default="(MASK_PA_11 | MASK_BIG_SWITCH)"
-       tm_file="${tm_file} pa/pa32-regs.h dbxelf.h pa/som.h pa/pa-hpux.h pa/pa-hpux11.h"
-       tmake_file="pa/t-pa pa/t-pa-hpux pa/t-hpux-shlib"
-       case x${enable_threads} in
-       xyes | xposix )
-               thread_file=posix 
+hppa[12]*-*-hpux11*)
+       case ${target} in
+       hppa1.1-*-* | hppa2*-*-*)
+               target_cpu_default="MASK_PA_11"
+               ;;
+       esac
+       tm_file="${tm_file} pa/pa32-regs.h dbxelf.h pa/som.h \
+                pa/pa-hpux.h pa/pa-hpux11.h"
+       case ${target} in
+       *-*-hpux11.[1-9]*)
+               tm_file="${tm_file} pa/pa-hpux1111.h"
                ;;
        esac
-       use_collect2=yes
-       ;;
-hppa1.0-*-hpux11*)
-       tm_file="${tm_file} pa/pa32-regs.h dbxelf.h pa/som.h pa/pa-hpux.h pa/pa-hpux11.h"
        tmake_file="pa/t-pa pa/t-pa-hpux pa/t-hpux-shlib"
        case x${enable_threads} in
        xyes | xposix )
@@ -904,13 +947,19 @@ 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"
        ;;
-i[34567]86-*-openbsd*)
+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"
        # we need collect2 until our bug is fixed...
        use_collect2=yes
        ;;
+i[34567]86-*-openbsd*)
+       tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h"
+       tm_file="${tm_file} openbsd.h i386/openbsdelf.h"
+       gas=yes
+       gnu_ld=yes
+       ;;
 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
@@ -925,9 +974,13 @@ i[34567]86-*-linux* | i[34567]86-*-kfreebsd*-gnu | i[34567]86-*-knetbsd*-gnu)
        esac
        tmake_file="${tmake_file} i386/t-crtstuff"
        ;;
-x86_64-*-linux*)
+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 \
                 i386/x86-64.h i386/linux64.h"
+       case ${target} in
+       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"
        ;;
 i[34567]86-*-gnu*)
@@ -940,13 +993,32 @@ i[34567]86-pc-msdosdjgpp*)
        gas=yes
        ;;
 i[34567]86-*-lynxos*)
-       if test x$gas = xyes
-       then
-               tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h svr3.h lynx.h i386/lynx.h"
-       else
-               tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h lynx-ng.h i386/lynx-ng.h"
-       fi
-       use_fixproto=yes
+       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"
+       extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
+       thread_file=lynx
+       gnu_ld=yes
+       gas=yes
+       ;;
+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
+       extra_objs=netware.o
+       case /${with_ld} in
+       */nwld)
+               extra_objs="$extra_objs nwld.o"
+               tm_file="${tm_file} i386/nwld.h"
+               tmake_file="${tmake_file} i386/t-nwld"
+               extra_parts="crt0.o libgcc.def libc.def libcpre.def posixpre.def"
+               ;;
+       esac
+       case x${enable_threads} in
+       x | xyes | xposix) thread_file='posix';;
+       xnks) thread_file='nks';;
+       xno) ;;
+       *) echo 'Unknown thread configuration for NetWare' >&2; exit 1;;
+       esac
        ;;
 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"
@@ -971,7 +1043,12 @@ i[34567]86-*-sco3.2v5*)   # 80386 running SCO Open Server 5
        ;;
 i[34567]86-*-solaris2*)
        xm_defines="SMALL_ARG_MAX"
-       tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h i386/sysv4.h sol2.h i386/sol2.h"
+       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} sol26.h"
+       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"
@@ -979,19 +1056,43 @@ i[34567]86-*-solaris2*)
        tm_p_file="${tm_p_file} sol2-protos.h"
        if test x$gnu_ld = xyes; then
                tmake_file="$tmake_file t-slibgcc-elf-ver"
+               tm_defines="${tm_defines} TARGET_GNU_LD=1"
        else
                tmake_file="$tmake_file t-slibgcc-sld"
        fi
        case ${target} in
-       *-*-solaris2.[789] | *-*-solaris2.1[0-9])
+       *-*-solaris2.[789] | *-*-solaris2.1[0-9]*)
                tm_file="$tm_file tm-dwarf2.h"
                ;;
        esac
-       extra_parts="crt1.o crti.o crtn.o gcrt1.o gmon.o crtbegin.o crtend.o"
+       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"
+               need_64bit_hwint=yes
+               # Solaris 2.10 provides crt1.o, crti.o, crtn.o, and gcrt1.o as 
+               # part of the base system.
+               extra_parts="gmon.o crtbegin.o crtend.o"
+               ;;
+       *)
+               extra_parts="crt1.o crti.o crtn.o gcrt1.o gmon.o crtbegin.o crtend.o"
+               ;;
+       esac
        case ${enable_threads}:${have_pthread_h}:${have_thread_h} in
-         no:*:*) ;;
-         *:yes:* ) thread_file=posix ;;
-         yes:*:* | *:*:yes ) thread_file=solaris ;;
+         "":yes:* | yes:yes:* )
+               case ${target} in
+                 *-*-solaris2.[0-6] | *-*-solaris2.[0-6].*)
+                       thread_file=posix95
+                       ;;
+                 *)
+                       thread_file=posix
+                       ;;
+               esac
+               ;;
+         "":*:yes | yes:*:yes )
+               thread_file=solaris
+               ;;
        esac
        ;;
 i[34567]86-*-sysv5*)           # Intel x86 on System V Release 5
@@ -1107,12 +1208,12 @@ ia64*-*-freebsd*)
        ;;
 ia64*-*-linux*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h linux.h ia64/sysv4.h ia64/linux.h"
-       tmake_file="${tmake_file} ia64/t-ia64 ia64/t-glibc"
+       tmake_file="${tmake_file} ia64/t-ia64 t-libunwind ia64/t-glibc"
+       if test x$with_system_libunwind != xyes ; then
+               tmake_file="${tmake_file} t-libunwind-elf ia64/t-glibc-libunwind"
+       fi
        target_cpu_default="MASK_GNU_AS|MASK_GNU_LD"
        extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtfastmath.o"
-       if test x"$use_libunwind_exceptions" = xyes; then
-         tmake_file="$tmake_file t-libunwind"
-       fi
        ;;
 ia64*-*-hpux*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h ia64/sysv4.h ia64/hpux.h"
@@ -1126,6 +1227,7 @@ ia64*-*-hpux*)
        use_collect2=no
        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).
@@ -1155,7 +1257,7 @@ m32r-*-linux*)
        tm_file="dbxelf.h elfos.h svr4.h linux.h ${tm_file} m32r/linux.h"
        extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
        # We override the tmake_file for linux -- why?
-       tmake_file="m32r/t-linux"
+       tmake_file="t-slibgcc-elf-ver m32r/t-linux"
        gnu_ld=yes
        use_fixproto=yes
        if test x$enable_threads = xyes; then
@@ -1166,7 +1268,7 @@ m32rle-*-linux*)
        tm_file="dbxelf.h elfos.h svr4.h linux.h m32r/little.h ${tm_file} m32r/linux.h"
        extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
        # We override the tmake_file for linux -- why?
-       tmake_file="m32r/t-linux"
+       tmake_file="t-slibgcc-elf-ver m32r/t-linux"
        gnu_ld=yes
        use_fixproto=yes
        if test x$enable_threads = xyes; then
@@ -1260,68 +1362,28 @@ mcore-*-pe*)
        tmake_file=mcore/t-mcore-pe
        use_fixproto=yes
        ;;
-mips-sgi-irix6*)               # SGI System V.4., IRIX 6
-       tm_file="${tm_file} mips/iris5.h mips/iris6.h"
-       tmake_file="mips/t-iris mips/t-iris5-6 mips/t-iris6"
-       if test x$gas = xyes
-       then
-               tm_file="${tm_file} mips/iris6gas.h"
-       fi
-       if test "x$gnu_ld" = xyes
-       then
-               tm_file="${tm_file} mips/iris6gld.h"
-               tmake_file="$tmake_file mips/t-irix-gld"
-       fi
-       target_cpu_default="MASK_ABICALLS|MASK_FLOAT64|MASK_64BIT"
-       tm_defines="MIPS_ISA_DEFAULT=3 MIPS_ABI_DEFAULT=ABI_N32"
-       # See comment in mips/iris5.h file.  Only enabled for O32 ABI
-       # without GNU as.
-       if test x$gas = xno
-       then
-               use_collect2=yes
-       fi
-#      if test x$enable_threads = xyes; then
-#              thread_file='irix'
-#      fi
-       use_fixproto=yes
-       ;;
-mips-sgi-irix5cross64)         # Irix5 host, Irix 6 target, cross64
-       tm_file="${tm_file} mips/iris5.h mips/iris6.h mips/cross64.h"
-       tmake_file="mips/t-iris mips/t-cross64"
-       target_cpu_default="MASK_ABICALLS|MASK_FLOAT64|MASK_64BIT"
-       tm_defines="MIPS_ISA_DEFAULT=3 MIPS_ABI_DEFAULT=ABI_N32"
-       # See comment in mips/iris[56].h files.
-       use_collect2=yes
-#      if test x$enable_threads = xyes; then
-#              thread_file='irix'
-#      fi
-       use_fixproto=yes
-       ;;
-mips-sgi-irix5*)               # SGI System V.4., IRIX 5
-       tm_file="${tm_file} mips/iris5.h"
-       if test x$gas = xyes
+mips-sgi-irix[56]*)
+       tm_file="elfos.h ${tm_file} mips/iris.h"
+       tmake_file="mips/t-iris mips/t-slibgcc-irix"
+       target_cpu_default="MASK_ABICALLS"
+       case ${target} in
+       *-*-irix5*)
+               tm_file="${tm_file} mips/iris5.h"
+               ;;
+
+       *-*-irix6*)
+               tm_file="${tm_file} mips/iris6.h"
+               tmake_file="${tmake_file} mips/t-iris6"
+               tm_defines="MIPS_ISA_DEFAULT=3 MIPS_ABI_DEFAULT=ABI_N32"
+               ;;
+       esac
+       if test "x$stabs" = xyes
        then
-               tm_file="${tm_file} mips/sdb.h mips/iris5gas.h"
-               if test x$stabs = xyes
-               then
-                       tm_file="${tm_file} dbx.h mips/dbxmdebug.h"
-               fi
-               tmake_file=mips/t-iris5-gas
-       else
-               tmake_file=mips/t-iris5-as
+               tm_file="${tm_file} dbx.h mips/dbxmdebug.h"
        fi
        if test "x$gnu_ld" = xyes
        then
-               tm_file="${tm_file} mips/iris5gld.h"
-               tmake_file="$tmake_file mips/t-irix-gld"
-       fi
-       tmake_file="${tmake_file} mips/t-iris mips/t-iris5-6"
-       target_cpu_default="MASK_ABICALLS"
-       # mips-tfile doesn't work yet
-       # See comment in mips/iris5.h file.
-       if test x$gas = xno
-       then
-               use_collect2=yes
+               tm_defines="${tm_defines} IRIX_USING_GNU_LD"
        fi
 #      if test x$enable_threads = xyes; then
 #              thread_file='irix'
@@ -1329,21 +1391,13 @@ mips-sgi-irix5*)                # SGI System V.4., IRIX 5
        use_fixproto=yes
        ;;
 mips*-*-netbsd*)                       # NetBSD/mips, either endian.
-       target_cpu_default="MASK_GAS|MASK_ABICALLS"
+       target_cpu_default="MASK_ABICALLS"
        tm_file="elfos.h ${tm_file} mips/elf.h netbsd.h netbsd-elf.h mips/netbsd.h"
        ;;
 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"
-
-       # This default ABI is a partial lie: t-linux64 overrides the
-       # DRIVER_SELF_SPEC that sets the default abi, in the spec file
-       # that is installed.  What GCC thinks of as the default must
-       # remain as ABI_32 such that the SONAMEs of the libgcc shared
-       # libraries remain compatible with those of mips-linux-gnu.
-       tm_defines="MIPS_ISA_DEFAULT=1 MIPS_ABI_DEFAULT=ABI_32"
-       target_cpu_default="MASK_ABICALLS|MASK_FLOAT64|MASK_64BIT"
-       extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o"
+       tm_defines="MIPS_ABI_DEFAULT=ABI_N32"
        gnu_ld=yes
        gas=yes
        ;;
@@ -1358,7 +1412,7 @@ mips*-*-linux*)                           # Linux MIPS, either endian.
        ;;
 mips*-*-openbsd*)
        tm_defines="OBSD_HAS_DECLARE_FUNCTION_NAME OBSD_HAS_DECLARE_OBJECT OBSD_HAS_CORRECT_SPECS"
-       target_cpu_default="MASK_GAS|MASK_ABICALLS"
+       target_cpu_default="MASK_ABICALLS"
        tm_file="mips/mips.h openbsd.h mips/openbsd.h mips/sdb.h"
        case ${target} in
        mips*el-*-openbsd*) 
@@ -1381,21 +1435,21 @@ 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|MASK_GAS"
+       target_cpu_default="MASK_64BIT|MASK_FLOAT64"
        tm_defines="MIPS_ISA_DEFAULT=64 MIPS_ABI_DEFAULT=ABI_EABI"
        use_fixproto=yes
        ;;
 mipsisa64sr71k-*-elf*)
         tm_file="elfos.h ${tm_file} mips/elf.h"
         tmake_file=mips/t-sr71k
-       target_cpu_default="MASK_64BIT|MASK_FLOAT64|MASK_GAS"
+       target_cpu_default="MASK_64BIT|MASK_FLOAT64"
        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
-       target_cpu_default="MASK_64BIT|MASK_FLOAT64|MASK_GAS"
+       target_cpu_default="MASK_64BIT|MASK_FLOAT64"
        tm_defines="MIPS_ISA_DEFAULT=64 MIPS_CPU_STRING_DEFAULT=\\\"sb1\\\" MIPS_ABI_DEFAULT=ABI_O64"
        use_fixproto=yes
        ;;
@@ -1407,7 +1461,7 @@ mips-*-elf* | mipsel-*-elf*)
 mips64-*-elf* | mips64el-*-elf*)
        tm_file="elfos.h ${tm_file} mips/elf.h"
        tmake_file=mips/t-elf
-       target_cpu_default="MASK_64BIT|MASK_FLOAT64|MASK_GAS"
+       target_cpu_default="MASK_64BIT|MASK_FLOAT64"
        tm_defines="MIPS_ISA_DEFAULT=3 MIPS_ABI_DEFAULT=ABI_O64"
        use_fixproto=yes
        ;;
@@ -1419,7 +1473,7 @@ mips64vr-*-elf* | mips64vrel-*-elf*)
 mips64orion-*-elf* | mips64orionel-*-elf*)
        tm_file="elfos.h ${tm_file} mips/elforion.h mips/elf.h"
        tmake_file=mips/t-elf
-       target_cpu_default="MASK_64BIT|MASK_FLOAT64|MASK_GAS"
+       target_cpu_default="MASK_64BIT|MASK_FLOAT64"
        tm_defines="MIPS_ISA_DEFAULT=3 MIPS_ABI_DEFAULT=ABI_O64"
        use_fixproto=yes
        ;;
@@ -1432,13 +1486,11 @@ mips-wrs-vxworks)
        # 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"
        tmake_file="${tmake_file} mips/t-vxworks"
-       target_cpu_default="MASK_GAS"
        ;;
 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"
-       target_cpu_default="MASK_GAS"
        thread_file=
        ;;
 mipstx39-*-elf* | mipstx39el-*-elf*)
@@ -1486,7 +1538,8 @@ avr-*-*)
 powerpc64-*-linux*)
        tm_file="rs6000/biarch64.h ${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h"
        case x$with_cpu in
-       x|xpowerpc64|xdefault64) tm_file="${tm_file} rs6000/default64.h";;
+       x|xpowerpc64|xdefault64|x6[23]0|x970|xG5|xpower[345]|xrs64a)
+               tm_file="${tm_file} rs6000/default64.h";;
        esac
        tm_file="${tm_file} rs6000/linux64.h"
        tmake_file="rs6000/t-fprules ${tmake_file} rs6000/t-ppccomm rs6000/t-linux64"
@@ -1504,6 +1557,11 @@ powerpc-*-beos*)
 powerpc-*-darwin*)
        tm_file="${tm_file} rs6000/darwin.h"
        tmake_file="${tmake_file} rs6000/t-darwin"
+       case ${target} in
+         *-darwin1[0-9]*) tmake_file="${tmake_file} rs6000/t-darwin8" ;;
+         *-darwin[0-7]*) ;;
+         *-darwin[8-9]*) tmake_file="${tmake_file} rs6000/t-darwin8" ;;
+       esac
        extra_headers=altivec.h
        ;;
 powerpc*-*-freebsd*)
@@ -1593,6 +1651,15 @@ powerpc-wrs-windiss*)    # Instruction-level simulator for VxWorks.
         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"
+       tmake_file="t-lynx rs6000/t-lynx"
+       extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
+       thread_file=lynx
+       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-ppcos rs6000/t-ppccomm"
@@ -1647,12 +1714,6 @@ rs6000-ibm-aix[56789].* | powerpc-ibm-aix[56789].*)
        thread_file='aix'
        extra_headers=
        ;;
-rs6000-*-lynxos*)
-       tm_file="svr3.h lynx.h rs6000/lynxbase.h rs6000/rs6000.h rs6000/lynx.h"
-       tmake_file=rs6000/t-fprules
-       use_collect2=yes
-       use_fixproto=yes
-       ;;
 s390-*-linux*)
        tm_file="s390/s390.h dbxelf.h elfos.h svr4.h linux.h s390/linux.h"
        tmake_file="${tmake_file} s390/t-crtstuff"
@@ -1673,6 +1734,7 @@ s390x-ibm-tpf*)
        extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o"
        out_file=s390/s390.c
        tmake_file="t-slibgcc-elf-ver s390/t-crtstuff s390/t-tpf"
+       thread_file='tpf'
        ;;
 sh-*-elf* | sh[12346l]*-*-elf* | sh*-*-kaos* | \
 sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
@@ -1707,7 +1769,7 @@ sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
        tm_file="${tm_file} sh/elf.h"
        case ${target} in
        sh*-*-linux*)   tmake_file="${tmake_file} sh/t-linux"
-                       tm_file="${tm_file} sh/linux.h" ;;
+                       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" ;;
@@ -1814,11 +1876,11 @@ sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
        use_fixproto=yes
        ;;
 sh-*-rtemscoff*)
-       tmake_file="sh/t-sh t-rtems"
+       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"
+       tmake_file="sh/t-sh sh/t-elf t-rtems sh/t-rtems"
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h sh/elf.h sh/embed-elf.h sh/rtemself.h rtems.h"
        ;;
 sh-wrs-vxworks)
@@ -1830,7 +1892,7 @@ sh-*-*)
        use_fixproto=yes
        ;;
 sparc-*-netbsdelf*)
-       tm_file="${tm_file} elfos.h svr4.h sparc/sysv4.h netbsd.h netbsd-elf.h sparc/netbsd-elf.h"
+       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h netbsd.h netbsd-elf.h sparc/netbsd-elf.h"
        ;;
 sparc-*-openbsd*)
        tm_defines=OBSD_OLD_GAS
@@ -1841,12 +1903,12 @@ sparc-*-openbsd*)
        use_collect2=yes
        ;;
 sparc64-*-openbsd*)
-       tm_file="sparc/openbsd1-64.h sparc/sparc.h elfos.h svr4.h sparc/sysv4.h sparc/sp64-elf.h openbsd.h sparc/openbsd64.h"
+       tm_file="sparc/openbsd1-64.h ${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/sp64-elf.h openbsd.h sparc/openbsd64.h"
        gas=yes gnu_ld=yes
        with_cpu=ultrasparc
        ;;
 sparc-*-elf*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h sparc/sol2.h sparc/elf.h"
+       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
@@ -1856,7 +1918,7 @@ sparc-*-linux*)           # SPARC's running GNU/Linux, libc6
        tmake_file="${tmake_file} sparc/t-crtfm"
        ;;
 sparc-*-rtems*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h sparc/sol2.h sparc/elf.h sparc/rtemself.h rtems.h"
+       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/sp-elf.h sparc/rtemself.h rtems.h"
        tmake_file="sparc/t-elf sparc/t-crtfm t-rtems"
        extra_parts="crti.o crtn.o crtbegin.o crtend.o"
        ;;
@@ -1866,7 +1928,7 @@ sparc64-*-solaris2* | sparcv9-*-solaris2*)
                tm_file="${tm_file} sparc/sol2-gld.h sparc/sol2-gld-bi.h"
        fi
        if test x$gas = xyes; then
-               tm_file="${tm_file} sparc/sol2-gas-bi.h"
+               tm_file="${tm_file} sparc/sol2-gas.h sparc/sol2-gas-bi.h"
        fi
        tmake_file="t-sol2 sparc/t-sol2 sparc/t-sol2-64 sparc/t-crtfm"
        if test x$gnu_ld = xyes; then
@@ -1880,17 +1942,24 @@ sparc64-*-solaris2* | sparcv9-*-solaris2*)
        tm_p_file="${tm_p_file} sol2-protos.h"
        extra_parts="crt1.o crti.o crtn.o gcrt1.o crtbegin.o crtend.o"
        case ${enable_threads}:${have_pthread_h}:${have_thread_h} in
-         no:*:*) ;;
-         *:yes:* ) thread_file=posix ;;
-         yes:*:* | *:*:yes ) thread_file=solaris ;;
+         "":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 sparc/sol2.h"
+       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} sol26.h"
+       esac
+       tm_file="${tm_file} sparc/sol2.h"
        if test x$gnu_ld = xyes; then
                tm_file="${tm_file} sparc/sol2-gld.h"
        fi
+       if test x$gas = xyes; then
+               tm_file="${tm_file} sparc/sol2-gas.h"
+       fi
        tmake_file="t-sol2 sparc/t-sol2 sparc/t-crtfm"
        if test x$gnu_ld = xyes; then
                tmake_file="$tmake_file t-slibgcc-elf-ver"
@@ -1903,7 +1972,7 @@ sparc-*-solaris2*)
                        tm_file="${tm_file} sparc/sol26-sld.h"
                fi
                ;;
-       *-*-solaris2.[789] | *-*-solaris2.1[0-9])
+       *-*-solaris2.[789] | *-*-solaris2.1[0-9]*)
                tm_file="sparc/biarch64.h ${tm_file} sparc/sol2-bi.h tm-dwarf2.h"
                if test x$gnu_ld = xyes; then
                        tm_file="${tm_file} sparc/sol2-gld-bi.h"
@@ -1921,9 +1990,19 @@ sparc-*-solaris2*)
        tm_p_file="${tm_p_file} sol2-protos.h"
        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
-         no:*:*) ;;
-         *:yes:* ) thread_file=posix ;;
-         yes:*:* | *:*:yes ) thread_file=solaris ;;
+         "":yes:* | yes:yes:* )
+               case ${target} in
+                 *-*-solaris2.[0-6] | *-*-solaris2.[0-6].*)
+                       thread_file=posix95
+                       ;;
+                 *)
+                       thread_file=posix
+                       ;;
+               esac
+               ;;
+         "":*:yes | yes:*:yes )
+               thread_file=solaris
+               ;;
        esac
        ;;
 sparc-*-sysv4*)
@@ -1937,19 +2016,19 @@ sparclite-*-coff*)
        tmake_file=sparc/t-sparclite
        ;;
 sparclite-*-elf*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h sparc/sol2.h sparc/elf.h sparc/liteelf.h"
+       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/sp-elf.h sparc/liteelf.h"
        tmake_file="sparc/t-sparclite sparc/t-crtfm"
         extra_parts="crtbegin.o crtend.o"
        use_fixproto=yes
        ;;
 sparc86x-*-elf*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h sparc/sol2.h sparc/elf.h sparc/sp86x-elf.h"
+       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/sp-elf.h sparc/sp86x-elf.h"
        tmake_file="sparc/t-sp86x sparc/t-crtfm"
         extra_parts="crtbegin.o crtend.o"
        use_fixproto=yes
        ;;
 sparc64-*-elf*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h sparc/sol2.h sparc/sp64-elf.h"
+       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/sp64-elf.h"
        tmake_file="${tmake_file} sparc/t-crtfm"
        extra_parts="crtbegin.o crtend.o"
        use_fixproto=yes
@@ -2118,6 +2197,18 @@ am33_2.0-*-linux*)
        ;;
 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"
+       ;;
+i[34567]86-*-* | x86_64-*-*)
+       tmake_file="${tmake_file} i386/t-gmm_malloc"
+       ;;
+esac
+
 # Support for --with-cpu and related options (and a few unrelated options,
 # too).
 case ${with_cpu} in
@@ -2230,24 +2321,24 @@ if test x$with_float = x; then
        esac
 fi
 
-       # Similarly for --with-schedule.
-       if test x$with_schedule = x; then
-               case ${target} in
-               hppa1* | parisc1*)
-                       # Override default PA8000 scheduling model.
-                       with_schedule=7100LC
-                       ;;
-               esac
-       fi
+# Similarly for --with-schedule.
+if test x$with_schedule = x; then
+       case ${target} in
+       hppa1* | parisc1*)
+               # Override default PA8000 scheduling model.
+               with_schedule=7100LC
+               ;;
+       esac
+fi
 
-       # Validate and mark as valid any --with options supported
-       # by this target.  In order to use a particular --with option
-       # you must list it in supported_defaults; validating the value
-       # is optional.  This case statement should set nothing besides
-       # supported_defaults.
+# Validate and mark as valid any --with options supported
+# by this target.  In order to use a particular --with option
+# you must list it in supported_defaults; validating the value
+# is optional.  This case statement should set nothing besides
+# supported_defaults.
 
-       supported_defaults=
-       case "${target}" in
+supported_defaults=
+case "${target}" in
        alpha*-*-*)
                supported_defaults="cpu tune"
                for which in cpu tune; do
@@ -2272,10 +2363,16 @@ fi
                        # See if it matches any of the entries in arm-cores.def
                        eval "val=\$with_$which"
                        if [ x"$val" = x ] \
-                           || grep "^ARM_CORE($val," \
+                           || grep "^ARM_CORE(\"$val\"," \
                                    ${srcdir}/config/arm/arm-cores.def \
                                    > /dev/null; then
                          # Ok
+                         new_val=`grep "^ARM_CORE(\"$val\"," \
+                               ${srcdir}/config/arm/arm-cores.def | \
+                               sed -e 's/^[^,]*,[      ]*//' | \
+                               sed -e 's/,.*$//'`
+                         eval "target_${which}_cname=$new_val"
+                       echo "For $val real value is $new_val"
                          true
                        else
                          echo "Unknown CPU used in --with-$which=$val" 1>&2
@@ -2286,7 +2383,8 @@ fi
                case "$with_arch" in
                "" \
                | armv[23456] | armv2a | armv3m | armv4t | armv5t \
-               | armv5te | armv6j | iwmmxt | ep9312)
+               | armv5te | armv6j |armv6k | armv6z | armv6zk \
+               | iwmmxt | ep9312)
                        # OK
                        ;;
                *)
@@ -2405,7 +2503,7 @@ fi
                ;;
 
        mips*-*-*)
-               supported_defaults="abi arch float tune"
+               supported_defaults="abi arch float tune divide"
 
                case ${with_float} in
                "" | soft | hard)
@@ -2426,6 +2524,15 @@ fi
                        exit 1
                        ;;
                esac
+
+               case ${with_divide} in
+               "" | breaks | traps)
+                       # OK
+                       ;;
+               *)
+                       echo "Unknown division check type use in --with-divide=$with_divide" 1>&2
+                       exit 1
+               esac
                ;;
 
        powerpc*-*-* | rs6000-*-*)
@@ -2439,13 +2546,12 @@ fi
                                eval $with_which=
                                ;;
                        "" | common \
-                       | power | power2 | power3 | power4 \
-                       | powerpc | powerpc64 \
+                       | power | power[2345] | 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 \
-                       | 8540 | 801 | 821 | 823 | 860 | 970 | G3 | G4 | G5)
+                       | 854[08] | 801 | 821 | 823 | 860 | 970 | G3 | G4 | G5)
                                # OK
                                ;;
                        *)
@@ -2544,11 +2650,11 @@ fi
                        ;;
                esac
                ;;
-       esac
+esac
 
-       # Set some miscellaneous flags for particular targets.
-       target_cpu_default2=
-       case ${target} in
+# Set some miscellaneous flags for particular targets.
+target_cpu_default2=
+case ${target} in
        alpha*-*-*)
                if test x$gas = xyes
                then
@@ -2557,16 +2663,12 @@ fi
                ;;
 
        arm*-*-*)
-               case "x$with_cpu" in
-               x)
-                       # The most generic
-                       target_cpu_default2="TARGET_CPU_generic"
-                       ;;
-
-               *)
-                       target_cpu_default2="TARGET_CPU_$with_cpu"
-                       ;;
-               esac
+               if test x$target_cpu_cname = x
+               then
+                       target_cpu_default2=TARGET_CPU_generic
+               else
+                       target_cpu_default2=TARGET_CPU_$target_cpu_cname
+               fi
                ;;
 
        m68k*-linux*)
@@ -2601,42 +2703,23 @@ fi
                ;;
 
        hppa*-*-* | parisc*-*-*)
+               target_cpu_default2="MASK_BIG_SWITCH"
                if test x$gas = xyes
                then
-                       target_cpu_default2="MASK_GAS|MASK_JUMP_IN_DELAY"
+                       target_cpu_default2="${target_cpu_default2}|MASK_GAS|MASK_JUMP_IN_DELAY"
                fi
                ;;
 
        mips*-*-*)
-               case ${target} in
-               mips*-*-ecoff* | mips*-*-elf*)
-                       if test x$gas = xyes
-                       then
-                               if test x$gnu_ld = xyes
-                               then
-                                       target_cpu_default2="MASK_GAS|MASK_SPLIT_ADDR"
-                               else
-                                       target_cpu_default2="MASK_GAS"
-                               fi
-                       fi
-                       ;;
-               mips*-*-*)
-                       if test x$gas = xyes
-                       then
-                               target_cpu_default2="MASK_GAS"
-                       fi
-                       ;;
-               esac
+               if test x$gnu_ld = xyes
+               then
+                       target_cpu_default2="MASK_SPLIT_ADDRESSES"
+               fi
                case ${target} in
                        mips*el-*-*)
                                tm_defines="TARGET_ENDIAN_DEFAULT=0 $tm_defines"
                                ;;
                esac
-               case $tm_file in
-                       *mips/elf.h*)
-                               tm_defines="OBJECT_FORMAT_ELF $tm_defines"
-                               ;;
-               esac
                if test "x$enable_gofast" = xyes
                then
                        tm_defines="US_SOFTWARE_GOFAST $tm_defines"
@@ -2657,6 +2740,11 @@ fi
                c_target_objs="${c_target_objs} rs6000-c.o"
                cxx_target_objs="${cxx_target_objs} rs6000-c.o"
                tmake_file="rs6000/t-rs6000 ${tmake_file}"
+
+                if test x$enable_e500_double = xyes
+                then
+                        tm_file="$tm_file rs6000/e500-double.h"
+                fi
                ;;
 
        sparc*-*-*)
@@ -2687,44 +2775,45 @@ fi
                        ;;
                esac
                ;;
-       esac
+esac
 
-       t=
-       all_defaults="abi cpu arch tune schedule float mode fpu"
-       for option in $all_defaults
-       do
-               eval "val=\$with_$option"
-               if test -n "$val"; then
-                       case " $supported_defaults " in
-                       *" $option "*)
-                               ;;
-                       *)
-                               echo "This target does not support --with-$option." 2>&1
-                               exit 1
-                               ;;
-                       esac
+t=
+all_defaults="abi cpu arch tune schedule float mode fpu divide"
+for option in $all_defaults
+do
+       eval "val=\$with_$option"
+       if test -n "$val"; then
+               case " $supported_defaults " in
+               *" $option "*)
+                       ;;
+               *)
+                       echo "This target does not support --with-$option." 2>&1
+                       exit 1
+                       ;;
+               esac
 
-                       if test "x$t" = x
-                       then
-                               t="{ \"$option\", \"$val\" }"
-                       else
-                               t="${t}, { \"$option\", \"$val\" }"
-                       fi
+               if test "x$t" = x
+               then
+                       t="{ \"$option\", \"$val\" }"
+               else
+                       t="${t}, { \"$option\", \"$val\" }"
                fi
-       done
-       if test "x$t" = x
-       then
-               configure_default_options="{ { NULL, NULL} }"
-       else
-               configure_default_options="{ ${t} }"
        fi
+done
+
+if test "x$t" = x
+then
+       configure_default_options="{ { NULL, NULL} }"
+else
+       configure_default_options="{ ${t} }"
+fi
 
-       if test "$target_cpu_default2" != ""
+if test "$target_cpu_default2" != ""
+then
+       if test "$target_cpu_default" != ""
        then
-               if test "$target_cpu_default" != ""
-               then
-                       target_cpu_default="(${target_cpu_default}|${target_cpu_default2})"
-               else
-                       target_cpu_default=$target_cpu_default2
-               fi
+               target_cpu_default="(${target_cpu_default}|${target_cpu_default2})"
+       else
+               target_cpu_default=$target_cpu_default2
        fi
+fi