OSDN Git Service

2003-09-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
[pf3gnuchains/gcc-fork.git] / gcc / config.gcc
index c49dd7b..88d2258 100644 (file)
@@ -1,4 +1,4 @@
-# GCC build-, host- and target-specific configuration file.
+# GCC target-specific configuration file.
 # Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003
 # Free Software Foundation, Inc.
 
 #Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #02111-1307, USA.
 
-# This is the GCC build-, host- and target-specific configuration file
-# where a configuration type, as recognized and generated by config.bfd,
-# is mapped to different system-specific definitions and files.  This is
-# invoked by the autoconf-generated configure script, called for build,
-# host and target in that order, setting ${machine} to each.  Putting it
-# in a separate shell file lets us skip running autoconf when modifying
-# build-, host- and target-specific information.
+# This is the GCC target-specific configuration file
+# where a configuration type is mapped to different system-specific
+# definitions and files.  This is invoked by the autoconf-generated
+# configure script.  Putting it in a separate shell file lets us skip
+# running autoconf when modifying target-specific information.
 
 # This file switches on the shell variable ${machine}, and also uses the
 # following shell variables:
 #  enable_threads_flag Either the name, yes or no depending on whether
 #                      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.
+#
 #  gas_flag            Either yes or no depending on whether GNU as was
 #                      requested.
 #
@@ -83,8 +86,6 @@
 #  extra_headers       List of used header files from the directory
 #                      config/${cpu_type}.
 #
-#  host_xmake_file     List of host-specific makefile-fragments.
-#
 #  extra_passes                List of extra executables compiled for this target
 #                      machine, used for compiling from source to object.
 #
 #
 #  extra_programs      Like extra_passes, but these are used when linking.
 #
-#  host_extra_objs     List of extra host-dependent objects that should
-#                      be linked into the compiler proper.
-#
-#  host_extra_gcc_objs List of extra host-dependent objects that should
-#                      be linked into the gcc driver.
-#
-#  out_host_hook_obj   An object file that provides the host hooks.
-#
 #  c_target_objs       List of extra target-dependent objects that be
 #                      linked into the C compiler only.
 #
 #
 #  target_gtfiles       List of extra source files with type information.
 #
-#  build_xm_defines    List of macros to define when compiling for the
-#                      build machine.
-#
-#  build_xm_file       List of files to include when compiling for the
-#                      build machine.
-#
-#  host_xm_defines     List of macros to define when compiling for the
-#                      host machine.
-#
-#  host_xm_file                List of files to include when compiling for the
-#                      host machine.
-#
 #  xm_defines          List of macros to define when compiling for the
 #                      target machine.
 #
 #
 #  target_cpu_default  Set to override the default target model.
 #
-#  build_install_headers_dir
-#                      Target to use when installing header files.
-#
-#  host_truncate_target
-#                      Non-empty if the target name should be truncated
-#                      on this host, due to filename length issues.
-#
 #  gdb_needs_out_file_path
 #                      Set to yes if gdb needs a dir command with
 #                      `dirname $out_file`.
 #
-#  build_exeext                Set to the suffix, if the build machine requires
-#                      executables to have a file name suffix.
-#
-#  host_exeext         Set to the suffix, if the host machine requires
-#                      executables to have a file name suffix.
-#
 #  thread_file         Set to control which thread package to use.
 #
 #  gas                 Set to yes or no depending on whether the target
 #                      determines the underlying integral type for
 #                      HOST_WIDE_INT cannot see the definition of
 #                      MAX_LONG_TYPE_SIZE.)
+#
+#  configure_default_options
+#                      Set to an initializer for configure_default_options
+#                      in configargs.h, based on --with-cpu et cetera.
 
 # The following variables are used in each case-construct to build up the
 # outgoing variables:
 #
-#  xmake_file          Makefile-fragment when this system is as a host,
-#                      for host_xmake_file.
-#
-#  extra_host_objs     List of extra objects that should be linked into
-#                      the compiler proper when this system is a host,
-#                      for host_extra_objs.
-#
-#  host_hook_obj       An object file that provides the host hooks.
-#
-#  install_headers_dir Makefile-target for how the header file directory
-#                      is installed, when this system is a build system,
-#                      for build_install_headers_dir.
-#
-#  truncate_target     Non-empty if the target name should be truncated
-#                      when this system is a host, due to filename length
-#                      issues.  For host_truncate_target.
-#
-#  exeext              The suffix for executables on this system.
-#
 #  gnu_ld              Set to yes or no depending on whether the target
 #                      system normally uses GNU ld.
 
 out_file=
-xmake_file=
 tmake_file=
 extra_headers=
 extra_passes=
 extra_parts=
 extra_programs=
 extra_objs=
-extra_host_objs=
 extra_gcc_objs=
 c_target_objs=
 cxx_target_objs=
-host_hook_obj=host-default.o
 tm_defines=
 xm_defines=
 # Set this to force installation and use of collect2.
 use_collect2=
 # Set this to override the default target model.
 target_cpu_default=
-# Set this to control how the header file directory is installed.
-install_headers_dir=install-headers-tar
-# Set this if directory names should be truncated to 14 characters.
-truncate_target=
 # Set this if gdb needs a dir command with `dirname $out_file`
 gdb_needs_out_file_path=
-# Set this if the build machine requires executables to have a
-# file name suffix.
-exeext=
 # Set this to control which thread package will be used.
 thread_file=
 # Reinitialize these from the flag values every loop pass, since some
@@ -221,6 +164,7 @@ thread_file=
 gas="$gas_flag"
 gnu_ld="$gnu_ld_flag"
 enable_threads=$enable_threads_flag
+default_use_cxa_atexit=no
 target_gtfiles=
 need_64bit_hwint=
 
@@ -245,7 +189,8 @@ esac
 # should be in alphabetical order.
 case $machine in
    alpha*-*-linux*libc1*               \
- | i[34567]86-sequent-sysv*            \
+ | i[34567]86-sequent-sysv             \
+ | i[34567]86-sequent-sysv[123]*       \
  | i[34567]86-go32-*                   \
  | i[34567]86-*-go32*                  \
  | m68k-*-linux*aout*                  \
@@ -276,16 +221,30 @@ alpha*-*-*)
        cpu_type=alpha
        need_64bit_hwint=yes
        ;;
-arm*-*-* | strongarm*-*-* | ep9312*-*-* | xscale-*-*)
+am33_2.0-*-linux*)
+       cpu_type=mn10300
+       ;;
+strongarm*-*-*)
        cpu_type=arm
        ;;
+arm*-*-*)
+       cpu_type=arm
+       extra_headers="mmintrin.h"
+       ;;
+ep9312*-*-*)
+       cpu_type=arm
+       ;;
+xscale-*-*)
+       cpu_type=arm
+       extra_headers="mmintrin.h"
+       ;;
 i[34567]86-*-*)
        cpu_type=i386
-       extra_headers="mmintrin.h xmmintrin.h"
+       extra_headers="mmintrin.h xmmintrin.h emmintrin.h pmmintrin.h"
        ;;
 x86_64-*-*)
        cpu_type=i386
-       extra_headers="mmintrin.h xmmintrin.h"
+       extra_headers="mmintrin.h xmmintrin.h emmintrin.h pmmintrin.h"
        need_64bit_hwint=yes
        ;;
 ia64-*-*)
@@ -398,7 +357,6 @@ case $machine in
        esac
        ;;
 *-*-openbsd*)
-       tm_file=${cpu_type}/openbsd.h
        tmake_file="t-libc-ok t-openbsd t-libgcc-pic"
        if test x$enable_threads = xyes; then
                thread_file='posix'
@@ -406,7 +364,7 @@ case $machine in
        fi
        ;;
 *-*-netbsd*)
-       tmake_file="t-slibgcc-elf-ver t-libc-ok t-netbsd"
+       tmake_file="t-slibgcc-elf-ver t-libc-ok t-netbsd t-libgcc-pic"
        gas=yes
        gnu_ld=yes
 
@@ -435,6 +393,14 @@ case $machine in
                extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o"
                ;;
        esac
+
+       # NetBSD 2.0 and later provide __cxa_atexit(), which we use by
+       # default (unless overridden by --disable-__cxa_atexit).
+       case $machine in
+       *-*-netbsd[2-9]* | *-*-netbsdelf[2-9]*)
+               default_use_cxa_atexit=yes
+               ;;
+       esac
        ;;
 *-*-freebsd[12] | *-*-freebsd[12].* | *-*-freebsd*aout*)
        # This is the place-holder for the generic a.out configuration
@@ -472,7 +438,6 @@ case $machine in
        *) echo 'Please update *-*-freebsd* in gcc/config.gcc'; exit 1;;
        esac
        tmake_file="t-slibgcc-elf-ver t-freebsd"
-       xmake_file=none
        case x${enable_threads} in
        xno) fbsd_tm_file="${fbsd_tm_file} freebsd-nthr.h";;
        x | xyes | xpthreads | xposix)
@@ -498,6 +463,10 @@ case $machine in
        cxx_target_objs="darwin-c.o"
        extra_parts="crt2.o"
        extra_objs="darwin.o"
+       case x${enable_threads} in
+            x | xyes | xposix) thread_file='posix'
+            ;;
+       esac
        ;;      
 *-*-vxworks*)
        tmake_file=t-vxworks
@@ -515,9 +484,6 @@ case $machine in
        if test -f $srcdir/config/${cpu_type}/xm-$rest.h
        then xm_file=${cpu_type}/xm-$rest.h
        fi
-       if test -f $srcdir/config/${cpu_type}/x-$rest
-       then xmake_file=${cpu_type}/x-$rest
-       fi
        if test -f $srcdir/config/${cpu_type}/t-$rest
        then tmake_file=${cpu_type}/t-$rest
        fi
@@ -552,7 +518,8 @@ alpha*-*-netbsd*)
        ;;
 
 alpha*-*-openbsd*)
-       tm_file="${cpu_type}/${cpu_type}.h ${tm_file}"
+       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"
        tmake_file="alpha/t-alpha alpha/t-ieee"
@@ -573,9 +540,6 @@ alpha*-dec-osf[45]*)
        extra_headers=va_list.h
        case $machine in
          *-*-osf4*)
-           # Some versions of OSF4 (specifically X4.0-9 296.7) have
-           # a broken tar, so we use cpio instead.
-           install_headers_dir=install-headers-cpio
            # Set target_cpu_default except on 4.0a.
            case $machine in
                *-*-osf4.0a) ;;
@@ -587,21 +551,17 @@ alpha*-dec-osf[45]*)
            target_cpu_default=MASK_SUPPORT_ARCH
            ;;
        esac
+       case x${enable_threads} in
+       x | xyes | xpthreads | xposix)
+           thread_file='posix'
+           tmake_file="${tmake_file} alpha/t-osf-pthread"
+           ;;
+       esac
        ;;
 alpha64-dec-*vms*)
        tm_file="${tm_file} alpha/vms.h alpha/vms64.h"
        xm_file="alpha/xm-vms.h"
        tmake_file="alpha/t-alpha alpha/t-vms alpha/t-vms64 alpha/t-ieee"
-       xmake_file=alpha/x-vms
-       exeext=.exe
-       # This removes the cpu type and manufacturer components and
-       #  replaces "." with "_" in the operating system version.
-       case $host in *-*-*vms*)
-               target_alias=`echo $host \
-                 | sed 's/.*-.*-\(.*\)$/\1/' | sed 's/\./_/g'`
-               ;;
-       esac
-       install_headers_dir=install-headers-cp
        prefix=/gnu
        local_prefix=/gnu
        ;;
@@ -609,16 +569,6 @@ alpha*-dec-*vms*)
        tm_file="${tm_file} alpha/vms.h"
        xm_file=alpha/xm-vms.h
        tmake_file="alpha/t-alpha alpha/t-vms alpha/t-ieee"
-       xmake_file=alpha/x-vms
-       exeext=.exe
-       # This removes the cpu type and manufacturer components and
-       #  replaces "." with "_" in the operating system version.
-       case $host in *-*-*vms*)
-               target_alias=`echo $host \
-                 | sed 's/.*-.*-\(.*\)$/\1/' | sed 's/\./_/g'`
-               ;;
-       esac
-       install_headers_dir=install-headers-cp
        prefix=/gnu
        local_prefix=/gnu
        ;;
@@ -627,7 +577,7 @@ arc-*-elf*)
        extra_parts="crtinit.o crtfini.o"
        ;;
 arm-*-coff* | armel-*-coff*)
-       tm_file="arm/semi.h arm/aout.h arm/arm.h arm/coff.h"
+       tm_file="arm/semi.h arm/aout.h arm/arm.h arm/coff.h dbxcoff.h"
        tmake_file=arm/t-arm-coff
        ;;
 arm-semi-aof | armel-semi-aof)
@@ -678,12 +628,22 @@ arm*-*-elf | ep9312-*-elf)
        tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h"
        tmake_file=arm/t-arm-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-wince-pe
+       extra_objs="pe.o"
+       ;;
 arm-*-pe*)
-       tm_file="arm/semi.h arm/aout.h arm/arm.h arm/coff.h arm/pe.h"
+       tm_file="arm/semi.h arm/aout.h arm/arm.h arm/coff.h dbxcoff.h arm/pe.h"
        tmake_file=arm/t-pe
        extra_objs="pe.o"
        ;;
+arm*-*-kaos*)
+       tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h kaos.h arm/kaos-arm.h"
+       tmake_file=arm/t-arm-elf
+       ;;
 avr-*-*)
+       tm_file="avr/avr.h dbxelf.h"
        ;;
 c4x-*-rtems* | tic4x-*-rtems*)
        tmake_file="c4x/t-c4x t-rtems"
@@ -729,16 +689,17 @@ frv-*-elf)
        ;;
 h8300-*-rtems*)
        tmake_file="h8300/t-h8300 t-rtems"
-       tm_file="h8300/h8300.h h8300/rtems.h rtems.h"
+       tm_file="h8300/h8300.h dbxcoff.h h8300/coff.h h8300/rtems.h rtems.h"
        if test x$enable_threads = xyes; then
          thread_file='rtems'
        fi
        ;;
 h8300-*-elf*)
        tmake_file="h8300/t-h8300 h8300/t-elf"
-       tm_file="h8300/h8300.h h8300/elf.h"
+       tm_file="h8300/h8300.h dbxelf.h elfos.h h8300/elf.h"
        ;;
 h8300-*-*)
+       tm_file="h8300/h8300.h dbxcoff.h h8300/coff.h"
        ;;
 hppa*64*-*-linux* | parisc*64*-*-linux*)
        target_cpu_default="(MASK_PA_11 | MASK_PA_20)"
@@ -754,44 +715,40 @@ hppa*-*-linux* | parisc*-*-linux*)
                 pa/pa32-regs.h pa/pa32-linux.h"
        tmake_file="t-slibgcc-elf-ver t-linux pa/t-linux"
        ;;
-hppa*-*-openbsd*)
-       target_cpu_default="MASK_PA_11"
-       tmake_file=pa/t-bsd
-       ;;
+# port not yet contributed.
+#hppa*-*-openbsd*)
+#      target_cpu_default="MASK_PA_11"
+#      tmake_file=pa/t-bsd
+#      ;;
 hppa1.1-*-pro*)
        target_cpu_default="(MASK_JUMP_IN_DELAY | MASK_PORTABLE_RUNTIME | MASK_GAS | MASK_NO_SPACE_REGS | MASK_SOFT_FLOAT)"
        tm_file="${tm_file} pa/pa32-regs.h dbxelf.h elfos.h pa/elf.h pa/pa-pro-end.h libgloss.h"
        tmake_file="pa/t-bsd pa/t-pro"
-       xmake_file="pa/x-ada"
        ;;
 hppa1.1-*-osf*)
        target_cpu_default="MASK_PA_11"
-       tm_file="${tm_file} pa/pa32-regs.h pa/som.h pa/pa-osf.h"
+       tm_file="${tm_file} pa/pa32-regs.h dbxelf.h pa/som.h pa/pa-osf.h"
        tmake_file="pa/t-bsd pa/t-pa"
-       xmake_file="pa/x-ada"
        use_collect2=yes
        ;;
 hppa1.1-*-rtems*)
        target_cpu_default="(MASK_JUMP_IN_DELAY | MASK_PORTABLE_RUNTIME | MASK_GAS | MASK_NO_SPACE_REGS | MASK_SOFT_FLOAT)"
        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-bsd pa/t-pro t-rtems"
-       xmake_file="pa/x-ada"
        if test x$enable_threads = xyes; then
          thread_file='rtems'
        fi
        ;;
 hppa1.1-*-bsd*)
-       tm_file="${tm_file} pa/pa32-regs.h pa/som.h"
+       tm_file="${tm_file} pa/pa32-regs.h dbxelf.h pa/som.h"
        target_cpu_default="MASK_PA_11"
        tmake_file="pa/t-bsd pa/t-pa"
-       xmake_file="pa/x-ada"
        use_collect2=yes
        ;;
 hppa1.1-*-hpux10* | hppa2*-*-hpux10*)
        target_cpu_default="MASK_PA_11"
-       tm_file="${tm_file} pa/pa32-regs.h pa/long_double.h pa/som.h pa/pa-hpux.h pa/pa-hpux10.h"
+       tm_file="${tm_file} pa/pa32-regs.h pa/long_double.h dbxelf.h pa/som.h pa/pa-hpux.h pa/pa-hpux10.h"
        tmake_file="pa/t-pa pa/t-pa-hpux pa/t-hpux-shlib"
-       xmake_file="pa/x-ada"
        if test x$enable_threads = x; then
            enable_threads=$have_pthread_h
        fi
@@ -800,13 +757,11 @@ hppa1.1-*-hpux10* | hppa2*-*-hpux10*)
                tmake_file="${tmake_file} pa/t-dce-thr"
                ;;
        esac
-       install_headers_dir=install-headers-cpio
        use_collect2=yes
        ;;
 hppa1.0-*-hpux10*)
-       tm_file="${tm_file} pa/pa32-regs.h pa/long_double.h pa/som.h pa/pa-hpux.h pa/pa-hpux10.h"
+       tm_file="${tm_file} pa/pa32-regs.h pa/long_double.h dbxelf.h pa/som.h pa/pa-hpux.h pa/pa-hpux10.h"
        tmake_file="pa/t-pa pa/t-pa-hpux pa/t-hpux-shlib"
-       xmake_file="pa/x-ada"
        if test x$enable_threads = x; then
            enable_threads=$have_pthread_h
        fi
@@ -815,7 +770,6 @@ hppa1.0-*-hpux10*)
                tmake_file="${tmake_file} pa/t-dce-thr"
                ;;
        esac
-       install_headers_dir=install-headers-cpio
        use_collect2=yes
        ;;
 hppa*64*-*-hpux11*)
@@ -831,67 +785,55 @@ hppa*64*-*-hpux11*)
        fi
        need_64bit_hwint=yes
        tmake_file="pa/t-pa64 pa/t-pa-hpux"
-       xmake_file="pa/x-ada"
        target_cpu_default="(MASK_PA_11|MASK_PA_20|MASK_GAS)"
        extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o"
        if test x$gnu_ld = xyes
        then
                target_cpu_default="${target_cpu_default}|MASK_GNU_LD"
        fi
-#      if [ x$enable_threads = x ]; then
-#          enable_threads=$have_pthread_h
-#      fi
-#      if [ x$enable_threads = xyes ]; then
-#              thread_file='dce'
-#              tmake_file="${tmake_file} pa/t-dce-thr"
-#      fi
-       install_headers_dir=install-headers-cpio
+       case x${enable_threads} in
+       xyes | xposix )
+               thread_file=posix 
+               ;;
+       esac
        ;;
 hppa1.1-*-hpux11* | hppa2*-*-hpux11*)
        target_cpu_default="MASK_PA_11"
-       tm_file="${tm_file} pa/pa32-regs.h pa/long_double.h pa/som.h pa/pa-hpux.h pa/pa-hpux11.h"
+       tm_file="${tm_file} pa/pa32-regs.h pa/long_double.h dbxelf.h pa/som.h pa/pa-hpux.h pa/pa-hpux11.h"
        tmake_file="pa/t-pa pa/t-pa-hpux pa/t-hpux-shlib"
-       xmake_file="pa/x-ada"
-#      if test x$enable_threads = x; then
-#          enable_threads=$have_pthread_h
-#      fi
-#      if test x$enable_threads = xyes; then
-#              thread_file='dce'
-#              tmake_file="${tmake_file} pa/t-dce-thr"
-#      fi
-       install_headers_dir=install-headers-cpio
+       case x${enable_threads} in
+       xyes | xposix )
+               thread_file=posix 
+               ;;
+       esac
        use_collect2=yes
        ;;
 hppa1.0-*-hpux11*)
-       tm_file="${tm_file} pa/pa32-regs.h pa/long_double.h pa/som.h pa/pa-hpux.h pa/pa-hpux11.h"
+       tm_file="${tm_file} pa/pa32-regs.h pa/long_double.h dbxelf.h pa/som.h pa/pa-hpux.h pa/pa-hpux11.h"
        tmake_file="pa/t-pa pa/t-pa-hpux pa/t-hpux-shlib"
-       xmake_file="pa/x-ada"
-#      if test x$enable_threads = x; then
-#          enable_threads=$have_pthread_h
-#      fi
-#      if test x$enable_threads = xyes; then
-#              thread_file='dce'
-#              tmake_file="${tmake_file} pa/t-dce-thr"
-#      fi
-       install_headers_dir=install-headers-cpio
+       case x${enable_threads} in
+       xyes | xposix )
+               thread_file=posix 
+               ;;
+       esac
        use_collect2=yes
        ;;
 i370-*-opened*)                         # IBM 360/370/390 Architecture
        xm_defines='FATAL_EXIT_CODE=12'
-       tm_file=i370/oe.h
+       tm_file="i370/oe.h i370/i370.h"
        tmake_file="i370/t-oe i370/t-i370"
        c_target_objs="i370-c.o"
        cxx_target_objs="i370-c.o"
        ;;
 i370-*-mvs*)
        xm_defines='FATAL_EXIT_CODE=12'
-       tm_file=i370/mvs.h
+       tm_file="i370/mvs.h i370/i370.h"
        tmake_file="i370/t-i370"
        c_target_objs="i370-c.o"
        cxx_target_objs="i370-c.o"
        ;;
 i370-*-linux*)
-       tm_file="dbxelf.h elfos.h svr4.h linux.h i370/linux.h ${tm_file}"
+       tm_file="dbxelf.h elfos.h svr4.h linux.h i370/linux.h i370/i370.h"
        tmake_file="t-slibgcc-elf-ver t-linux"
        # broken_install=yes
        elf=yes
@@ -922,7 +864,6 @@ i[34567]86-sequent-ptx4* | i[34567]86-sequent-sysv4*)
        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"
-       install_headers_dir=install-headers-cpio
        ;;
 i[34567]86-*-aout*)
        tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h i386/i386-aout.h"
@@ -955,7 +896,7 @@ x86_64-*-netbsd*)
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h netbsd.h netbsd-elf.h i386/x86-64.h i386/netbsd64.h"
        ;;
 i[34567]86-*-openbsd*)
-       tm_file="${cpu_type}/${cpu_type}.h i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h openbsd-oldgas.h openbsd.h ${tm_file}"
+       tm_file="i386/i386.h i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h openbsd-oldgas.h openbsd.h i386/openbsd.h"
        # needed to unconfuse gdb
        tmake_file="t-libc-ok t-openbsd i386/t-openbsd"
        # we need collect2 until our bug is fixed...
@@ -996,15 +937,10 @@ i[34567]86-*-gnu*)
        ;;
 i[34567]86-pc-msdosdjgpp*)
        xm_file=i386/xm-djgpp.h
-       tm_file="dbxcoff.h ${tm_file} i386/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
        gnu_ld=yes
        gas=yes
-       exeext=.exe
-       case $host in *pc-msdosdjgpp*)
-               target_alias=djgpp
-               ;;
-       esac
        ;;
 i[34567]86-moss-msdos* | i[34567]86-*-moss*)
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h linux.h i386/linux.h i386/moss.h"
@@ -1015,7 +951,7 @@ i[34567]86-moss-msdos* | i[34567]86-*-moss*)
 i[34567]86-*-lynxos*)
        if test x$gas = xyes
        then
-               tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h lynx.h i386/lynx.h"
+               tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h svr3.h lynx.h i386/lynx.h"
        else
                tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h lynx-ng.h i386/lynx-ng.h"
        fi
@@ -1025,6 +961,12 @@ i[34567]86-*-mach*)
 #      tmake_file=t-libc-ok
        use_collect2=yes
        ;;
+i[34567]86-*-nto-qnx*)
+       tm_file="${tm_file} i386/att.h dbxelf.h tm-dwarf2.h elfos.h svr4.h i386/unix.h i386/nto.h"
+       tmake_file=i386/t-nto
+       gnu_ld=yes
+       gas=yes
+       ;;
 i[34567]86-*-rtems*)
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h i386/i386elf.h i386/rtemself.h rtems.h"
        extra_parts="crtbegin.o crtend.o crti.o crtn.o"
@@ -1034,7 +976,6 @@ i[34567]86-*-rtems*)
        fi
        ;;
 i[34567]86-*-sco3.2v5*)        # 80386 running SCO Open Server 5
-       install_headers_dir=install-headers-cpio
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h i386/sco5.h"
        if test x$gas = xyes
        then
@@ -1093,7 +1034,6 @@ i[34567]86-*-udk*)      # Intel x86 on SCO UW/OSR5 Dev Kit
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h i386/sysv4.h i386/sysv5.h i386/udk.h"
        tmake_file="i386/t-crtpic i386/t-udk t-svr4"
        extra_parts="crtbegin.o crtend.o"
-       install_headers_dir=install-headers-cpio
        ;;
 i[34567]86-*-sysv*)            # Intel 80386's running system V
        if test x$gas = xyes
@@ -1116,8 +1056,8 @@ i[34567]86-*-sysv*)               # Intel 80386's running system V
        tmake_file="$tmake_file i386/t-crtpic"
        ;;
 i386-*-vsta)                   # Intel 80386's running VSTa kernel
-       xm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/xm-vsta.h"
-       tm_file="${tm_file} i386/vsta.h"
+       xm_file="i386/xm-vsta.h"
+       tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/vsta.h"
        ;;
 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"
@@ -1129,18 +1069,15 @@ i[34567]86-*-pe | i[34567]86-*-cygwin*)
        if test x$enable_threads = xyes; then
                thread_file='posix'
        fi
-       exeext=.exe
        ;;
 i[34567]86-*-mingw32*)
        tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h dbxcoff.h i386/cygming.h i386/mingw32.h"
        xm_file=i386/xm-mingw32.h
        tmake_file="i386/t-cygming i386/t-mingw32"
-       xmake_file=i386/x-mingw32
        extra_objs=winnt.o
        if test x$enable_threads = xyes; then
                thread_file='win32'
        fi
-       exeext=.exe
        case $machine in
                *mingw32crt*)
                        tm_file="${tm_file} i386/crtdll.h"
@@ -1156,13 +1093,11 @@ i[34567]86-*-uwin*)
        if test x$enable_threads = xyes; then
                thread_file='win32'
        fi
-       exeext=.exe
        ;;
 i[34567]86-*-interix3*)
        tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/i386-interix.h i386/i386-interix3.h interix.h interix3.h"
        tmake_file="t-interix i386/t-interix"
        extra_objs=winnt.o
-       xmake_file="x-interix"
        if test x$enable_threads = xyes ; then
                thread_file='posix'
        fi
@@ -1181,6 +1116,15 @@ i[34567]86-*-interix*)
                tm_file="${tm_file} dbxcoff.h"
        fi
        ;;
+i[34567]86-*-kaos*)
+       tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h i386/i386elf.h kaos.h i386/kaos-i386.h"
+       tmake_file="i386/t-i386elf t-svr4"
+       ;;
+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"
+        ;;
 i960-*-coff*)
        tm_file="${tm_file} dbxcoff.h i960/i960-coff.h libgloss.h"
        tmake_file=i960/t-960bare
@@ -1235,18 +1179,27 @@ ia64*-*-hpux*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h ia64/sysv4.h ia64/hpux.h ia64/hpux_longdouble.h"
        tmake_file="ia64/t-ia64 ia64/t-hpux"
        target_cpu_default="MASK_GNU_AS"
-       if test x$enable_threads = xyes; then
-               thread_file='posix'
-       fi
+       case x$enable_threads in
+       xyes | xposix )
+               thread_file=posix
+               ;;
+       esac
        use_collect2=no
        c_target_objs="ia64-c.o"
        cxx_target_objs="ia64-c.o"
        ;;
 ip2k-*-elf)
+       tm_file="elfos.h ${tm_file}"
        ;;
+iq2000*-*-elf*)
+        tm_file="svr4.h elfos.h iq2000/iq2000.h"
+        tmake_file=iq2000/t-iq2000
+        out_file=iq2000/iq2000.c
+        md_file=iq2000/iq2000.md
+        ;;
 m32r-*-elf*)
        tm_file="dbxelf.h elfos.h svr4.h ${tm_file}"
-       extra_parts="crtinit.o crtfini.o m32rx/crtinit.o m32rx/crtfini.o"
+       extra_parts="crtinit.o crtfini.o"
        ;;
 # m68hc11 and m68hc12 share the same machine description.
 m68hc11-*-*|m6811-*-*)
@@ -1264,46 +1217,44 @@ m68hc12-*-*|m6812-*-*)
        tmake_file="m68hc11/t-m68hc11-gas"
         ;;
 m68000-hp-hpux*)               # HP 9000 series 300
+       tm_file="m68k/hp320base.h m68k/m68k.h m68k/hp320.h m68k/hp310.h"
+       tm_defines="TARGET_DEFAULT=0" # 68000, no 68881, no bitfield ops
        if test x$gas = xyes
        then
-               tm_file=m68k/hp310g.h
-       else
-               tm_file=m68k/hp310.h
+               tm_defines="${tm_defines} DBX_DEBUGGING_INFO=1 USE_GAS"
        fi
        tmake_file=m68k/t-hp320
-       install_headers_dir=install-headers-cpio
        use_collect2=yes
        ;;
 m68k-hp-hpux7*)        # HP 9000 series 300 running HPUX version 7.
+       tm_file="m68k/hp320base.h m68k/m68k.h m68k/hp320.h"
        if test x$gas = xyes
        then
-               tm_file=m68k/hp320g.h
+               tm_defines="DBX_DEBUGGING_INFO=1 USE_GAS"
        else
-               tm_file=m68k/hpux7.h
+               tm_defines="NO_DOT_IN_LABEL NO_BUGS"
        fi
-       install_headers_dir=install-headers-cpio
        use_collect2=yes
        ;;
 m68k-hp-hpux*) # HP 9000 series 300
+       tm_file="m68k/hp320base.h m68k/m68k.h m68k/hp320.h"
        if test x$gas = xyes
        then
-               tm_file=m68k/hp320g.h
-       else
-               tm_file=m68k/hp320.h
+               tm_defines="DBX_DEBUGGING_INFO=1 USE_GAS"
        fi
-       install_headers_dir=install-headers-cpio
        use_collect2=yes
        ;;
 m68k-*-aout*)
        tmake_file=m68k/t-m68kbare
-       tm_file="m68k/m68k-aout.h libgloss.h"
+       tm_file="m68k/m68k.h m68k/m68k-none.h m68k/m68kemb.h m68k/m68k-aout.h libgloss.h"
        ;;
 m68k-*-coff*)
        tmake_file=m68k/t-m68kbare
-       tm_file="m68k/m68k-coff.h dbx.h"
+       tm_defines="MOTOROLA USE_GAS"
+       tm_file="m68k/m68k.h m68k/m68k-none.h m68k/m68kemb.h dbxcoff.h m68k/coff.h dbx.h"
        ;;
 m68020-*-elf* | m68k-*-elf*)
-       tm_file="m68k/m68k-none.h m68k/m68kelf.h dbxelf.h elfos.h m68k/m68kemb.h m68k/m68020-elf.h"
+       tm_file="m68k/m68k.h m68k/m68k-none.h m68k/m68kelf.h dbxelf.h elfos.h m68k/m68kemb.h m68k/m68020-elf.h"
        tmake_file=m68k/t-m68kelf
        extra_parts="crtbegin.o crtend.o"
        ;;
@@ -1319,31 +1270,35 @@ m68010-*-netbsdelf* | m68k*-*-netbsdelf*)
        esac
        ;;
 m68k*-*-netbsd*)
-       tm_file=m68k/netbsd.h
+       tm_file="m68k/m68k.h netbsd.h netbsd-aout.h m68k/netbsd.h"
        tmake_file=t-netbsd
        extra_parts=""
        use_collect2=yes
        ;;
 m68k*-*-openbsd*)
        # needed to unconfuse gdb
+       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...
        use_collect2=yes
        ;;
 m68k-*-sysv4*)                 # Motorola m68k's running system V.4
-       tm_file=m68k/m68kv4.h
+       tm_file="m68k/m68k.h m68k/sgs.h dbxelf.h elfos.h svr4.h m68k/m68kv4.h"
+       tm_defines="MOTOROLA SGS SGS_CMP_ORDER SGS_SWITCH_TABLES"
        tmake_file=t-svr4
        extra_parts="crtbegin.o crtend.o"
        ;;
 m68k-*-linux*)         # Motorola m68k's running GNU/Linux
                                # with ELF format using glibc 2
                                # aka the GNU/Linux C library 6.
-       tm_file=m68k/linux.h
+       tm_file="m68k/m68k.h dbxelf.h elfos.h svr4.h linux.h m68k/linux.h"
+       tm_defines="MOTOROLA USE_GAS"
        tmake_file="t-slibgcc-elf-ver t-linux"
        ;;
 m68k-*-rtems*)
-       tmake_file="m68k/t-m68kbare t-rtems m68k/t-crtstuff"
-       tm_file="m68k/m68k-none.h m68k/m68kelf.h dbxelf.h elfos.h m68k/m68kemb.h m68k/m68020-elf.h m68k/rtemself.h rtems.h"
+       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"
        extra_parts="crtbegin.o crtend.o"
        if test x$enable_threads = xyes; then
          thread_file='rtems'
@@ -1354,25 +1309,27 @@ mcore-*-elf)
        tmake_file=mcore/t-mcore
        ;;
 mcore-*-pe*)
-       tm_file=mcore/mcore-pe.h
+       tm_file="svr3.h dbxcoff.h ${tm_file} mcore/mcore-pe.h"
        tmake_file=mcore/t-mcore-pe
        ;;
 mips-sgi-irix6*o32)            # SGI System V.4., IRIX 6, O32 ABI
+       tm_file="${tm_file} mips/iris5.h"
        if test x$gas = xyes
        then
-               tm_file="mips/iris5.h mips/iris5gas.h mips/iris6-o32-gas.h"
+               tm_file="${tm_file} mips/sdb.h mips/iris5gas.h mips/iris6-o32-gas.h"
                if test x$stabs = xyes
                then
-                       tm_file="${tm_file} dbx.h"
+                       tm_file="${tm_file} dbx.h mips/dbxmdebug.h"
                fi
                tmake_file=mips/t-iris5-gas
        else
-               tm_file="mips/iris5.h mips/iris6-o32-as.h"
+               tm_file="${tm_file} mips/iris6-o32-as.h"
                tmake_file=mips/t-iris5-as
        fi
        tm_file="${tm_file} mips/iris6-o32.h"
        tmake_file="${tmake_file} mips/t-iris mips/t-iris5-6"
        xm_file=mips/xm-iris5.h
+       target_cpu_default="MASK_ABICALLS"
        # mips-tfile doesn't work yet
        # See comment in mips/iris5.h file.
        use_collect2=yes
@@ -1381,21 +1338,24 @@ mips-sgi-irix6*o32)             # SGI System V.4., IRIX 6, O32 ABI
 #      fi
        ;;
 mips-sgi-irix6*)               # SGI System V.4., IRIX 6
+       tm_file="${tm_file} mips/iris5.h mips/iris6.h"
        if test "x$gnu_ld" = xyes
        then
-               tm_file="mips/iris6.h mips/iris6gld.h"
-       else
-               tm_file=mips/iris6.h
+               tm_file="${tm_file} mips/iris6gld.h"
        fi
        tmake_file="mips/t-iris mips/t-iris5-6 mips/t-iris6"
+       target_cpu_default="MASK_ABICALLS|MASK_FLOAT64|MASK_64BIT"
+       tm_defines="MIPS_ISA_DEFAULT=3 MIPS_ABI_DEFAULT=ABI_N32"
 #      if test x$enable_threads = xyes; then
 #              thread_file='irix'
 #      fi
        ;;
 mips-sgi-irix5cross64)         # Irix5 host, Irix 6 target, cross64
-       tm_file="mips/iris6.h mips/cross64.h"
+       tm_file="${tm_file} mips/iris5.h mips/iris6.h mips/cross64.h"
        xm_file=mips/xm-iris5.h
        tmake_file="mips/t-iris mips/t-cross64"
+       target_cpu_default="MASK_ABICALLS|MASK_FLOAT64|MASK_64BIT"
+       tm_defines="MIPS_ISA_DEFAULT=3 MIPS_ABI_DEFAULT=ABI_N32"
        # See comment in mips/iris[56].h files.
        use_collect2=yes
 #      if test x$enable_threads = xyes; then
@@ -1403,20 +1363,21 @@ mips-sgi-irix5cross64)          # Irix5 host, Irix 6 target, cross64
 #      fi
        ;;
 mips-sgi-irix5*)               # SGI System V.4., IRIX 5
+       tm_file="${tm_file} mips/iris5.h"
        if test x$gas = xyes
        then
-               tm_file="mips/iris5.h mips/iris5gas.h"
+               tm_file="${tm_file} mips/sdb.h mips/iris5gas.h"
                if test x$stabs = xyes
                then
-                       tm_file="${tm_file} dbx.h"
+                       tm_file="${tm_file} dbx.h mips/dbxmdebug.h"
                fi
                tmake_file=mips/t-iris5-gas
        else
-               tm_file=mips/iris5.h
                tmake_file=mips/t-iris5-as
        fi
        tmake_file="${tmake_file} mips/t-iris mips/t-iris5-6"
        xm_file=mips/xm-iris5.h
+       target_cpu_default="MASK_ABICALLS"
        # mips-tfile doesn't work yet
        # See comment in mips/iris5.h file.
        use_collect2=yes
@@ -1426,7 +1387,7 @@ mips-sgi-irix5*)          # SGI System V.4., IRIX 5
        ;;
 mips*-*-netbsd*)                       # NetBSD/mips, either endian.
        target_cpu_default="MASK_GAS|MASK_ABICALLS"
-       tm_file="elfos.h ${tm_file} mips/netbsd.h"
+       tm_file="elfos.h ${tm_file} mips/elf.h netbsd.h netbsd-elf.h mips/netbsd.h"
        tmake_file="${tmake_file}"
        ;;
 mips64*-*-linux*)
@@ -1457,12 +1418,15 @@ mips*-*-linux*)                         # Linux MIPS, either endian.
         esac
        tmake_file="t-slibgcc-elf-ver t-linux"
        ;;
-mips*el-*-openbsd*)    # mips little endian
-       target_cpu_default="MASK_GAS|MASK_ABICALLS"
-       ;;
-mips*-*-openbsd*)              # mips big endian
+mips*-*-openbsd*)
+       tm_defines="OBSD_HAS_DECLARE_FUNCTION_NAME OBSD_HAS_DECLARE_OBJECT OBSD_HAS_CORRECT_SPECS"
        target_cpu_default="MASK_GAS|MASK_ABICALLS"
-       tm_file="mips/openbsd-be.h ${tm_file}"
+       tm_file="mips/mips.h openbsd.h mips/openbsd.h mips/sdb.h"
+       case $machine in
+       mips*el-*-openbsd*) 
+           tm_defines="${tm_defines} TARGET_ENDIAN_DEFAULT=0";;
+       *)  tm_defines="${tm_defines} TARGET_ENDIAN_DEFAULT=MASK_BIG_ENDIAN";;
+        esac
        ;;
 mipsisa32-*-elf* | mipsisa32el-*-elf*)
        tm_file="${tm_file} mips/elf.h"
@@ -1516,7 +1480,7 @@ mips64orion-*-elf* | mips64orionel-*-elf*)
        ;;
 mips*-*-rtems*)
        tm_file="${tm_file} mips/elf.h mips/rtems.h rtems.h"
-       tmake_file="mips/t-elf t-rtems"
+       tmake_file="mips/t-elf t-rtems mips/t-rtems"
        if test x$enable_threads = xyes; then
          thread_file='rtems'
        fi
@@ -1553,13 +1517,18 @@ pdp11-*-*)
        ;;
 avr-*-*)
        ;;
-powerpc-*-openbsd*)
-       tmake_file="${tmake_file} rs6000/t-fprules "
-       extra_headers=
-       ;;
+# port not yet contributed
+#powerpc-*-openbsd*)
+#      tmake_file="${tmake_file} rs6000/t-fprules "
+#      extra_headers=
+#      ;;
 powerpc64-*-linux*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/linux64.h"
-       tmake_file="rs6000/t-fprules t-slibgcc-elf-ver t-linux rs6000/t-linux64"
+       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 t-slibgcc-elf-ver t-linux 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"
@@ -1572,13 +1541,10 @@ powerpc-*-beos*)
        ;;
 powerpc-*-darwin*)
        tm_file="${tm_file} rs6000/darwin.h"
-       tmake_file="rs6000/t-fprules t-darwin rs6000/t-darwin"
+       tmake_file="t-darwin rs6000/t-darwin"
        extra_headers=altivec.h
        # override ppc default
        need_64bit_hwint=
-       # powerpc-darwin host support.
-       host_hook_obj=host-darwin.o
-       xmake_file=rs6000/x-darwin
        ;;
 powerpc*-*-freebsd*)
        tm_file="${tm_file} dbxelf.h elfos.h ${fbsd_tm_file} rs6000/sysv4.h rs6000/freebsd.h"
@@ -1683,6 +1649,14 @@ 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"
        ;;
+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"
+       ;;
+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"
+       ;;
 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"
@@ -1690,14 +1664,14 @@ rs6000-ibm-aix4.[12]* | powerpc-ibm-aix4.[12]*)
        extra_headers=
        ;;
 rs6000-ibm-aix4.[3456789]* | powerpc-ibm-aix4.[3456789]*)
-       tm_file="${tm_file} rs6000/aix.h rs6000/aix43.h rs6000/xcoff.h"
+       tm_file="rs6000/biarch64.h ${tm_file} rs6000/aix.h rs6000/aix43.h rs6000/xcoff.h"
        tmake_file=rs6000/t-aix43
        use_collect2=yes
        thread_file='aix'
        extra_headers=
        ;;
 rs6000-ibm-aix5.1.* | powerpc-ibm-aix5.1.*)
-       tm_file="${tm_file} rs6000/aix.h rs6000/aix51.h rs6000/xcoff.h"
+       tm_file="rs6000/biarch64.h ${tm_file} rs6000/aix.h rs6000/aix51.h rs6000/xcoff.h"
        tmake_file=rs6000/t-aix43
        use_collect2=yes
        thread_file='aix'
@@ -1711,7 +1685,7 @@ rs6000-ibm-aix[56789].* | powerpc-ibm-aix[56789].*)
        extra_headers=
        ;;
 rs6000-*-lynxos*)
-       tm_file="lynx.h rs6000/lynx.h"
+       tm_file="svr3.h lynx.h rs6000/lynxbase.h rs6000/rs6000.h rs6000/lynx.h"
        tmake_file=rs6000/t-fprules
        use_collect2=yes
        ;;
@@ -1727,7 +1701,7 @@ s390x-*-linux*)
        out_file=s390/s390.c
        tmake_file="t-slibgcc-elf-ver t-linux s390/t-crtstuff s390/t-linux64"
        ;;
-sh-*-elf* | sh[2346l]*-*-elf*)
+sh-*-elf* | sh[2346l]*-*-elf* | sh*-*-kaos*)
        tmake_file="sh/t-sh sh/t-elf"
        case $machine in
        shl* | sh64l*)
@@ -1735,7 +1709,7 @@ sh-*-elf* | sh[2346l]*-*-elf*)
                tmake_file="${tmake_file} sh/t-le"
                ;;
        esac
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sh/embed-elf.h"
+       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sh/elf.h sh/embed-elf.h"
        case $machine in
        sh64*)
                tmake_file="${tmake_file} sh/t-sh64"
@@ -1752,23 +1726,26 @@ sh-*-elf* | sh[2346l]*-*-elf*)
        case $machine in
        sh[234]*) tmake_file="${tmake_file} sh/t-monolib" ;;
        esac
+       case $machine in
+       sh*-*-kaos*) tm_file="${tm_file} kaos.h sh/kaos-sh.h" ;;
+       esac
        ;;
 sh-*-rtemself*)
        tmake_file="sh/t-sh sh/t-elf t-rtems"
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sh/embed-elf.h sh/rtemself.h rtems.h"
+       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sh/elf.h sh/embed-elf.h sh/rtemself.h rtems.h"
        if test x$enable_threads = xyes; then
          thread_file='rtems'
        fi
        ;;
 sh-*-rtems*)
        tmake_file="sh/t-sh t-rtems"
-       tm_file="${tm_file} sh/coff.h sh/rtems.h rtems.h"
+       tm_file="${tm_file} dbxcoff.h sh/coff.h sh/rtems.h rtems.h"
        if test x$enable_threads = xyes; then
          thread_file='rtems'
        fi
        ;;
 sh-*-linux* | sh[2346lbe]*-*-linux*)
-       tmake_file="sh/t-sh sh/t-elf t-slibgcc-elf-ver t-linux sh/t-linux"
+       tmake_file="sh/t-sh sh/t-elf t-slibgcc-elf-ver t-linux"
        case $machine in
        sh*be-*-* | sh*eb-*-*) ;;
        *)
@@ -1776,6 +1753,7 @@ sh-*-linux* | sh[2346lbe]*-*-linux*)
                tmake_file="${tmake_file} sh/t-le"
                ;;
        esac
+       tmake_file="${tmake_file} sh/t-linux"
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h sh/elf.h sh/linux.h"
        case $machine in
        sh64*)
@@ -1830,7 +1808,7 @@ sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \
        esac
        ;;
 sh-*-*)
-       tm_file="${tm_file} sh/coff.h"
+       tm_file="${tm_file} dbxcoff.h sh/coff.h"
        ;;
 sparc-tti-*)
        tm_file="${tm_file} sparc/pbd.h"
@@ -1839,7 +1817,8 @@ 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_file="sparc/sparc.h ${tm_file}"
+       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...
@@ -1961,7 +1940,7 @@ sparc86x-*-elf*)
         extra_parts="crtbegin.o crtend.o"
        ;;
 sparc64-*-aout*)
-       tm_file="sparc/sparc.h aoutos.h sparc/aout.h sparc/sp64-aout.h"
+       tm_file="sparc/sparc.h sparc/aout.h sparc/sp64-aout.h"
        ;;
 sparc64-*-elf*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h sparc/sol2.h sparc/sp64-elf.h"
@@ -1971,7 +1950,6 @@ sparc64-*-elf*)
 sparc64-*-freebsd*|ultrasparc-*-freebsd*)
        tm_file="${tm_file} ${fbsd_tm_file} dbxelf.h elfos.h sparc/sysv4.h sparc/freebsd.h"
        tmake_file="${tmake_file} sparc/t-crtfm"
-       xmake_file=none
        case "x$with_cpu" in
                xultrasparc) ;;
                x) with_cpu=ultrasparc ;;
@@ -1996,18 +1974,40 @@ strongarm-*-elf*)
        extra_modes=arm/arm-modes.def
        ;;
 strongarm-*-pe)
-       tm_file="arm/semi.h arm/aout.h arm/coff.h arm/strongarm-coff.h arm/arm.h arm/pe.h arm/strongarm-pe.h"
+       tm_file="arm/semi.h arm/aout.h arm/coff.h dbxcoff.h arm/strongarm-coff.h arm/arm.h arm/pe.h arm/strongarm-pe.h"
        tmake_file=arm/t-strongarm-pe
        out_file=arm/arm.c
        md_file=arm/arm.md
        extra_modes=arm/arm-modes.def
        extra_objs=pe.o
        ;;
+strongarm-*-kaos*)
+       tm_file="arm/strongarm-elf.h dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h kaos.h arm/kaos-strongarm.h"
+       tmake_file=arm/t-strongarm-elf
+       out_file=arm/arm.c
+       md_file=arm/arm.md
+       extra_modes=arm/arm-modes.def
+       ;;
+v850e1-*-*)
+       target_cpu_default="TARGET_CPU_v850e1"
+       tm_file="dbxelf.h elfos.h svr4.h v850/v850.h"
+       tm_p_file=v850/v850-protos.h
+       tmake_file=v850/t-v850e
+       md_file=v850/v850.md
+       out_file=v850/v850.c
+       if test x$stabs = xyes
+       then
+               tm_file="${tm_file} dbx.h"
+       fi
+       use_collect2=no
+       c_target_objs="v850-c.o"
+       cxx_target_objs="v850-c.o"
+       ;;
 v850e-*-*)
        target_cpu_default="TARGET_CPU_v850e"
        tm_file="dbxelf.h elfos.h svr4.h v850/v850.h"
        tm_p_file=v850/v850-protos.h
-       tmake_file=v850/t-v850
+       tmake_file=v850/t-v850e
        md_file=v850/v850.md
        out_file=v850/v850.c
        if test x$stabs = xyes
@@ -2047,7 +2047,7 @@ vax-*-netbsd*)
        use_collect2=yes
        ;;
 vax-*-openbsd*)
-       tm_file="vax/vax.h vax/openbsd1.h openbsd.h ${tm_file}"
+       tm_file="vax/vax.h vax/openbsd1.h openbsd.h vax/openbsd.h"
        use_collect2=yes
        ;;
 vax-*-ultrix*)                 # VAXen running ultrix
@@ -2067,7 +2067,7 @@ xscale-*-elf)
        extra_modes=arm/arm-modes.def
        ;;
 xscale-*-coff)
-       tm_file="arm/semi.h arm/aout.h arm/coff.h arm/xscale-coff.h arm/arm.h"
+       tm_file="arm/semi.h arm/aout.h arm/coff.h dbxcoff.h arm/xscale-coff.h arm/arm.h"
        tmake_file=arm/t-xscale-coff
        out_file=arm/arm.c
        md_file=arm/arm.md
@@ -2090,301 +2090,533 @@ xtensa-*-linux*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h linux.h xtensa/linux.h"
        tmake_file="t-slibgcc-elf-ver t-linux xtensa/t-xtensa xtensa/t-linux"
        ;;
+am33_2.0-*-linux*)
+       tm_file="mn10300/mn10300.h dbxelf.h elfos.h linux.h mn10300/linux.h"
+       tmake_file="t-linux mn10300/t-linux"
+       gas=yes gnu_ld=yes
+       if test x$enable_threads = xyes; then
+               thread_file='posix'
+       fi
+       extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
+       use_collect2=no
+       ;;
 *)
        echo "*** Configuration $machine not supported" 1>&2
        exit 1
        ;;
 esac
 
-case $machine in
-*-*-sysv*)
-       install_headers_dir=install-headers-cpio
-       ;;
-esac
+# Support for --with-cpu and related options (and a few unrelated options,
+# too).
+       case "x$with_cpu" in
+       xyes | xno)
+               echo "--with-cpu must be passed a value" 1>&2
+               exit 1
+               ;;
+       esac
 
-# Distinguish i[34567]86
-# Also, do not run mips-tfile on MIPS if using gas.
-# Process --with-cpu= for PowerPC/rs6000
-target_cpu_default2=
-case $machine in
-i486-*-*)
-       target_cpu_default2=TARGET_CPU_DEFAULT_i486
-       ;;
-i586-*-*)
-       case $target_alias in
-               k6_2-*)
-                       target_cpu_default2=TARGET_CPU_DEFAULT_k6_2
+       # If there is no $with_cpu option, try to infer one from ${machine}.
+       # This block sets nothing except for with_cpu.
+       if test x$with_cpu = x
+       then
+               case $machine in
+               ep9312-*-*)
+                       # A Cirrus ARM variant.
+                       with_cpu="ep9312"
                        ;;
-               k6_3-*)
-                       target_cpu_default2=TARGET_CPU_DEFAULT_k6_3
+               i486-*-*)
+                       with_cpu=i486
                        ;;
-               k6-*)
-                       target_cpu_default2=TARGET_CPU_DEFAULT_k6
+               i586-*-*)
+                       case $target_alias in
+                       k6_2-*)
+                               with_cpu=k6-2
+                               ;;
+                       k6_3-*)
+                               with_cpu=k6-3
+                               ;;
+                       k6-*)
+                               with_cpu=k6
+                               ;;
+                       pentium_mmx-*|winchip_c6-*|winchip2-*|c3-*)
+                               with_cpu=pentium-mmx
+                               ;;
+                       *)
+                               with_cpu=pentium
+                               ;;
+                       esac
                        ;;
-               pentium_mmx-*|winchip_c6-*|winchip2-*|c3-*)
-                       target_cpu_default2=TARGET_CPU_DEFAULT_pentium_mmx
+               i686-*-* | i786-*-*)
+                       case $target_alias in
+                       k8-*)
+                               with_cpu=k8
+                               ;;
+                       athlon_xp-*|athlon_mp-*|athlon_4-*)
+                               with_cpu=athlon-4
+                               ;;
+                       athlon_tbird-*|athlon-*)
+                               with_cpu=athlon
+                               ;;
+                       pentium2-*)
+                               with_cpu=pentium2
+                               ;;
+                       pentium3-*)
+                               with_cpu=pentium3
+                               ;;
+                       pentium4-*)
+                               with_cpu=pentium4
+                               ;;
+                       *)
+                               with_cpu=pentiumpro
+                               ;;
+                       esac
                        ;;
-               *)
-                       target_cpu_default2=TARGET_CPU_DEFAULT_pentium
+               x86_64-*-*)
+                       with_cpu=k8
                        ;;
-       esac
-       ;;
-i686-*-* | i786-*-*)
-       case $target_alias in
-               k8-*)
-                       target_cpu_default2=TARGET_CPU_DEFAULT_k8
+               alpha*-*-*)
+                       case $machine in
+                       alphaev6[78]*)
+                               with_cpu=ev67
+                               ;;
+                       alphaev6*)
+                               with_cpu=ev6
+                               ;;
+                       alphapca56*)
+                               with_cpu=pca56
+                               ;;
+                       alphaev56*)
+                               with_cpu=ev56
+                               ;;
+                       alphaev5*)
+                               with_cpu=ev5
+                               ;;
+                       esac
                        ;;
-               athlon_xp-*|athlon_mp-*|athlon_4-*)
-                       target_cpu_default2=TARGET_CPU_DEFAULT_athlon_sse
+               sparc*-*-*)
+                       with_cpu="`echo $machine | sed 's/-.*$//'`"
+                       if [ x$with_cpu = xsparc64 ]; then
+                               with_cpu=v9
+                       fi
                        ;;
-               athlon_tbird-*|athlon-*)
-                       target_cpu_default2=TARGET_CPU_DEFAULT_athlon
+               esac
+       fi
+
+       # Similarly for --with-schedule.
+       if test x$with_schedule = x; then
+               case $machine in
+               hppa1* | parisc1*)
+                       # Override default PA8000 scheduling model.
+                       with_schedule=7100LC
                        ;;
-               pentium2-*)
-                       target_cpu_default2=TARGET_CPU_DEFAULT_pentium2
+               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.
+
+       supported_defaults=
+       case "$machine" in
+       alpha*-*-*)
+               supported_defaults="cpu tune"
+               for which in cpu tune; do
+                       eval "val=\$with_$which"
+                       case "x$val" in
+                       x \
+                       | xev4 | xev45 | x21064 | xev5 | x21164 | xev56 | x21164a \
+                       | xpca56 | x21164PC | x21164pc | xev6 | x21264 | xev67 \
+                       | x21264a)
+                               ;;
+                       *)
+                               echo "Unknown CPU used in --with-$which=$val" 1>&2
+                               exit 1
+                               ;;
+                       esac
+               done
+               ;;
+
+       arm*-*-*)
+               supported_defaults="arch cpu float tune"
+               for which in cpu tune; do
+                       eval "val=\$with_$which"
+                       case "x$val" in
+                       x \
+                       | xarm[236789] | xarm250 | xarm[67][01]0 \
+                       | xarm60 | xarm620 | xarm7d | xarm7di \
+                       | xarm7m | xarm7dm | xarm7dmi | xarm[79]tdmi \
+                       | xarm70 | xarm700i | xarm710t | xarm720 \
+                       | xarm720t | xarm740t | xarm710c | xarm920 \
+                       | xarm920t | xarm940t | xarm9e | xarm10tdmi \
+                       | xarm7100 | xarm7500 | xarm7500fe | xarm810 \
+                       | xarm1020t \
+                       | xxscale | xiwmmxt \
+                       | xep9312 \
+                       | xstrongarm | xstrongarm110 | xstrongarm11[01]0)
+                               # OK
+                               ;;
+                       *)
+                               echo "Unknown CPU used in --with-$which=$val" 1>&2
+                               exit 1
+                               ;;
+                       esac
+               done
+
+               case "x$with_arch" in
+               x \
+               | xarmv[2345] | xarmv2a | xarmv3m | xarmv4t | xarmv5t \
+               | xarmv5te | ep9312)
+                       # OK
                        ;;
-               pentium3-*)
-                       target_cpu_default2=TARGET_CPU_DEFAULT_pentium3
+               *)
+                       echo "Unknown arch used in --with-arch=$with_arch" 1>&2
+                       exit 1
                        ;;
-               pentium4-*)
-                       target_cpu_default2=TARGET_CPU_DEFAULT_pentium4
+               esac
+
+               case "x$with_float" in
+               x \
+               | xsoft | xhard)
+                       # OK
                        ;;
                *)
-                       target_cpu_default2=TARGET_CPU_DEFAULT_pentiumpro
-                       ;;
-       esac
-       ;;
-x86_64-*-*)
-       # We should have hammer chip here, but it does not exist yet and
-       # thus it is not supported.  Athlon_SSE is probably equivalent feature
-       # wise to hammer from our point of view except for 64bit mode.
-       target_cpu_default2=TARGET_CPU_DEFAULT_k8
-       ;;
-alpha*-*-*)
-       case $machine in
-               alphaev6[78]*)
-                       target_cpu_default2="MASK_CPU_EV6|MASK_BWX|MASK_MAX|MASK_FIX|MASK_CIX"
+                       echo "Unknown floating point type used in --with-float=$with_float" 1>&2
+                       exit 1
                        ;;
-               alphaev6*)
-                       target_cpu_default2="MASK_CPU_EV6|MASK_BWX|MASK_MAX|MASK_FIX"
+               esac
+
+               if test "x$with_arch" != x && test "x$with_cpu" != x; then
+                       echo "Warning: --with-arch overrides --with-cpu" 1>&2
+               fi
+               ;;
+
+       hppa*-*-* | parisc*-*-*)
+               supported_defaults="arch schedule"
+
+               case "x$with_arch" in
+               x | x1.0 | x1.1 | x2.0)
+                       # OK
                        ;;
-               alphapca56*)
-                       target_cpu_default2="MASK_CPU_EV5|MASK_BWX|MASK_MAX"
+               *)
+                       echo "Unknown architecture used in --with-arch=$with_arch" 1>&2
+                       exit 1
                        ;;
-               alphaev56*)
-                       target_cpu_default2="MASK_CPU_EV5|MASK_BWX"
+               esac
+
+               case "x$with_schedule" in
+               x | x700 | x7100 | x7100LC | x7200 | x7300 | x8000)
+                       # OK
                        ;;
-               alphaev5*)
-                       target_cpu_default2="MASK_CPU_EV5"
+               *)
+                       echo "Unknown processor used in --with-schedule=$with_schedule." 1>&2
+                       exit 1
                        ;;
-       esac
+               esac
+               ;;
 
-       if test x$gas = xyes
-       then
-               if test "$target_cpu_default2" = ""
-               then
-                       target_cpu_default2="MASK_GAS"
-               else
-                       target_cpu_default2="${target_cpu_default2}|MASK_GAS"
-               fi
-       fi
-       ;;
-arm*-*-* | xscale-*-*)
-       case "x$with_cpu" in
-               x)
-                       # The most generic
-                       target_cpu_default2="TARGET_CPU_generic"
-                       ;;
+       i[34567]86-*-* | x86_64-*-*)
+               supported_defaults="arch cpu tune"
+               for which in arch cpu tune; do
+                       eval "val=\$with_$which"
+                       case "x$val" in
+                       x \
+                       | xi386 | xi486 \
+                       | xi586 | xpentium | xpentium-mmx | xwinchip-c6 | xwinchip2 \
+                       | xc3 | xc3-2 | xi686 | xpentiumpro | xpentium2 | xpentium3 \
+                       | xpentium4 | xk6 | xk6-2 | xk6-3 | xathlon | xathlon-tbird \
+                       | xathlon-4 | xathlon-xp | xathlon-mp | xk8)
+                               # OK
+                               ;;
+                       *)
+                               echo "Unknown CPU given in --with-$which=$val." 1>&2
+                               exit 1
+                               ;;
+                       esac
+               done
+               ;;
 
-               # Distinguish cores, and major variants
-               # arm7m doesn't exist, but D & I don't affect code
-               xarm[236789] | xarm250 | xarm[67][01]0 \
-               | xarm7m | xarm7dm | xarm7dmi | xarm[79]tdmi \
-               | xarm7100 | xarm7500 | xarm7500fe | xarm810 \
-               | xxscale | xiwmmxt \
-               | xep9312 \
-               | xstrongarm | xstrongarm110 | xstrongarm1100)
-                       target_cpu_default2="TARGET_CPU_$with_cpu"
+       mips*-*-*)
+               supported_defaults="abi arch float tune"
+
+               case "x$with_float" in
+               x \
+               | xsoft | xhard)
+                       # OK
                        ;;
+               *)
+                       echo "Unknown floating point type used in --with-float=$with_float" 1>&2
+                       exit 1
+                       ;;
+               esac
 
-               xyes | xno)
-                       echo "--with-cpu must be passed a value" 1>&2
+               case "x$with_abi" in
+               x \
+               | x32 | xo64 | xn32 | x64 | xeabi)
+                       # OK
+                       ;;
+               *)
+                       echo "Unknown ABI used in --with-abi=$with_abi" 1>&2
                        exit 1
                        ;;
+               esac
+               ;;
+
+       powerpc*-*-* | rs6000-*-*)
+               supported_defaults="cpu float tune"
+
+               for which in cpu tune; do
+                       eval "val=\$with_$which"
+                       case "x$val" in
+                       x \
+                       | xdefault32 | xdefault64 \
+                       | xcommon \
+                       | xpower | xpower2 | xpower3 | xpower4 \
+                       | xpowerpc | xpowerpc64 \
+                       | xrios | xrios1 | xrios2 | xrsc | xrsc1 | xrs64a \
+                       | x401 | x403 | x405 | x405fp | x440 | x440fp | x505 \
+                       | x601 | x602 | x603 | x603e | xec603e | x604 \
+                       | x604e | x620 | x630 | x740 | x750 | x7400 | x7450 \
+                       | x8540 | x801 | x821 | x823 | x860 | x970)
+                               # OK
+                               ;;
+                       *)
+                               echo "Unknown cpu used in --with-$which=$val." 1>&2
+                               exit 1
+                               ;;
+                       esac
+               done
+               ;;
+
+       s390*-*-*)
+               supported_defaults="arch mode tune"
+
+               for which in arch tune; do
+                       eval "val=\$with_$which"
+                       case x$val in
+                       x \
+                       | xg5 | xg6 | xz900 | xz990)
+                               # OK
+                               ;;
+                       *)
+                               echo "Unknown cpu used in --with-$which=$val." 1>&2
+                               exit 1
+                               ;;
+                       esac
+               done
 
+               case "x$with_mode" in
+               x \
+               | xesa | xzarch)
+                       # OK
+                       ;;
                *)
-                       if test x$pass2done = xyes
-                       then
-                               echo "Unknown cpu used with --with-cpu=$with_cpu" 1>&2
+                       echo "Unknown architecture mode used in --with-mode=$with_mode." 1>&2
+                       exit 1
+                       ;;
+               esac
+               ;;
+
+       sparc*-*-*)
+               supported_defaults="cpu float tune"
+
+               for which in cpu tune; do
+                       eval "val=\$with_$which"
+                       case x$val in
+                       x \
+                       | xsparc | xsparcv9 | xsparc64 | xsparc86x \
+                       | xv7 | xcypress | xv8 | xsupersparc | xsparclite | xf930 \
+                       | xf934 | xhypersparc | xsparclite86x | xsparclet | tsc701 \
+                       | xv9 | xultrasparc | xultrasparc3)
+                               # OK
+                               ;;
+                       *)
+                               echo "Unknown cpu used in --with-$which=$val" 1>&2
                                exit 1
-                       fi
+                               ;;
+                       esac
+               done
+
+               case "x$with_float" in
+               x \
+               | xsoft | xhard)
+                       # OK
                        ;;
-       esac
-       case $machine in
-               9ep9312-*-*)
-                       target_cpu_default2="TARGET_CPU_9ep9312"
+               *)
+                       echo "Unknown floating point type used in --with-float=$with_float" 1>&2
+                       exit 1
                        ;;
-       esac
-       ;;
+               esac
+               ;;
 
-hppa*-*-* | parisc*-*-*)
-       if test x$gas = xyes
-       then
-               target_cpu_default2="MASK_GAS|MASK_JUMP_IN_DELAY"
-       fi
-       case $machine in
-               hppa1* | parisc1*)
-                       tm_defines="TARGET_SCHED_DEFAULT=\\\"7100LC\\\""
+       v850*-*-*)
+               supported_defaults=cpu
+               case "x$with_cpu" in
+               x | xv850e | xv850e1)
+                       # OK
+                       ;;
+               *)
+                       echo "Unknown cpu used in --with-cpu=$with_cpu" 1>&2
+                       exit 1
                        ;;
+               esac
+               ;;
        esac
-       ;;
-mips*-*-*)
+
+       # Set some miscellaneous flags for particular targets.
+       target_cpu_default2=
        case $machine in
-       mips*-*-ecoff* | mips*-*-elf*)
-               if test x$gas = xyes
-               then
-                       if test x$gnu_ld = xyes
-                       then
-                               target_cpu_default2="MASK_GAS|MASK_SPLIT_ADDR"
-                       else
-                               target_cpu_default2="MASK_GAS"
-                       fi
-               fi
-               ;;
-       mips*-*-*)
+       alpha*-*-*)
                if test x$gas = xyes
                then
                        target_cpu_default2="MASK_GAS"
                fi
                ;;
-       esac
-       case $machine in
-               mips*el-*-*)
-                       tm_defines="TARGET_ENDIAN_DEFAULT=0 $tm_defines"
-                       ;;
-       esac
-       case $tm_file in
-               *mips/elf.h* | *mips/elf64.h*)
-                       tm_defines="OBJECT_FORMAT_ELF $tm_defines"
-                       ;;
-       esac
-       if test "x$enable_gofast" = xyes
-       then
-               tm_defines="INIT_SUBTARGET_OPTABS=INIT_GOFAST_OPTABS $tm_defines"
-               tm_file="gofast.h $tm_file"
-               tmake_file="mips/t-gofast $tmake_file"
-       else
-               tmake_file="mips/t-mips $tmake_file"
-       fi
-       ;;
-powerpc*-*-* | rs6000-*-*)
-        if test x$enable_altivec = xyes
-        then
-                tm_file="$tm_file rs6000/altivec-defs.h"
-        fi
-       case "x$with_cpu" in
+
+       arm*-*-*)
+               case "x$with_cpu" in
                x)
+                       # The most generic
+                       target_cpu_default2="TARGET_CPU_generic"
                        ;;
 
-               xcommon | xpowerpc | xpowerpc64 \
-                 | xpower | xpower2 | xpower3 | xpower4 \
-                 | xrios | xrios1 | xrios2 | xrsc | xrsc1 | xrs64a \
-                 | x601 | x602 | x603 | x603e | x604 | x604e | x620 | x630 \
-                 | x740 | x750 | x7400 | x7450 | x505)
-                       target_cpu_default2="\\\"$with_cpu\\\""
+               *)
+                       target_cpu_default2="TARGET_CPU_$with_cpu"
                        ;;
+               esac
+               ;;
 
-               x401 | x403 | x405 | xec603e | x801 | x821 | x823 | x860)
-                       target_cpu_default2="\\\"$with_cpu\\\""
-                       ;;
+       hppa*-*-* | parisc*-*-*)
+               if test x$gas = xyes
+               then
+                       target_cpu_default2="MASK_GAS|MASK_JUMP_IN_DELAY"
+               fi
+               ;;
 
-               xyes | xno)
-                       echo "--with-cpu must be passed a value" 1>&2
-                       exit 1
+       mips*-*-*)
+               case $machine in
+               mips*-*-ecoff* | mips*-*-elf*)
+                       if test x$gas = xyes
+                       then
+                               if test x$gnu_ld = xyes
+                               then
+                                       target_cpu_default2="MASK_GAS|MASK_SPLIT_ADDR"
+                               else
+                                       target_cpu_default2="MASK_GAS"
+                               fi
+                       fi
                        ;;
-
-               *)
-                       if test x$pass2done = xyes
+               mips*-*-*)
+                       if test x$gas = xyes
                        then
-                               echo "Unknown cpu used with --with-cpu=$with_cpu" 1>&2
-                               exit 1
+                               target_cpu_default2="MASK_GAS"
                        fi
                        ;;
-       esac
-       out_file=rs6000/rs6000.c
-       c_target_objs="${c_target_objs} rs6000-c.o"
-       cxx_target_objs="${cxx_target_objs} rs6000-c.o"
-       tmake_file="rs6000/t-rs6000 ${tmake_file}"
-       ;;
-sparc*-*-*)
-       case ".$with_cpu" in
-               .)
-                       target_cpu_default2=TARGET_CPU_"`echo $machine | sed 's/-.*$//'`"
+               esac
+               case $machine in
+                       mips*el-*-*)
+                               tm_defines="TARGET_ENDIAN_DEFAULT=0 $tm_defines"
+                               ;;
+               esac
+               case $tm_file in
+                       *mips/elf.h* | *mips/elf64.h*)
+                               tm_defines="OBJECT_FORMAT_ELF $tm_defines"
+                               ;;
+               esac
+               if test "x$enable_gofast" = xyes
+               then
+                       tm_defines="INIT_SUBTARGET_OPTABS=INIT_GOFAST_OPTABS $tm_defines"
+                       tm_file="gofast.h $tm_file"
+                       tmake_file="mips/t-gofast $tmake_file"
+               else
+                       tmake_file="mips/t-mips $tmake_file"
+               fi
+               ;;
+
+       powerpc*-*-* | rs6000-*-*)
+               if test x$enable_altivec = xyes
+               then
+                       tm_file="$tm_file rs6000/altivec-defs.h"
+               fi
+               # FIXME: The PowerPC port uses the value set at compile time,
+               # although it's only cosmetic.
+               if test "x$with_cpu" != x
+               then
+                       target_cpu_default2="\\\"$with_cpu\\\""
+               fi
+               out_file=rs6000/rs6000.c
+               c_target_objs="${c_target_objs} rs6000-c.o"
+               cxx_target_objs="${cxx_target_objs} rs6000-c.o"
+               tmake_file="rs6000/t-rs6000 ${tmake_file}"
+               ;;
+
+       sparc*-*-*)
+               # Some standard aliases.
+               case x$with_cpu in
+               xsparc)
+                       with_cpu=v7
                        ;;
-               .supersparc | .hypersparc | .ultrasparc | .v7 | .v8 | .v9)
-                       target_cpu_default2="TARGET_CPU_$with_cpu"
+               xsparc86x)
+                       with_cpu=sparclite86x
                        ;;
-               *)
-                       if test x$pass2done = xyes
-                       then
-                               echo "Unknown cpu used with --with-cpu=$with_cpu" 1>&2
-                               exit 1
-                       fi
+               xsparcv9 | xsparc64)
+                       with_cpu=v9
                        ;;
-       esac
-       ;;
-v850*-*-*)
-       case "x$with_cpu" in
+               esac
+
+               # The Sparc port checks this value at compile-time.
+               target_cpu_default2="TARGET_CPU_$with_cpu"
+               ;;
+       v850*-*-*)
+               # FIXME: The v850 is "special" in that it does not support
+               # runtime CPU selection, only --with-cpu.
+               case "x$with_cpu" in
                x)
                        ;;
                xv850e)
                        target_cpu_default2="TARGET_CPU_$with_cpu"
                        ;;
-               *)
-                       if test x$pass2done = xyes
-                       then
-                               echo "Unknown cpu used with --with-cpu=$with_cpu" 1>&2
-                               exit 1
-                       fi
-                       ;;
+               esac
+               ;;
        esac
-       ;;
-esac
 
-if test "$target_cpu_default2" != ""
-then
-       if test "$target_cpu_default" != ""
+       t=
+       all_defaults="abi cpu arch tune schedule float mode"
+       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
+               fi
+       done
+       if test "x$t" = x
        then
-               target_cpu_default="(${target_cpu_default}|${target_cpu_default2})"
+               configure_default_options="{ { NULL, NULL} }"
        else
-               target_cpu_default=$target_cpu_default2
+               configure_default_options="{ ${t} }"
        fi
-fi
 
-# Save data on machine being used to compile GCC in build_xm_file.
-# Save data on host machine in vars host_xm_file and host_xmake_file.
-if test x$pass1done = x
-then
-       if test x$xm_file != x
-       then build_xm_file=$xm_file
-       fi
-       build_xm_defines=$xm_defines
-       build_install_headers_dir=$install_headers_dir
-       build_exeext=$exeext
-       pass1done=yes
-else
-       if test x$pass2done = x
+       if test "$target_cpu_default2" != ""
        then
-               if test x$xm_file != x
-               then host_xm_file=$xm_file
+               if test "$target_cpu_default" != ""
+               then
+                       target_cpu_default="(${target_cpu_default}|${target_cpu_default2})"
+               else
+                       target_cpu_default=$target_cpu_default2
                fi
-               host_xm_defines=$xm_defines
-               host_xmake_file="$xmake_file"
-               host_truncate_target=$truncate_target
-               host_extra_gcc_objs=$extra_gcc_objs
-               host_extra_objs=$extra_host_objs
-               host_exeext=$exeext
-               out_host_hook_obj=$host_hook_obj
-               pass2done=yes
        fi
-fi