OSDN Git Service

PR target/21723
[pf3gnuchains/gcc-fork.git] / gcc / config.gcc
index a295059..66cced2 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.
@@ -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
@@ -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,14 @@ md_file=
 
 # Obsolete configurations.
 case ${target} in
- dummy*)
+   sparc-*-openbsd*    \
+ | i860-*-sysv4*       \
+ | ip2k-*-elf          \
+ | ns32k-*-netbsdelf*  \
+ | ns32k-*-netbsd*     \
+ | 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,6 +234,7 @@ esac
 # machines.
 tm_p_file=
 cpu_type=`echo ${target} | sed 's/-.*$//'`
+cpu_is_64bit=
 case ${target} in
 alpha*-*-*)
        cpu_type=alpha
@@ -239,6 +250,9 @@ arm*-*-*)
        cpu_type=arm
        extra_headers="mmintrin.h"
        ;;
+bfin*-*)
+       cpu_type=bfin
+       ;;
 ep9312*-*-*)
        cpu_type=arm
        ;;
@@ -280,6 +294,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[345]|xrs64a)
+               cpu_is_64bit=yes
+               ;;
+       esac
        ;;
 rs6000*-*-*)
        need_64bit_hwint=yes
@@ -292,6 +311,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 +334,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,13 +356,16 @@ 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"
   tmake_file="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"
@@ -579,15 +606,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="TARGET_SUPPORT_ARCH=1"
            esac
            ;;
          *-*-osf5*)
            tm_file="${tm_file} alpha/osf5.h"
-           target_cpu_default=MASK_SUPPORT_ARCH
+           tm_defines="TARGET_SUPPORT_ARCH=1"
            ;;
        esac
        case ${enable_threads} in
@@ -688,11 +715,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 +736,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 +766,19 @@ 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"
        ;;
 fr30-*-elf)
        tm_file="dbxelf.h elfos.h svr4.h ${tm_file}"
@@ -749,10 +796,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"
@@ -797,12 +848,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,9 +862,11 @@ 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"
@@ -845,21 +892,26 @@ hppa*64*-*-hpux11*)
        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/pa64-regs.h pa/pa-hpux.h pa/pa-hpux1010.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/pa64-regs.h pa/pa-hpux.h pa/pa-hpux1010.h \
+                        pa/pa-hpux11.h"
        fi
        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"
+       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 )
@@ -874,10 +926,12 @@ 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"
@@ -942,11 +996,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"
@@ -977,6 +1030,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 +1039,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,6 +1082,7 @@ 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*)
@@ -1049,12 +1105,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"
@@ -1116,6 +1172,7 @@ i[34567]86-*-pe | i[34567]86-*-cygwin*)
        xm_file=i386/xm-cygwin.h
        tmake_file="i386/t-cygwin i386/t-cygming"
        target_gtfiles="\$(srcdir)/config/i386/winnt.c"
+       extra_options="${extra_options} i386/cygming.opt"
        extra_objs=winnt.o
        c_target_objs=cygwin2.o
        cxx_target_objs=cygwin2.o
@@ -1129,6 +1186,7 @@ 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_options="${extra_options} i386/cygming.opt"
        extra_objs=winnt.o
        case ${enable_threads} in
          "" | yes | win32) thread_file='win32' ;;
@@ -1145,6 +1203,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'
@@ -1215,6 +1274,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).
@@ -1277,6 +1337,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*)
@@ -1326,6 +1387,7 @@ 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"
+       extra_options="${extra_options} m68k/ieee.opt"
        tm_defines="MOTOROLA USE_GAS"
        # if not configured with --enable-sjlj-exceptions, bump the
        # libgcc version number
@@ -1384,15 +1446,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"
-
-       # 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
        ;;
@@ -1522,24 +1576,25 @@ pdp11-*-bsd)
 pdp11-*-*)
        use_fixproto=yes
        ;;
-avr-*-*)
-       use_fixproto=yes
-       ;;
 # port not yet contributed
 #powerpc-*-openbsd*)
 #      tmake_file="${tmake_file} rs6000/t-fprules "
 #      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"
+       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="rs6000/t-fprules ${tmake_file} rs6000/t-ppccomm rs6000/t-linux64"
        ;;
 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"
+       extra_options="${extra_options} rs6000/sysv4.opt rs6000/linux64.opt"
        tmake_file="rs6000/t-fprules t-slibgcc-elf-ver t-gnu rs6000/t-linux64"
        ;;
 powerpc-*-beos*)
@@ -1551,19 +1606,28 @@ powerpc-*-beos*)
 powerpc-*-darwin*)
        tm_file="${tm_file} rs6000/darwin.h"
        tmake_file="${tmake_file} rs6000/t-darwin"
+       extra_options="${extra_options} rs6000/darwin.opt"
+       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*)
        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"
+       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"
+       extra_options="${extra_options} rs6000/sysv4.opt"
        case ${enable_threads} in
          yes | posix)
            thread_file='posix'
@@ -1573,47 +1637,74 @@ 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"
+       extra_options="${extra_options} rs6000/sysv4.opt"
        tmake_file="rs6000/t-fprules 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"
+       extra_options="${extra_options} rs6000/sysv4.opt"
        tmake_file="rs6000/t-fprules rs6000/t-ppcgas rs6000/t-ppccomm"
        ;;
 powerpc-*-elf*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h"
+       extra_options="${extra_options} rs6000/sysv4.opt"
        tmake_file="rs6000/t-fprules rs6000/t-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"
+       extra_options="${extra_options} rs6000/sysv4.opt"
        tmake_file="rs6000/t-fprules 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"
+       extra_options="${extra_options} rs6000/sysv4.opt"
        tmake_file="rs6000/t-fprules 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"
+       extra_options="${extra_options} rs6000/sysv4.opt"
        tmake_file="rs6000/t-fprules 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"
+       extra_options="${extra_options} rs6000/sysv4.opt"
        tmake_file="rs6000/t-fprules 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"
+       extra_options="${extra_options} rs6000/sysv4.opt"
        tmake_file="rs6000/t-fprules 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"
+       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h"
+       extra_options="${extra_options} rs6000/sysv4.opt"
        tmake_file="rs6000/t-fprules rs6000/t-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"
+       extra_options="${extra_options} rs6000/sysv4.opt"
        tmake_file="rs6000/t-fprules rs6000/t-ppcos t-slibgcc-elf-ver t-gnu rs6000/t-ppccomm"
        if test x$enable_threads = xyes; then
                thread_file='posix'
@@ -1622,6 +1713,7 @@ powerpc-*-gnu-gnualtivec*)
 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"
+       extra_options="${extra_options} rs6000/sysv4.opt"
        if test x$enable_threads = xyes; then
                thread_file='posix'
        fi
@@ -1632,11 +1724,13 @@ powerpc-wrs-vxworks*)
        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"
+       extra_options="${extra_options} rs6000/sysv4.opt"
        extra_headers=ppc-asm.h
        ;;
 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"
+       extra_options="${extra_options} rs6000/sysv4.opt"
         thread_file=""
        use_fixproto=yes
         ;;
@@ -1644,7 +1738,9 @@ 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
@@ -1652,32 +1748,39 @@ powerpc-*-lynxos*)
 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"
+       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"
+       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"
+       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"
+       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"
+       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"
+       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"
+       extra_options="${extra_options} rs6000/aix41.opt"
        use_collect2=yes
        extra_headers=
        use_fixproto=yes
@@ -1685,12 +1788,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'
@@ -1699,6 +1804,7 @@ 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=
@@ -1758,7 +1864,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" ;;
@@ -1851,7 +1957,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 a-z- A-Z_`=1"
                        ;;
                *)
                        echo "with_multilib_list=${sh_multilib} not supported."
@@ -1860,16 +1966,16 @@ 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"
+               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)
@@ -1881,7 +1987,8 @@ 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"
+       extra_options="${extra_options} sparc/long-double-switch.opt"
        ;;
 sparc-*-openbsd*)
        tm_defines=OBSD_OLD_GAS
@@ -1892,33 +1999,36 @@ 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"
+       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"
+       extra_options="${extra_options} sparc/long-double-switch.opt"
        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"
        ;;
 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 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"
@@ -1961,14 +2071,15 @@ 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
                ;;
@@ -2000,30 +2111,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) ;;
@@ -2033,13 +2130,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-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"
@@ -2055,6 +2154,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
        ;;
@@ -2072,6 +2172,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"
@@ -2088,6 +2189,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"
@@ -2161,6 +2263,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
@@ -2310,24 +2413,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
@@ -2534,14 +2637,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[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
                                ;;
                        *)
@@ -2640,11 +2746,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
@@ -2703,7 +2809,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-*-*)
@@ -2743,9 +2849,6 @@ fi
                xsparc)
                        with_cpu=v7
                        ;;
-               xsparc86x)
-                       with_cpu=sparclite86x
-                       ;;
                xsparcv9 | xsparc64)
                        with_cpu=v9
                        ;;
@@ -2765,44 +2868,45 @@ 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
+                       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