OSDN Git Service

* doc/invoke.texi: Add cpu_type power6.
[pf3gnuchains/gcc-fork.git] / gcc / config.gcc
index 0099148..b184a40 100644 (file)
@@ -1,5 +1,5 @@
 # GCC target-specific configuration file.
-# Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 # Free Software Foundation, Inc.
 
 #This file is part of GCC.
@@ -16,8 +16,8 @@
 
 #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, 59 Temple Place - Suite 330, Boston, MA
-#02111-1307, USA.
+#Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
+#02110-1301, USA.
 
 # This is the GCC target-specific configuration file
 # where a configuration type is mapped to different system-specific
 #                      threads support was requested.
 #
 #  default_use_cxa_atexit
-#                      "no" by default, can be set to "yes" if a target
-#                      wishes to use __cxa_atexit() by default if the
-#                      $enable___cxa_atexit variable is not set.
+#                        The default value for the $enable___cxa_atexit
+#                      variable.  enable___cxa_atexit needs to be set to
+#                      "yes" for the correct operation of C++ destructors
+#                      but it relies upon the presence of a non-standard C
+#                      library function called __cxa_atexit.
+#                        Since not all C libraries provide __cxa_atexit the
+#                      default value of $default_use_cxa_atexit is set to
+#                      "no" except for targets which are known to be OK.
 #
 #  gas_flag            Either yes or no depending on whether GNU as was
 #                      requested.
 #
 #  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 +158,7 @@ extra_parts=
 extra_programs=
 extra_objs=
 extra_gcc_objs=
+extra_options=
 c_target_objs=
 cxx_target_objs=
 tm_defines=
@@ -181,7 +189,9 @@ md_file=
 
 # Obsolete configurations.
 case ${target} in
- dummy*)
+   c4x-*               \
+ | tic4x-*             \
+ )
     if test "x$enable_obsolete" != xyes; then
       echo "*** Configuration ${target} is obsolete." >&2
       echo "*** Specify --enable-obsolete to build it anyway." >&2
@@ -224,7 +234,12 @@ esac
 # machines.
 tm_p_file=
 cpu_type=`echo ${target} | sed 's/-.*$//'`
+cpu_is_64bit=
 case ${target} in
+m32c*-*-*)
+        cpu_type=m32c
+       tmake_file=m32c/t-m32c
+        ;;
 alpha*-*-*)
        cpu_type=alpha
        need_64bit_hwint=yes
@@ -239,9 +254,14 @@ arm*-*-*)
        cpu_type=arm
        extra_headers="mmintrin.h"
        ;;
+bfin*-*)
+       cpu_type=bfin
+       ;;
 ep9312*-*-*)
        cpu_type=arm
        ;;
+frv*)  cpu_type=frv
+       ;;
 xscale-*-*)
        cpu_type=arm
        extra_headers="mmintrin.h"
@@ -280,6 +300,11 @@ powerpc*-*-*)
        cpu_type=rs6000
        extra_headers="ppc-asm.h altivec.h spe.h"
        need_64bit_hwint=yes
+       case x$with_cpu in
+           xpowerpc64|xdefault64|x6[23]0|x970|xG5|xpower[3456]|xrs64a)
+               cpu_is_64bit=yes
+               ;;
+       esac
        ;;
 rs6000*-*-*)
        need_64bit_hwint=yes
@@ -292,6 +317,7 @@ sparc*-*-*)
        cpu_type=sparc
        ;;
 s390*-*-*)
+       cpu_type=s390
        need_64bit_hwint=yes
        ;;
 # Note the 'l'; we need to be able to match e.g. "shle" or "shl".
@@ -314,6 +340,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-*-*)
@@ -331,18 +361,15 @@ esac
 # Common parts for widely ported systems.
 case ${target} in
 *-*-darwin*)
-  case ${target} in
-    *-darwin[0-6]*) ;;
-    *) tm_file="${tm_file} darwin7.h" ;;
-  esac
-  tm_file="${tm_file} darwin.h"
+  tm_file="${tm_file} darwin.h ${cpu_type}/darwin.h"
   tm_p_file="${tm_p_file} darwin-protos.h"
-  tmake_file="t-darwin t-slibgcc-darwin"
+  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"
-  extra_parts="crt2.o"
   extra_objs="darwin.o"
+  default_use_cxa_atexit=yes
   case ${enable_threads} in
     "" | yes | posix) thread_file='posix' ;;
   esac
@@ -384,6 +411,12 @@ case ${target} in
       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
@@ -418,12 +451,23 @@ case ${target} in
 *-*-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"
+  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
+    *-*-*uclibc*)
+      tm_defines="${tm_defines} UCLIBC_DEFAULT=1"
+      ;;
+    *)
+      tm_defines="${tm_defines} UCLIBC_DEFAULT=0"
+      ;;
+  esac
+  # Assume that glibc or uClibc are being used and so __cxa_atexit is provided.
+  default_use_cxa_atexit=yes
   ;;
 *-*-gnu*)
   # On the Hurd, the setup is just about the same on
@@ -445,6 +489,8 @@ case ${target} in
       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
   ;;
 *-*-netbsd*)
   tmake_file="t-slibgcc-elf-ver t-libc-ok t-netbsd t-libgcc-pic"
@@ -505,14 +551,18 @@ case ${target} in
   ;;
 *-*-vxworks*)
   tmake_file=t-vxworks
-  tm_file="${tm_file} elfos.h svr4.h vxworks.h"
+  tm_file="${tm_file} elfos.h svr4.h"
+  xm_defines=POSIX
+  extra_options="${extra_options} vxworks.opt"
   case ${enable_threads} in
     no) ;;
     "" | yes | vxworks) thread_file='vxworks' ;;
     *) echo 'Unknown thread configuration for VxWorks'; exit 1 ;;
   esac
-  use_collect2=yes
-  xm_defines=POSIX
+  ;;
+*-*-elf)
+  # Assume that newlib is being used and so __cxa_atexit is provided.
+  default_use_cxa_atexit=yes
   ;;
 esac
 
@@ -540,7 +590,7 @@ alpha*-*-unicosmk*)
 alpha*-*-linux*)
        tm_file="${tm_file} alpha/elf.h alpha/linux.h alpha/linux-elf.h"
        target_cpu_default="MASK_GAS"
-       tmake_file="${tmake_file} alpha/t-crtfm alpha/t-alpha alpha/t-ieee"
+       tmake_file="${tmake_file} alpha/t-crtfm alpha/t-alpha alpha/t-ieee alpha/t-linux"
        ;;
 alpha*-*-gnu*)
        target_cpu_default="MASK_GAS"
@@ -558,7 +608,7 @@ alpha*-*-netbsd*)
        tmake_file="${tmake_file} alpha/t-alpha alpha/t-ieee"
        ;;
 alpha*-*-openbsd*)
-       tm_defines="OBSD_NO_DYNAMIC_LIBRARIES OBSD_HAS_DECLARE_FUNCTION_NAME OBSD_HAS_DECLARE_FUNCTION_SIZE OBSD_HAS_DECLARE_OBJECT"
+       tm_defines="${tm_defines} OBSD_NO_DYNAMIC_LIBRARIES OBSD_HAS_DECLARE_FUNCTION_NAME OBSD_HAS_DECLARE_FUNCTION_SIZE OBSD_HAS_DECLARE_OBJECT"
        tm_file="alpha/alpha.h openbsd.h alpha/openbsd.h"
        # default x-alpha is only appropriate for dec-osf.
        target_cpu_default="MASK_GAS"
@@ -579,15 +629,15 @@ alpha*-dec-osf[45]*)
        extra_headers=va_list.h
        case ${target} in
          *-*-osf4*)
-           # Set target_cpu_default except on 4.0a.
+           # Define TARGET_SUPPORT_ARCH except on 4.0a.
            case ${target} in
                *-*-osf4.0a) ;;
-               *) target_cpu_default=MASK_SUPPORT_ARCH
+               *) tm_defines="${tm_defines} TARGET_SUPPORT_ARCH=1"
            esac
            ;;
          *-*-osf5*)
            tm_file="${tm_file} alpha/osf5.h"
-           target_cpu_default=MASK_SUPPORT_ARCH
+           tm_defines="${tm_defines} TARGET_SUPPORT_ARCH=1"
            ;;
        esac
        case ${enable_threads} in
@@ -643,10 +693,24 @@ arm*-*-netbsd*)
        use_collect2=yes
        ;;
 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 arm/aout.h arm/arm.h"
-       tmake_file="${tmake_file} arm/t-arm arm/t-linux"
-       extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-       gnu_ld=yes
+       tm_file="dbxelf.h elfos.h linux.h arm/elf.h arm/linux-gas.h arm/linux-elf.h" 
+       tmake_file="${tmake_file} t-linux arm/t-arm"
+       case ${target} in
+       arm*-*-linux-*eabi)
+           tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h"
+           tmake_file="$tmake_file arm/t-arm-elf arm/t-bpabi arm/t-linux-eabi"
+           # 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
+           ;;
+       *)
+           tmake_file="$tmake_file arm/t-linux"
+           ;;
+       esac
+       tm_file="$tm_file arm/aout.h arm/arm.h"
        ;;
 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"
@@ -672,7 +736,7 @@ arm*-*-eabi* | 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"
+         tmake_file="${tmake_file} arm/t-symbian"
          ;;
        esac
        tm_file="${tm_file} arm/aout.h arm/arm.h"
@@ -688,11 +752,13 @@ arm*-*-elf | ep9312-*-elf)
 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"
        tmake_file="arm/t-arm arm/t-wince-pe"
+       extra_options="${extra_options} arm/pe.opt"
        extra_objs="pe.o"
        ;;
 arm-*-pe*)
        tm_file="arm/semi.h arm/aout.h arm/arm.h arm/coff.h dbxcoff.h arm/pe.h"
        tmake_file="arm/t-arm arm/t-pe"
+       extra_options="${extra_options} arm/pe.opt"
        extra_objs="pe.o"
        ;;
 arm*-*-kaos*)
@@ -707,6 +773,21 @@ 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
+        ;;
+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
+        ;;
+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"
@@ -722,16 +803,24 @@ cris-*-aout)
        tm_file="dbxelf.h ${tm_file} cris/aout.h"
        gas=yes
        tmake_file="cris/t-cris cris/t-aout"
+       extra_options="${extra_options} cris/aout.opt"
        ;;
 cris-*-elf | cris-*-none)
        tm_file="dbxelf.h elfos.h ${tm_file}"
        tmake_file="cris/t-cris cris/t-elfmulti"
        gas=yes
+       extra_options="${extra_options} cris/elf.opt"
        ;;
 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"
+       ;;
+crx-*-elf)
+       tm_file="elfos.h ${tm_file}"
+       extra_parts="crtbegin.o crtend.o"
+       use_collect2=no
        ;;
 fr30-*-elf)
        tm_file="dbxelf.h elfos.h svr4.h ${tm_file}"
@@ -749,10 +838,14 @@ frv-*-*linux*)
                 linux.h frv/linux.h frv/frv-abi.h"
        tmake_file="${tmake_file} frv/t-frv frv/t-linux"
        ;;
-h8300-*-rtems*)
+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"
+       ;;
 h8300-*-elf*)
        tmake_file="h8300/t-h8300 h8300/t-elf"
        tm_file="h8300/h8300.h dbxelf.h elfos.h h8300/elf.h"
@@ -775,10 +868,11 @@ hppa*-*-linux* | parisc*-*-linux*)
        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"
-       # if not configured with --enable-sjlj-exceptions, bump the
-       # libgcc version number
-       if test x$sjlj != x1; then
-           tmake_file="$tmake_file pa/t-slibgcc-elf-ver"
+       # Set the libgcc version number
+       if test x$sjlj = x1; then
+           tmake_file="$tmake_file pa/t-slibgcc-sjlj-ver"
+       else
+           tmake_file="$tmake_file pa/t-slibgcc-dwarf-ver"
        fi
        ;;
 # port not yet contributed.
@@ -797,12 +891,6 @@ hppa1.1-*-osf*)
        tmake_file="pa/t-pa"
        use_collect2=yes
        ;;
-hppa1.1-*-rtems*)
-       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"
        tm_file="${tm_file} pa/pa32-regs.h dbxelf.h pa/som.h"
@@ -817,12 +905,14 @@ hppa[12]*-*-hpux10*)
        esac
        tm_file="${tm_file} pa/pa32-regs.h dbxelf.h pa/som.h \
                 pa/pa-hpux.h pa/pa-hpux10.h"
+       extra_options="${extra_options} pa/pa-hpux.opt"
        case ${target} in
        *-*-hpux10.[1-9]*)
                tm_file="${tm_file} pa/pa-hpux1010.h"
+               extra_options="${extra_options} pa/pa-hpux1010.opt"
                ;;
        esac
-       tmake_file="pa/t-pa pa/t-pa-hpux pa/t-hpux-shlib"
+       tmake_file="pa/t-pa-hpux10 pa/t-pa-hpux pa/t-hpux-shlib"
        case ${enable_threads} in
          "")
            if test x$have_pthread_h = xyes ; then
@@ -833,8 +923,15 @@ hppa[12]*-*-hpux10*)
            tmake_file="${tmake_file} pa/t-dce-thr"
            ;;
        esac
+       # Set the libgcc version number
+       if test x$sjlj = x1; then
+           tmake_file="$tmake_file pa/t-slibgcc-sjlj-ver"
+       else
+           tmake_file="$tmake_file pa/t-slibgcc-dwarf-ver"
+       fi
        use_collect2=yes
        use_fixproto=yes
+       gas=yes
        ;;
 hppa*64*-*-hpux11*)
        target_cpu_default="MASK_PA_11|MASK_PA_20"
@@ -842,30 +939,36 @@ hppa*64*-*-hpux11*)
        then
                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"
-       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"
-       fi
+       tm_file="pa/pa64-start.h ${tm_file} dbxelf.h elfos.h \
+                pa/pa64-regs.h pa/pa-hpux.h pa/pa-hpux1010.h \
+                pa/pa-hpux11.h"
        case ${target} in
-       *-*-hpux11.11)
+       *-*-hpux11.[1-9]*)
                tm_file="${tm_file} pa/pa-hpux1111.h pa/pa-64.h pa/pa64-hpux.h"
+               extra_options="${extra_options} pa/pa-hpux1111.opt"
                ;;
        *)
                tm_file="${tm_file} pa/pa-64.h pa/pa64-hpux.h"
                ;;
        esac
+       extra_options="${extra_options} pa/pa-hpux.opt \
+                      pa/pa-hpux1010.opt pa/pa64-hpux.opt"
        need_64bit_hwint=yes
-       tmake_file="pa/t-pa64 pa/t-pa-hpux"
-       extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o"
+       tmake_file="pa/t-pa64 pa/t-pa-hpux pa/t-hpux-shlib"
+       # Set the libgcc version number
+       if test x$sjlj = x1; then
+           tmake_file="$tmake_file pa/t-slibgcc-sjlj-ver"
+       else
+           tmake_file="$tmake_file pa/t-slibgcc-dwarf-ver"
+       fi
+       extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o \
+                    libgcc_stub.a"
        case x${enable_threads} in
        xyes | xposix )
                thread_file=posix 
                ;;
        esac
+       gas=yes
        ;;
 hppa[12]*-*-hpux11*)
        case ${target} in
@@ -874,22 +977,31 @@ hppa[12]*-*-hpux11*)
                ;;
        esac
        tm_file="${tm_file} pa/pa32-regs.h dbxelf.h pa/som.h \
-                pa/pa-hpux.h pa/pa-hpux11.h"
+                pa/pa-hpux.h pa/pa-hpux1010.h pa/pa-hpux11.h"
+       extra_options="${extra_options} pa/pa-hpux.opt pa/pa-hpux1010.opt"
        case ${target} in
        *-*-hpux11.[1-9]*)
                tm_file="${tm_file} pa/pa-hpux1111.h"
+               extra_options="${extra_options} pa/pa-hpux1111.opt"
                ;;
        esac
-       tmake_file="pa/t-pa pa/t-pa-hpux pa/t-hpux-shlib"
+       tmake_file="pa/t-pa-hpux11 pa/t-pa-hpux pa/t-hpux-shlib"
+       # Set the libgcc version number
+       if test x$sjlj = x1; then
+           tmake_file="$tmake_file pa/t-slibgcc-sjlj-ver"
+       else
+           tmake_file="$tmake_file pa/t-slibgcc-dwarf-ver"
+       fi
        case x${enable_threads} in
        xyes | xposix )
                thread_file=posix 
                ;;
        esac
        use_collect2=yes
+       gas=yes
        ;;
 i[34567]86-*-darwin*)
-       tm_file="${tm_file} i386/darwin.h"
+       # All the configuration is presently done generically.
        ;;
 i[34567]86-*-elf*)
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h i386/i386elf.h"
@@ -901,7 +1013,6 @@ i[34567]86-sequent-ptx4* | i[34567]86-sequent-sysv4*)
        then
                tm_file="${tm_file} usegas.h"
        fi
-       xm_defines="SMALL_ARG_MAX"
        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"
@@ -942,11 +1053,10 @@ i[34567]86-*-openbsd2.*|i[34567]86-*openbsd3.[0123])
        use_collect2=yes
        ;;
 i[34567]86-*-openbsd*)
-       tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h i386/i386elf.h"
+       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
-       stabs=yes
        ;;
 i[34567]86-*-coff*)
        tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h dbxcoff.h i386/i386-coff.h"
@@ -960,7 +1070,7 @@ i[34567]86-*-linux* | i[34567]86-*-kfreebsd*-gnu | i[34567]86-*-knetbsd*-gnu)
        i[34567]86-*-knetbsd*-gnu) tm_file="${tm_file} knetbsd-gnu.h i386/knetbsd-gnu.h" ;;
        i[34567]86-*-kfreebsd*-gnu) tm_file="${tm_file} kfreebsd-gnu.h i386/kfreebsd-gnu.h" ;;
        esac
-       tmake_file="${tmake_file} i386/t-crtstuff"
+       tmake_file="${tmake_file} i386/t-crtstuff 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 \
@@ -969,7 +1079,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"
+       tmake_file="${tmake_file} i386/t-linux64 i386/t-crtfm t-dfprules"
        ;;
 i[34567]86-*-gnu*)
        ;;
@@ -977,6 +1087,7 @@ 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
+       extra_options="${extra_options} i386/djgpp.opt"
        gnu_ld=yes
        gas=yes
        ;;
@@ -985,6 +1096,7 @@ i[34567]86-*-lynxos*)
        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"
+       extra_options="${extra_options} lynx.opt"
        thread_file=lynx
        gnu_ld=yes
        gas=yes
@@ -1027,14 +1139,18 @@ i[34567]86-*-sco3.2v5*) # 80386 running SCO Open Server 5
        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*)
-       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"
        case ${target} in
        *-*-solaris2.[0-6] | *-*-solaris2.[0-6].*)
-               tm_file="${tm_file} sol26.h"
+               tm_file="${tm_file} sol2-6.h"
+               ;;
+       *-*-solaris2.1[0-9]*)
+               tm_file="${tm_file} sol2-10.h"
+               ;;
        esac
        tm_file="${tm_file} i386/sol2.h"
        tmake_file="t-sol2 i386/t-sol2 t-svr4"
@@ -1049,12 +1165,12 @@ i[34567]86-*-solaris2*)
                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
        case ${target} in
-       *-*-solaris2.1[0-9])
+       *-*-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"
@@ -1097,7 +1213,6 @@ i[34567]86-*-sysv5*)           # Intel x86 on System V Release 5
        use_fixproto=yes
        ;;
 i[34567]86-*-sysv4*)           # Intel 80386's running system V.4
-       xm_defines="SMALL_ARG_MAX"
        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
@@ -1107,18 +1222,28 @@ i[34567]86-*-sysv4*)            # Intel 80386's running system V.4
        extra_parts="crtbegin.o crtend.o"
        use_fixproto=yes
        ;;
-i[4567]86-wrs-vxworks)
-       tm_file="${tm_file} i386/sysv4.h i386/unix.h i386/vxworks.h"
-       tmake_file="${tmake_file} i386/t-vxworks"
+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"
+       case ${target} in
+         *-vxworksae*)
+           tm_file="${tm_file} vxworksae.h i386/vxworksae.h"
+           tmake_file="${tmake_file} i386/t-vxworks i386/t-vxworksae"
+           ;;
+         *)
+           tm_file="${tm_file} vxworks.h i386/vxworks.h"
+           tmake_file="${tmake_file} i386/t-vxworks"
+           ;;
+       esac
        ;;
 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"
        target_gtfiles="\$(srcdir)/config/i386/winnt.c"
-       extra_objs=winnt.o
+       extra_options="${extra_options} i386/cygming.opt"
+       extra_objs="winnt.o winnt-stubs.o"
        c_target_objs=cygwin2.o
-       cxx_target_objs=cygwin2.o
+       cxx_target_objs="cygwin2.o winnt-cxx.o"
        extra_gcc_objs=cygwin1.o
        if test x$enable_threads = xyes; then
                thread_file='posix'
@@ -1129,7 +1254,9 @@ i[34567]86-*-mingw32*)
        xm_file=i386/xm-mingw32.h
        tmake_file="i386/t-cygming i386/t-mingw32"
        target_gtfiles="\$(srcdir)/config/i386/winnt.c"
-       extra_objs=winnt.o
+       extra_options="${extra_options} i386/cygming.opt"
+       extra_objs="winnt.o winnt-stubs.o"
+       cxx_target_objs=winnt-cxx.o
        case ${enable_threads} in
          "" | yes | win32) thread_file='win32' ;;
        esac
@@ -1145,6 +1272,7 @@ 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'
@@ -1167,12 +1295,6 @@ 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"
        ;;
-i860-*-sysv4*)
-        tm_file="${tm_file} elfos.h svr4.h i860/sysv4.h"
-        tmake_file="i860/t-i860 i860/t-svr4"
-        extra_parts="crtbegin.o crtend.o"
-       use_fixproto=yes
-        ;;
 ia64*-*-elf*)
        tm_file="${tm_file} dbxelf.h elfos.h ia64/sysv4.h ia64/elf.h"
        tmake_file="ia64/t-ia64"
@@ -1215,14 +1337,11 @@ 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).
        ;;
-ip2k-*-elf)
-       tm_file="elfos.h ${tm_file}"
-       use_fixproto=yes
-       ;;
 iq2000*-*-elf*)
         tm_file="svr4.h elfos.h iq2000/iq2000.h"
         tmake_file=iq2000/t-iq2000
@@ -1242,7 +1361,6 @@ m32rle-*-elf*)
        ;;
 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="t-slibgcc-elf-ver m32r/t-linux"
        gnu_ld=yes
@@ -1253,7 +1371,6 @@ m32r-*-linux*)
        ;;
 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="t-slibgcc-elf-ver m32r/t-linux"
        gnu_ld=yes
@@ -1277,6 +1394,7 @@ m68hc12-*-*|m6812-*-*)
        md_file="m68hc11/m68hc11.md"
        out_file="m68hc11/m68hc11.c"
        tmake_file="m68hc11/t-m68hc11-gas"
+       extra_options="${extra_options} m68hc11/m68hc11.opt"
        use_fixproto=yes
         ;;
 m68k-*-aout*)
@@ -1285,20 +1403,19 @@ m68k-*-aout*)
        ;;
 m68k-*-coff*)
        tmake_file=m68k/t-m68kbare
-       tm_defines="MOTOROLA USE_GAS"
+       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="MOTOROLA USE_GAS"
+       tm_defines="${tm_defines} MOTOROLA USE_GAS"
        tmake_file=m68k/t-m68kelf
        extra_parts="crtbegin.o crtend.o"
-       use_fixproto=yes
        ;;
 m68010-*-netbsdelf* | m68k*-*-netbsdelf*)
        tm_file="${tm_file} dbxelf.h elfos.h netbsd.h netbsd-elf.h m68k/netbsd-elf.h"
-       tm_defines="MOTOROLA USE_GAS"
+       tm_defines="${tm_defines} MOTOROLA USE_GAS"
        case ${target} in
        m68010*)
                target_cpu_default="0"
@@ -1310,7 +1427,7 @@ m68010-*-netbsdelf* | m68k*-*-netbsdelf*)
        ;;
 m68k*-*-openbsd*)
        # needed to unconfuse gdb
-       tm_defines="OBSD_OLD_GAS TARGET_DEFAULT=(MASK_68020|MASK_68881|MASK_BITFIELD)"
+       tm_defines="${tm_defines} OBSD_OLD_GAS TARGET_DEFAULT=(MASK_68020|MASK_68881|MASK_BITFIELD)"
        tm_file="m68k/m68k.h openbsd.h m68k/openbsd.h"
        tmake_file="t-libc-ok t-openbsd m68k/t-openbsd"
        # we need collect2 until our bug is fixed...
@@ -1318,7 +1435,7 @@ m68k*-*-openbsd*)
        ;;
 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="MOTOROLA USE_GAS"
+       tm_defines="${tm_defines} MOTOROLA USE_GAS"
        tmake_file=m68k/t-uclinux
        use_fixproto=no
        ;;
@@ -1326,7 +1443,8 @@ 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"
-       tm_defines="MOTOROLA USE_GAS"
+       extra_options="${extra_options} m68k/ieee.opt"
+       tm_defines="${tm_defines} MOTOROLA USE_GAS"
        # if not configured with --enable-sjlj-exceptions, bump the
        # libgcc version number
        if test x$sjlj != x1; then
@@ -1336,7 +1454,7 @@ m68k-*-linux*)            # Motorola m68k's running GNU/Linux
 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="MOTOROLA USE_GAS"
+       tm_defines="${tm_defines} MOTOROLA USE_GAS"
        extra_parts="crtbegin.o crtend.o"
        ;;
 mcore-*-elf)
@@ -1361,7 +1479,7 @@ mips-sgi-irix[56]*)
        *-*-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"
+               tm_defines="${tm_defines} MIPS_ISA_DEFAULT=3 MIPS_ABI_DEFAULT=ABI_N32"
                ;;
        esac
        if test "x$stabs" = xyes
@@ -1384,7 +1502,7 @@ mips*-*-netbsd*)                  # NetBSD/mips, either endian.
 mips64*-*-linux*)
        tm_file="dbxelf.h elfos.h svr4.h linux.h ${tm_file} mips/linux.h mips/linux64.h"
        tmake_file="${tmake_file} mips/t-linux64"
-       tm_defines="MIPS_ABI_DEFAULT=ABI_N32"
+       tm_defines="${tm_defines} MIPS_ABI_DEFAULT=ABI_N32"
        gnu_ld=yes
        gas=yes
        ;;
@@ -1393,12 +1511,12 @@ mips*-*-linux*)                         # Linux MIPS, either endian.
        case ${target} in
         mipsisa32*-*)
                 target_cpu_default="MASK_SOFT_FLOAT"
-               tm_defines="MIPS_ISA_DEFAULT=32"
+               tm_defines="${tm_defines} MIPS_ISA_DEFAULT=32"
                 ;;
         esac
        ;;
 mips*-*-openbsd*)
-       tm_defines="OBSD_HAS_DECLARE_FUNCTION_NAME OBSD_HAS_DECLARE_OBJECT OBSD_HAS_CORRECT_SPECS"
+       tm_defines="${tm_defines} OBSD_HAS_DECLARE_FUNCTION_NAME OBSD_HAS_DECLARE_OBJECT OBSD_HAS_CORRECT_SPECS"
        target_cpu_default="MASK_ABICALLS"
        tm_file="mips/mips.h openbsd.h mips/openbsd.h mips/sdb.h"
        case ${target} in
@@ -1410,34 +1528,34 @@ mips*-*-openbsd*)
 mipsisa32-*-elf* | mipsisa32el-*-elf*)
        tm_file="elfos.h ${tm_file} mips/elf.h"
        tmake_file=mips/t-isa3264
-       tm_defines="MIPS_ISA_DEFAULT=32 MIPS_ABI_DEFAULT=ABI_EABI"
+       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="MIPS_ISA_DEFAULT=33 MIPS_ABI_DEFAULT=ABI_EABI"
+       tm_defines="${tm_defines} MIPS_ISA_DEFAULT=33 MIPS_ABI_DEFAULT=ABI_EABI"
        use_fixproto=yes
        ;;
 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="MIPS_ISA_DEFAULT=64 MIPS_ABI_DEFAULT=ABI_EABI"
+       tm_defines="${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"
-       tm_defines="MIPS_ISA_DEFAULT=64 MIPS_CPU_STRING_DEFAULT=\\\"sr71000\\\" MIPS_ABI_DEFAULT=ABI_EABI"
+       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
        target_cpu_default="MASK_64BIT|MASK_FLOAT64"
-       tm_defines="MIPS_ISA_DEFAULT=64 MIPS_CPU_STRING_DEFAULT=\\\"sb1\\\" MIPS_ABI_DEFAULT=ABI_O64"
+       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*)
@@ -1449,7 +1567,7 @@ 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"
-       tm_defines="MIPS_ISA_DEFAULT=3 MIPS_ABI_DEFAULT=ABI_O64"
+       tm_defines="${tm_defines} MIPS_ISA_DEFAULT=3 MIPS_ABI_DEFAULT=ABI_O64"
        use_fixproto=yes
        ;;
 mips64vr-*-elf* | mips64vrel-*-elf*)
@@ -1461,7 +1579,7 @@ 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"
-       tm_defines="MIPS_ISA_DEFAULT=3 MIPS_ABI_DEFAULT=ABI_O64"
+       tm_defines="${tm_defines} MIPS_ISA_DEFAULT=3 MIPS_ABI_DEFAULT=ABI_O64"
        use_fixproto=yes
        ;;
 mips*-*-rtems*)
@@ -1497,6 +1615,10 @@ mn10300-*-*)
        use_collect2=no
        use_fixproto=yes
        ;;
+mt-*-elf)
+        tm_file="dbxelf.h elfos.h svr4.h ${tm_file}"
+        tmake_file="${tmake_file} mt/t-mt"
+        ;;
 ns32k-*-netbsdelf*)
        echo "GCC does not yet support the ${target} target"; exit 1
        ;;
@@ -1514,48 +1636,63 @@ pdp11-*-bsd)
 pdp11-*-*)
        use_fixproto=yes
        ;;
-avr-*-*)
-       use_fixproto=yes
-       ;;
 # port not yet contributed
 #powerpc-*-openbsd*)
-#      tmake_file="${tmake_file} rs6000/t-fprules "
+#      tmake_file="${tmake_file} rs6000/t-fprules rs6000/t-fprules-fpbit "
 #      extra_headers=
 #      ;;
 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";;
-       esac
-       tm_file="${tm_file} rs6000/linux64.h"
-       tmake_file="rs6000/t-fprules ${tmake_file} rs6000/t-ppccomm rs6000/t-linux64"
+       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h"
+       test x$with_cpu != x || cpu_is_64bit=yes
+       test x$cpu_is_64bit != xyes || tm_file="${tm_file} rs6000/default64.h"
+       tm_file="rs6000/biarch64.h ${tm_file} rs6000/linux64.h"
+       if test x${enable_secureplt} = xyes; then
+               tm_file="rs6000/secureplt.h ${tm_file}"
+       fi
+       extra_options="${extra_options} rs6000/sysv4.opt rs6000/linux64.opt"
+       tmake_file="t-dfprules rs6000/t-fprules ${tmake_file} rs6000/t-ppccomm rs6000/t-linux64 rs6000/t-fprules-softfp soft-fp/t-softfp"
        ;;
 powerpc64-*-gnu*)
        tm_file="${cpu_type}/${cpu_type}.h elfos.h svr4.h freebsd-spec.h gnu.h rs6000/sysv4.h rs6000/linux64.h rs6000/gnu.h"
-       tmake_file="rs6000/t-fprules t-slibgcc-elf-ver t-gnu rs6000/t-linux64"
+       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-beos"
+       tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-beos"
        extra_headers=
        use_fixproto=yes
        ;;
 powerpc-*-darwin*)
-       tm_file="${tm_file} rs6000/darwin.h"
-       tmake_file="${tmake_file} rs6000/t-darwin"
+       extra_options="${extra_options} rs6000/darwin.opt"
+       extra_parts="crt2.o"
+       case ${target} in
+         *-darwin1[0-9]* | *-darwin[8-9]*)
+           tmake_file="${tmake_file} rs6000/t-darwin8" 
+           tm_file="${tm_file} rs6000/darwin8.h"
+           ;;
+         *-darwin7*)
+           tm_file="${tm_file} rs6000/darwin7.h"
+           ;;
+         *-darwin[0-6]*)
+           ;;
+       esac
        extra_headers=altivec.h
        ;;
 powerpc*-*-freebsd*)
        tm_file="${tm_file} dbxelf.h elfos.h ${fbsd_tm_file} rs6000/sysv4.h rs6000/freebsd.h"
-       tmake_file="rs6000/t-fprules rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"
+       tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"
+       extra_options="${extra_options} rs6000/sysv4.opt"
        ;;
 powerpc-*-netbsd*)
        tm_file="${tm_file} dbxelf.h elfos.h netbsd.h netbsd-elf.h freebsd-spec.h rs6000/sysv4.h rs6000/netbsd.h"
        tmake_file="${tmake_file} rs6000/t-netbsd"
+       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-ppcos rs6000/t-ppccomm"
+       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'
@@ -1565,111 +1702,158 @@ powerpc-*-chorusos*)
        ;;
 powerpc-*-eabispe*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rs6000/eabispe.h"
+       extra_options="${extra_options} rs6000/sysv4.opt"
        tmake_file="rs6000/t-spe rs6000/t-ppccomm"
        ;;
 powerpc-*-eabisimaltivec*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rs6000/eabisim.h rs6000/eabialtivec.h"
-       tmake_file="rs6000/t-fprules rs6000/t-ppcendian rs6000/t-ppccomm"
+       extra_options="${extra_options} rs6000/sysv4.opt"
+       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/eabisim.h"
-       tmake_file="rs6000/t-fprules rs6000/t-ppcgas rs6000/t-ppccomm"
+       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"
-       tmake_file="rs6000/t-fprules rs6000/t-ppcgas rs6000/t-ppccomm"
+       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/eabialtivec.h"
-       tmake_file="rs6000/t-fprules rs6000/t-ppcendian rs6000/t-ppccomm"
+       extra_options="${extra_options} rs6000/sysv4.opt"
+       tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcendian rs6000/t-ppccomm"
        ;;
 powerpc-*-eabi*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h"
-       tmake_file="rs6000/t-fprules rs6000/t-ppcgas rs6000/t-ppccomm"
+       extra_options="${extra_options} rs6000/sysv4.opt"
+       tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
        ;;
 powerpc-*-rtems*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rs6000/rtems.h rtems.h"
-       tmake_file="rs6000/t-fprules rs6000/t-rtems t-rtems rs6000/t-ppccomm"
+       extra_options="${extra_options} rs6000/sysv4.opt"
+       tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-rtems t-rtems rs6000/t-ppccomm"
        ;;
 powerpc-*-linux*altivec*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/linux.h rs6000/linuxaltivec.h"
-       tmake_file="rs6000/t-fprules rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"
+       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*spe*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/linux.h rs6000/linuxspe.h"
-       tmake_file="rs6000/t-fprules rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"
+       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 rs6000/linux.h"
-       tmake_file="rs6000/t-fprules rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"
+       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="t-dfprules rs6000/t-fprules rs6000/t-fprules-softfp soft-fp/t-softfp rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"
+       case ${enable_targets}:${cpu_is_64bit} in
+           *powerpc64* | all:* | *:yes)
+               if test x$cpu_is_64bit = xyes; then
+                   tm_file="${tm_file} rs6000/default64.h"
+               fi
+               tm_file="rs6000/biarch64.h ${tm_file} rs6000/linux64.h"
+               tmake_file="$tmake_file rs6000/t-linux64"
+               extra_options="${extra_options} rs6000/linux64.opt"
+               ;;
+           *)
+               tm_file="${tm_file} rs6000/linux.h"
+               ;;
+       esac
+       if test x${enable_secureplt} = xyes; then
+               tm_file="rs6000/secureplt.h ${tm_file}"
+       fi
        ;;
 powerpc-*-gnu-gnualtivec*)
        tm_file="${cpu_type}/${cpu_type}.h elfos.h svr4.h freebsd-spec.h gnu.h rs6000/sysv4.h rs6000/linux.h rs6000/linuxaltivec.h rs6000/gnu.h"
-       tmake_file="rs6000/t-fprules rs6000/t-ppcos t-slibgcc-elf-ver t-gnu rs6000/t-ppccomm"
+       extra_options="${extra_options} rs6000/sysv4.opt"
+       tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcos t-slibgcc-elf-ver t-gnu rs6000/t-ppccomm"
        if test x$enable_threads = xyes; then
                thread_file='posix'
        fi
        ;;
 powerpc-*-gnu*)
        tm_file="${cpu_type}/${cpu_type}.h elfos.h svr4.h freebsd-spec.h gnu.h rs6000/sysv4.h rs6000/linux.h rs6000/gnu.h"
-       tmake_file="rs6000/t-fprules rs6000/t-ppcos t-slibgcc-elf-ver t-gnu rs6000/t-ppccomm"
+       tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcos t-slibgcc-elf-ver t-gnu rs6000/t-ppccomm"
+       extra_options="${extra_options} rs6000/sysv4.opt"
        if test x$enable_threads = xyes; then
                thread_file='posix'
        fi
        ;;
-powerpc-wrs-vxworks*)
+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} vxworks.h rs6000/vxworks.h"
-       tmake_file="${tmake_file} rs6000/t-fprules rs6000/t-ppccomm rs6000/t-vxworks"
+       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
+       case ${target} in
+         *-vxworksae*)
+           tm_file="${tm_file} vx-common.h vxworksae.h rs6000/vxworks.h rs6000/vxworksae.h"
+           tmake_file="${tmake_file} rs6000/t-vxworksae"
+           ;;
+         *-vxworks*)
+           tm_file="${tm_file} vx-common.h vxworks.h rs6000/vxworks.h"
+           ;;
+       esac
        ;;
-powerpc-wrs-windiss*)  # Instruction-level simulator for VxWorks.
+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-ppcgas rs6000/t-ppccomm"
-        thread_file=""
+       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"
        tmake_file="t-lynx rs6000/t-lynx"
+       extra_options="${extra_options} rs6000/sysv4.opt lynx.opt"
        extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
+       extra_options="${extra_options} lynx.opt"
        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"
+       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-ppcgas rs6000/t-ppccomm"
+       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/eabisim.h"
-       tmake_file="rs6000/t-fprules rs6000/t-ppcgas rs6000/t-ppccomm"
+       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"
-       tmake_file="rs6000/t-fprules rs6000/t-ppcgas rs6000/t-ppccomm"
+       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-ppcgas rs6000/t-ppccomm"
+       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-ppcgas rs6000/t-ppccomm"
+       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-newas"
+       tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-newas"
+       extra_options="${extra_options} rs6000/aix41.opt"
        use_collect2=yes
        extra_headers=
        use_fixproto=yes
@@ -1677,12 +1861,14 @@ rs6000-ibm-aix4.[12]* | powerpc-ibm-aix4.[12]*)
 rs6000-ibm-aix4.[3456789]* | powerpc-ibm-aix4.[3456789]*)
        tm_file="rs6000/biarch64.h ${tm_file} rs6000/aix.h rs6000/aix43.h rs6000/xcoff.h"
        tmake_file=rs6000/t-aix43
+       extra_options="${extra_options} rs6000/aix64.opt"
        use_collect2=yes
        thread_file='aix'
        extra_headers=
        ;;
 rs6000-ibm-aix5.1.* | powerpc-ibm-aix5.1.*)
        tm_file="rs6000/biarch64.h ${tm_file} rs6000/aix.h rs6000/aix51.h rs6000/xcoff.h"
+       extra_options="${extra_options} rs6000/aix64.opt"
        tmake_file=rs6000/t-aix43
        use_collect2=yes
        thread_file='aix'
@@ -1691,13 +1877,14 @@ rs6000-ibm-aix5.1.* | powerpc-ibm-aix5.1.*)
 rs6000-ibm-aix[56789].* | powerpc-ibm-aix[56789].*)
        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"
        use_collect2=yes
        thread_file='aix'
        extra_headers=
        ;;
 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"
+       tmake_file="${tmake_file} t-dfprules s390/t-crtstuff s390/t-linux"
        ;;
 s390x-*-linux*)
        tm_file="s390/s390x.h s390/s390.h dbxelf.h elfos.h svr4.h linux.h s390/linux.h"
@@ -1705,17 +1892,18 @@ s390x-*-linux*)
        md_file=s390/s390.md
        extra_modes=s390/s390-modes.def
        out_file=s390/s390.c
-       tmake_file="${tmake_file} s390/t-crtstuff s390/t-linux64"
+       tmake_file="${tmake_file} t-dfprules s390/t-crtstuff s390/t-linux s390/t-linux64"
        ;;
 s390x-ibm-tpf*)
-       tm_file="s390/s390x.h s390/s390.h dbxelf.h elfos.h svr4.h s390/tpf.h"
-       tm_p_file=s390/s390-protos.h
-       md_file=s390/s390.md
-       extra_modes=s390/s390-modes.def
-       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'
+        tm_file="s390/s390x.h s390/s390.h dbxelf.h elfos.h svr4.h s390/tpf.h"
+        tm_p_file=s390/s390-protos.h
+        md_file=s390/s390.md
+        extra_modes=s390/s390-modes.def
+        out_file=s390/s390.c
+        extra_parts="crtbeginS.o crtendS.o"
+        tmake_file="s390/t-crtstuff s390/t-tpf"
+        thread_file='tpf'
+       extra_options="${extra_options} s390/tpf.opt"
        ;;
 sh-*-elf* | sh[12346l]*-*-elf* | sh*-*-kaos* | \
 sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
@@ -1750,11 +1938,21 @@ 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" ;;
-       *)              tm_file="${tm_file} sh/embed-elf.h" ;;
+       sh*-superh-elf) if test x$with_libgloss != xno; then
+                               with_libgloss=yes
+                               tm_file="${tm_file} sh/newlib.h"
+                       fi
+                       tm_file="${tm_file} sh/embed-elf.h"
+                       extra_options="${extra_options} sh/superh.opt" ;;
+       *)              if test x$with_newlib = xyes \
+                          && test x$with_libgloss = xyes; then
+                               tm_file="${tm_file} sh/newlib.h"
+                       fi
+                       tm_file="${tm_file} sh/embed-elf.h" ;;
        esac
        case ${target} in
        sh5*-*-netbsd*)
@@ -1808,6 +2006,20 @@ sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
        sh2*)                   sh_cpu_target=sh2 ;;
        *)                      sh_cpu_target=sh1 ;;
        esac
+       # did the user say --without-fp ?
+       if test x$with_fp = xno; then
+               case ${sh_cpu_target} in
+               sh5-*media)     sh_cpu_target=${sh_cpu_target}-nofpu ;;
+               sh4al | sh1)    ;;
+               sh4a* )         sh_cpu_target=sh4a-nofpu ;;
+               sh4*)           sh_cpu_target=sh4-nofpu ;;
+               sh3*)           sh_cpu_target=sh3 ;;
+               sh2a*)          sh_cpu_target=sh2a-nofpu ;;
+               sh2*)           sh_cpu_target=sh2 ;;
+               *)      echo --without-fp not available for $target: ignored
+               esac
+               tm_defines="$tm_defines STRICT_NOFPU=1"
+       fi
        sh_cpu_default="`echo $with_cpu|sed s/^m/sh/|tr A-Z_ a-z-`"
        case $sh_cpu_default in
        sh5-64media-nofpu | sh5-64media | \
@@ -1822,6 +2034,7 @@ sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
        sh_multilibs=${with_multilib_list}
        if test x${sh_multilibs} = x ; then
                case ${target} in
+               sh64-superh-linux* | \
                sh[1234]*)      sh_multilibs=${sh_cpu_target} ;;
                sh64* | sh5*)   sh_multilibs=m5-32media,m5-32media-nofpu,m5-compact,m5-compact-nofpu,m5-64media,m5-64media-nofpu ;;
                sh-superh-*)    sh_multilibs=m4,m4-single,m4-single-only,m4-nofpu ;;
@@ -1829,10 +2042,13 @@ sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
                sh*-*-netbsd*)  sh_multilibs=m3,m3e,m4 ;;
                *) sh_multilibs=m1,m2,m2e,m4,m4-single,m4-single-only,m2a,m2a-single ;;
                esac
+               if test x$with_fp = xno; then
+                       sh_multilibs="`echo $sh_multilibs|sed -e s/m4/sh4-nofpu/ -e s/,m4-[^,]*//g -e s/,m[23]e// -e s/m2a,m2a-single/m2a-nofpu/ -e s/m5-..m....,//g`"
+               fi
        fi
-       target_cpu_default=SELECT_`echo ${sh_cpu_default}|tr a-z- A-Z_`
+       target_cpu_default=SELECT_`echo ${sh_cpu_default}|tr abcdefghijklmnopqrstuvwxyz- ABCDEFGHIJKLMNOPQRSTUVWXYZ_`
        tm_defines=${tm_defines}' SH_MULTILIB_CPU_DEFAULT=\"'`echo $sh_cpu_default|sed s/sh/m/`'\"'
-       sh_multilibs=`echo $sh_multilibs,$sh_cpu_default | sed -e 's/[  ,/][    ,]*/ /g' -e 's/ $//' -e s/^m/sh/ -e 's/ m/ sh/g' | tr A-Z_ a-z-`
+       sh_multilibs=`echo $sh_multilibs,$sh_cpu_default | sed -e 's/[  ,/][    ,]*/ /g' -e 's/ $//' -e 's/^m/sh/' -e 's/ m/ sh/g' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ_ abcdefghijklmnopqrstuvwxyz-`
        for sh_multilib in ${sh_multilibs}; do
                case ${sh_multilib} in
                sh1 | sh2 | sh2e | sh3 | sh3e | \
@@ -1843,7 +2059,7 @@ sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
                sh5-32media | sh5-32media-nofpu | \
                sh5-compact | sh5-compact-nofpu)
                        tmake_file="${tmake_file} sh/t-mlib-${sh_multilib}"
-                       tm_defines="$tm_defines SUPPORT_`echo $sh_multilib|tr a-z- A-Z_`"
+                       tm_defines="$tm_defines SUPPORT_`echo $sh_multilib|tr abcdefghijklmnopqrstuvwxyz- ABCDEFGHIJKLMNOPQRSTUVWXYZ_`=1"
                        ;;
                *)
                        echo "with_multilib_list=${sh_multilib} not supported."
@@ -1851,17 +2067,17 @@ sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
                        ;;
                esac
        done
-       if test x${enable_incomplete_targets} == xyes ; then
-               tm_defines="$tm_defines SUPPORT_SH1 SUPPORT_SH2E SUPPORT_SH4 SUPPORT_SH4_SINGLE SUPPORT_SH2A SUPPORT_SH2A_SINGLE SUPPORT_SH5_32MEDIA SUPPORT_SH5_32MEDIA_NOFPU SUPPORT_SH5_64MEDIA SUPPORT_SH5_64MEDIA_NOFPU"
+       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"
+       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)
@@ -1873,44 +2089,46 @@ 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"
-       ;;
-sparc-*-openbsd*)
-       tm_defines=OBSD_OLD_GAS
-       tm_file="sparc/sparc.h openbsd.h sparc/openbsd.h"
-       # needed to unconfuse gdb
-       tmake_file="t-libc-ok t-openbsd sparc/t-openbsd"
-       # we need collect2 until our bug is fixed...
-       use_collect2=yes
+       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h netbsd.h netbsd-elf.h sparc/netbsd-elf.h"
+       extra_options="${extra_options} sparc/long-double-switch.opt"
        ;;
 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"
+       extra_options="${extra_options} sparc/little-endian.opt"
        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
        ;;
 sparc-*-linux*)                # SPARC's running GNU/Linux, libc6
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/linux.h"
-       tmake_file="${tmake_file} sparc/t-crtfm"
+       extra_options="${extra_options} sparc/long-double-switch.opt"
+       tmake_file="${tmake_file} sparc/t-linux 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"
        ;;
 sparc64-*-solaris2* | sparcv9-*-solaris2*)
-       tm_file="sparc/biarch64.h ${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h sparc/sol2.h sparc/sol2-64.h sparc/sol2-bi.h tm-dwarf2.h"
+       tm_file="sparc/biarch64.h ${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h"
+       case ${target} in
+       *-*-solaris2.1[0-9]*)
+               tm_file="${tm_file} sol2-10.h"
+               ;;
+       esac
+       tm_file="${tm_file} sparc/sol2.h sparc/sol2-64.h sparc/sol2-bi.h"
        if test x$gnu_ld = xyes; then
                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.h sparc/sol2-gas-bi.h"
        fi
+       tm_file="${tm_file} tm-dwarf2.h"
        tmake_file="t-sol2 sparc/t-sol2 sparc/t-sol2-64 sparc/t-crtfm"
        if test x$gnu_ld = xyes; then
                tmake_file="$tmake_file t-slibgcc-elf-ver"
@@ -1932,7 +2150,11 @@ 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} sol26.h"
+               tm_file="${tm_file} sol2-6.h"
+               ;;
+       *-*-solaris2.1[0-9]*)
+               tm_file="${tm_file} sol2-10.h"
+               ;;
        esac
        tm_file="${tm_file} sparc/sol2.h"
        if test x$gnu_ld = xyes; then
@@ -1953,16 +2175,18 @@ sparc-*-solaris2*)
                        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 tm-dwarf2.h"
+       *-*-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
        c_target_objs="sol2-c.o"
@@ -1992,30 +2216,16 @@ sparc-*-sysv4*)
        extra_parts="crtbegin.o crtend.o"
        use_fixproto=yes
        ;;
-sparclite-*-coff*)
-       tm_file="${tm_file} sparc/lite.h svr3.h sparc/litecoff.h dbxcoff.h libgloss.h"
-       tmake_file=sparc/t-sparclite
-       ;;
-sparclite-*-elf*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h sparc/sol2.h sparc/elf.h 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"
-       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"
+       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"
+       extra_options="${extra_options} sparc/long-double-switch.opt"
        tmake_file="${tmake_file} sparc/t-crtfm"
        case "x$with_cpu" in
                xultrasparc) ;;
@@ -2025,13 +2235,15 @@ sparc64-*-freebsd*|ultrasparc-*-freebsd*)
        need_64bit_hwint=yes
        ;;
 sparc64-*-linux*)              # 64-bit SPARC's running GNU/Linux
-       tmake_file="${tmake_file} sparc/t-linux64 sparc/t-crtfm"
        tm_file="sparc/biarch64.h ${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.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"
        ;;
 sparc64-*-netbsd*)
-       tmake_file="${tmake_file} sparc/t-netbsd64"
        tm_file="sparc/biarch64.h ${tm_file}"
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h netbsd.h netbsd-elf.h sparc/netbsd-elf.h"
+       extra_options="${extra_options} sparc/long-double-switch.opt"
+       tmake_file="${tmake_file} sparc/t-netbsd64"
        ;;
 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"
@@ -2047,6 +2259,7 @@ 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
        ;;
@@ -2064,6 +2277,7 @@ v850e1-*-*)
        tmake_file=v850/t-v850e
        md_file=v850/v850.md
        out_file=v850/v850.c
+       extra_options="${extra_options} v850/v850.opt"
        if test x$stabs = xyes
        then
                tm_file="${tm_file} dbx.h"
@@ -2080,6 +2294,7 @@ v850e-*-*)
        tmake_file=v850/t-v850e
        md_file=v850/v850.md
        out_file=v850/v850.c
+       extra_options="${extra_options} v850/v850.opt"
        if test x$stabs = xyes
        then
                tm_file="${tm_file} dbx.h"
@@ -2153,6 +2368,7 @@ xstormy16-*-elf)
        tm_p_file=stormy16/stormy16-protos.h
        md_file=stormy16/stormy16.md
        out_file=stormy16/stormy16.c
+       extra_options=stormy16/stormy16.opt
        tmake_file="stormy16/t-stormy16"
        extra_parts="crtbegin.o crtend.o"
        use_fixproto=yes
@@ -2172,6 +2388,12 @@ am33_2.0-*-linux*)
        extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
        use_collect2=no
        ;;
+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
        exit 1
@@ -2207,6 +2429,9 @@ if test x$with_cpu = x ; then
       # A Cirrus ARM variant.
       with_cpu="ep9312"
       ;;
+    i386-*-*)
+      with_cpu=i386
+      ;;
     i486-*-*)
       with_cpu=i486
       ;;
@@ -2258,13 +2483,26 @@ if test x$with_cpu = x ; then
         pentium_m-*)
           with_cpu=pentium-m
           ;;
-        *)
+        pentiumpro-*)
           with_cpu=pentiumpro
           ;;
+        *)
+          with_cpu=generic
+          ;;
       esac
       ;;
     x86_64-*-*)
-      with_cpu=k8
+      case ${target_noncanonical} in
+        k8-*|opteron-*|athlon_64-*)
+          with_cpu=k8
+          ;;
+        nocona-*)
+          with_cpu=nocona
+          ;;
+        *)
+          with_cpu=generic
+          ;;
+      esac
       ;;
     alphaev6[78]*-*-*)
       with_cpu=ev67
@@ -2281,14 +2519,14 @@ if test x$with_cpu = x ; then
     alphaev5*-*-*)
       with_cpu=ev5
       ;;
-    frv-*-*linux*)
+    frv-*-*linux* | frv400-*-*linux*)
       with_cpu=fr400
       ;;
+    frv550-*-*linux*)
+      with_cpu=fr550
+      ;;
     sparc*-*-*)
       with_cpu="`echo ${target} | sed 's/-.*$//'`"
-      if [ x$with_cpu = xsparc64 ]; then
-        with_cpu=v9
-      fi
       ;;
   esac
 fi
@@ -2302,24 +2540,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
@@ -2339,7 +2577,7 @@ fi
                ;;
 
        arm*-*-*)
-               supported_defaults="arch cpu float tune fpu abi"
+               supported_defaults="arch cpu float tune fpu abi mode"
                for which in cpu tune; do
                        # See if it matches any of the entries in arm-cores.def
                        eval "val=\$with_$which"
@@ -2407,6 +2645,17 @@ fi
                        ;;
                esac
 
+               case "$with_mode" in
+               "" \
+               | arm | thumb )
+                       #OK
+                       ;;
+               *)
+                       echo "Unknown mode used in --with-mode=$with_mode"
+                       exit 1
+                       ;;
+               esac
+
                if test "x$with_arch" != x && test "x$with_cpu" != x; then
                        echo "Warning: --with-arch overrides --with-cpu=$with_cpu" 1>&2
                fi
@@ -2416,6 +2665,7 @@ fi
                supported_defaults=cpu
                case "$with_cpu" in
                fr400) ;;
+               fr550) ;;
                *)
                        echo "Unknown cpu used in --with-cpu=$with_cpu" 1>&2
                        exit 1
@@ -2466,13 +2716,21 @@ fi
                for which in arch cpu tune; do
                        eval "val=\$with_$which"
                        case ${val} in
-                       "" | i386 | i486 \
+                       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 | k8 | opteron \
-                       | athlon64 | athlon-fx | prescott | pentium-m \
-                       | pentium4m | pentium3m| nocona)
+                       | athlon-4 | athlon-xp | athlon-mp \
+                       | 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
+                                     ;;
+                               esac
+                               # OK
+                               ;;
+                       "" | k8 | opteron | athlon64 | athlon-fx | nocona | generic)
                                # OK
                                ;;
                        *)
@@ -2516,6 +2774,25 @@ fi
                esac
                ;;
 
+       mt-*-*)
+               supported_defaults="arch"
+
+               case "$with_arch" in
+               "" \
+               | ms1-64-001 \
+               | ms1-16-002 \
+               | ms1-16-003 \
+               | ms2 \
+               | "")
+                       # OK
+                       ;;
+               *)
+                       echo "Unknown arch used in --with-arch=$with_arch" 1>&2
+                       exit 1
+                       ;;
+               esac
+               ;;
+
        powerpc*-*-* | rs6000-*-*)
                supported_defaults="cpu float tune"
 
@@ -2526,14 +2803,17 @@ fi
                                with_which="with_$which"
                                eval $with_which=
                                ;;
+                       405cr)
+                               tm_defines="${tm_defines} CONFIG_PPC405CR"
+                               eval "with_$which=405"
+                               ;;
                        "" | common \
-                       | power | power2 | power3 | power4 \
-                       | powerpc | powerpc64 \
+                       | power | power[23456] | 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
                                ;;
                        *)
@@ -2550,7 +2830,7 @@ fi
                for which in arch tune; do
                        eval "val=\$with_$which"
                        case ${val} in
-                       "" | g5 | g6 | z900 | z990)
+                       "" | g5 | g6 | z900 | z990 | z9-109)
                                # OK
                                ;;
                        *)
@@ -2573,7 +2853,7 @@ fi
 
        sh[123456ble]-*-* | sh-*-*)
                supported_defaults="cpu"
-               case "`echo $with_cpu | tr A-Z_ a-z- | sed s/sh/m/`" in
+               case "`echo $with_cpu | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ_ abcdefghijklmnopqrstuvwxyz- | sed s/sh/m/`" in
                "" | m1 | m2 | m2e | m3 | m3e | m4 | m4-single | m4-single-only | m4-nofpu )
                        # OK
                        ;;
@@ -2599,7 +2879,7 @@ fi
                        "" | sparc | sparcv9 | sparc64 | sparc86x \
                        | v7 | cypress | v8 | supersparc | sparclite | f930 \
                        | f934 | hypersparc | sparclite86x | sparclet | tsc701 \
-                       | v9 | ultrasparc | ultrasparc3)
+                       | v9 | ultrasparc | ultrasparc3 | niagara)
                                # OK
                                ;;
                        *)
@@ -2632,11 +2912,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
@@ -2695,7 +2975,7 @@ fi
        mips*-*-*)
                if test x$gnu_ld = xyes
                then
-                       target_cpu_default2="MASK_SPLIT_ADDR"
+                       target_cpu_default2="MASK_SPLIT_ADDRESSES"
                fi
                case ${target} in
                        mips*el-*-*)
@@ -2729,21 +3009,23 @@ fi
                 fi
                ;;
 
+       sh[123456ble]*-*-* | sh-*-*)
+               c_target_objs="${c_target_objs} sh-c.o"
+               cxx_target_objs="${cxx_target_objs} sh-c.o"
+               ;;
+
        sparc*-*-*)
                # Some standard aliases.
                case x$with_cpu in
                xsparc)
                        with_cpu=v7
                        ;;
-               xsparc86x)
-                       with_cpu=sparclite86x
-                       ;;
                xsparcv9 | xsparc64)
                        with_cpu=v9
                        ;;
                esac
 
-               # The Sparc port checks this value at compile-time.
+               # The SPARC port checks this value at compile-time.
                target_cpu_default2="TARGET_CPU_$with_cpu"
                ;;
        v850*-*-*)
@@ -2757,44 +3039,46 @@ fi
                        ;;
                esac
                ;;
-       esac
+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
+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
+                       echo "Valid --with options are: $supported_defaults" 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