OSDN Git Service

* config.gcc: Move use_fixproto=no from generic vxworks clause to
[pf3gnuchains/gcc-fork.git] / gcc / config.gcc
index fc761ce..0abadfc 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
+# This file switches on the shell variable ${target}, and also uses the
 # following shell variables:
 #
 #  with_*              Various variables as set by configure.
@@ -49,7 +47,8 @@
 # This file sets the following shell variables for use by the
 # autoconf-generated configure script:
 #
-#  cpu_type            The name of the cpu, if different from machine.
+#  cpu_type            The name of the cpu, if different from the first
+#                      chunk of the canonical target name.
 #
 #  tm_defines          List of target macros to define for all compilations.
 #
@@ -88,8 +87,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.
-#
 #  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
 #  configure_default_options
 #                      Set to an initializer for configure_default_options
 #                      in configargs.h, based on --with-cpu et cetera.
+#
+#  use_fixproto                Set to "yes" if fixproto should be run normally,
+#                      "no" if fixproto should never be run.
 
 # 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.
-#
-#  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 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
@@ -224,15 +172,18 @@ default_use_cxa_atexit=no
 target_gtfiles=
 need_64bit_hwint=
 
+# Default to using fixproto.  We will reverse this eventually.
+use_fixproto=yes
+
 # Don't carry these over build->host->target.  Please.
 xm_file=
 md_file=
 
 # Obsolete configurations.
-case $machine in
+case ${target} in
  dummy)
     if test "x$enable_obsolete" != xyes; then
-      echo "*** Configuration $machine is obsolete." >&2
+      echo "*** Configuration ${target} is obsolete." >&2
       echo "*** Specify --enable-obsolete to build it anyway." >&2
       echo "*** Support will be REMOVED in the next major release of GCC," >&2
       echo "*** unless a maintainer comes forward." >&2
@@ -243,9 +194,10 @@ esac
 # Unsupported targets list.  Do not put an entry in this list unless
 # it would otherwise be caught by a more permissive pattern.  The list
 # should be in alphabetical order.
-case $machine in
+case ${target} 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*                  \
@@ -260,8 +212,9 @@ case $machine in
  | *-*-linux*oldld*                    \
  | *-*-rtemsaout*                      \
  | *-*-rtemscoff*                      \
+ | vax-*-vms*                          \
  )
-       echo "*** Configuration $machine not supported" 1>&2
+       echo "*** Configuration ${target} not supported" 1>&2
        exit 1
        ;;
 esac
@@ -270,8 +223,8 @@ esac
 # updated in each machine entry.  Also set default extra_headers for some
 # machines.
 tm_p_file=
-cpu_type=`echo $machine | sed 's/-.*$//'`
-case $machine in
+cpu_type=`echo ${target} | sed 's/-.*$//'`
+case ${target} in
 alpha*-*-*)
        cpu_type=alpha
        need_64bit_hwint=yes
@@ -359,23 +312,23 @@ then
        extra_modes=${cpu_type}/${cpu_type}-modes.def
 fi
 
-case $machine in
+case ${target} in
 x86_64-*-*)
        tm_file="i386/biarch64.h ${tm_file}"
        ;;
 esac
 
 # On a.out targets, we need to use collect2.
-case $machine in
+case ${target} in
 *-*-*aout*)
        use_collect2=yes
        ;;
 esac
 
 # Common parts for widely ported systems.
-case $machine in
+case ${target} in
 *-*-linux*)
-       case $machine in
+       case ${target} in
         *-*-linux*libc1* | *-*-linux*aout*)
                ;;
        *)
@@ -394,15 +347,13 @@ case $machine in
        # support are matched above and just set $cpu_type.
        tm_file="${cpu_type}/gnu.h"
        extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o"
-       # GNU always uses ELF.
-       elf=yes
        # GNU tools are the only tools.
        gnu_ld=yes
        gas=yes
        # These details are the same as for Linux.
        # But here we need a little extra magic.
        tmake_file="t-slibgcc-elf-ver t-linux t-gnu"
-       case $machine in
+       case ${target} in
        alpha*)
                tm_file="${cpu_type}/${cpu_type}.h alpha/elf.h alpha/linux.h alpha/linux-elf.h gnu.h ${tm_file}"
                ;;
@@ -412,7 +363,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'
@@ -428,7 +378,7 @@ case $machine in
        # Allow them to be explicitly enabled on any other version.
        case x${enable_threads} in
        x)
-               case $machine in
+               case ${target} in
                *-*-netbsd[2-9]* | *-*-netbsdelf[2-9]*)
                        thread_file='posix'
                        tm_defines="${tm_defines} NETBSD_ENABLE_PTHREADS"
@@ -444,7 +394,7 @@ case $machine in
        # NetBSD 1.7 and later are set up to use GCC's crtstuff for
        # ELF configurations.  We will clear extra_parts in the
        # a.out configurations.
-       case $machine in
+       case ${target} in
        *-*-netbsd*1.[7-9]* | *-*-netbsd[2-9]* | *-*-netbsdelf[2-9]*)
                extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o"
                ;;
@@ -452,7 +402,7 @@ case $machine in
 
        # NetBSD 2.0 and later provide __cxa_atexit(), which we use by
        # default (unless overridden by --disable-__cxa_atexit).
-       case $machine in
+       case ${target} in
        *-*-netbsd[2-9]* | *-*-netbsdelf[2-9]*)
                default_use_cxa_atexit=yes
                ;;
@@ -486,7 +436,7 @@ case $machine in
        gas=yes
        gnu_ld=yes
        extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
-       case $machine in
+       case ${target} in
        *-*-freebsd3 | *-*-freebsd[3].*) fbsd_tm_file="freebsd3.h";;
        *-*-freebsd4 | *-*-freebsd[4].*) fbsd_tm_file="freebsd4.h";;
        *-*-freebsd5 | *-*-freebsd[5].*) fbsd_tm_file="freebsd5.h";;
@@ -494,7 +444,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)
@@ -502,7 +451,7 @@ case $machine in
                tmake_file="${tmake_file} t-freebsd-thread"
                # Before 5.0, FreeBSD can't bind shared libraries to -lc
                # when "optionally" threaded via weak pthread_* checks.
-               case $machine in
+               case ${target} in
                *-*-freebsd[34] | *-*-freebsd[34].*)
                        tmake_file="${tmake_file} t-slibgcc-nolc-override";;
                esac
@@ -520,6 +469,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
@@ -529,17 +482,14 @@ case $machine in
        ;;
 esac
 
-case $machine in
+case ${target} in
 # Support site-specific machine types.
 *local*)
-       rest=`echo $machine | sed -e "s/$cpu_type-//"`
+       rest=`echo ${target} | sed -e "s/$cpu_type-//"`
        tm_file=${cpu_type}/$rest.h
        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
@@ -556,30 +506,34 @@ alpha*-*-linux*)
        tm_file="${tm_file} alpha/elf.h alpha/linux.h alpha/linux-elf.h"
        target_cpu_default="MASK_GAS"
        tmake_file="t-slibgcc-elf-ver t-linux alpha/t-crtfm alpha/t-alpha alpha/t-ieee"
+       use_fixproto=no
        ;;
 alpha*-*-gnu*)
        target_cpu_default="MASK_GAS"
        tmake_file="${tmake_file} alpha/t-crtfm alpha/t-alpha alpha/t-ieee"
+       use_fixproto=no
        ;;
 alpha*-*-freebsd*)
        tm_file="${tm_file} ${fbsd_tm_file} alpha/elf.h alpha/freebsd.h"
        target_cpu_default="MASK_GAS"
        tmake_file="${tmake_file} alpha/t-crtfm alpha/t-alpha alpha/t-ieee"
        extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o"
+       use_fixproto=no
        ;;
 alpha*-*-netbsd*)
        tm_file="${tm_file} netbsd.h alpha/elf.h netbsd-elf.h alpha/netbsd.h"
        target_cpu_default="MASK_GAS"
        tmake_file="${tmake_file} alpha/t-alpha alpha/t-ieee"
+       use_fixproto=no
        ;;
-
 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"
+       use_fixproto=no
        ;;
-
 alpha*-dec-osf[45]*)
        if test x$stabs = xyes
        then
@@ -593,13 +547,10 @@ alpha*-dec-osf[45]*)
        tmake_file="alpha/t-alpha alpha/t-ieee alpha/t-crtfm alpha/t-osf4"
        tm_file="${tm_file} alpha/osf.h"
        extra_headers=va_list.h
-       case $machine in
+       case ${target} 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
+           case ${target} in
                *-*-osf4.0a) ;;
                *) target_cpu_default=MASK_SUPPORT_ARCH
            esac
@@ -609,66 +560,58 @@ 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
+       use_fixproto=no
        ;;
 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
+       use_fixproto=no
        ;;
 arc-*-elf*)
        tm_file="dbxelf.h elfos.h svr4.h ${tm_file}"
        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)
        tm_file="arm/semiaof.h arm/aof.h arm/arm.h"
        tmake_file=arm/t-semi
+       use_fixproto=no
        ;;
 arm*-*-freebsd*|strongarm*-*-freebsd*)
        tm_file="dbxelf.h elfos.h ${fbsd_tm_file} arm/elf.h arm/aout.h arm/freebsd.h arm/arm.h"
        tmake_file="${tmake_file} arm/t-strongarm-elf"
+       use_fixproto=no
        ;;
 arm*-*-netbsdelf*)
        tm_file="dbxelf.h elfos.h netbsd.h netbsd-elf.h arm/elf.h arm/aout.h arm/arm.h arm/netbsd-elf.h"
        tmake_file="${tmake_file} arm/t-netbsd"
+       use_fixproto=no
        ;;
 arm*-*-netbsd*)
        tm_file="arm/aout.h arm/arm.h netbsd.h netbsd-aout.h arm/netbsd.h"
        tmake_file="t-netbsd arm/t-netbsd"
        extra_parts=""
        use_collect2=yes
+       use_fixproto=no
        ;;
 arm*-*-linux*)                 # ARM GNU/Linux with ELF
        tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h arm/linux-gas.h arm/linux-elf.h"
@@ -680,6 +623,7 @@ arm*-*-linux*)                      # ARM GNU/Linux with ELF
                thread_file='posix'
                ;;
        esac
+       use_fixproto=no
        ;;
 arm*-*-uclinux*)               # ARM ucLinux
        tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h arm/linux-gas.h arm/linux-elf.h arm/uclinux-elf.h"
@@ -695,18 +639,19 @@ arm*-*-rtems*)
        if test x$enable_threads = xyes; then
          thread_file='rtems'
        fi
+       use_fixproto=no
        ;;
 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 arm/pe.h arm/wince-pe.h"
+       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"
        ;;
@@ -715,6 +660,7 @@ arm*-*-kaos*)
        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"
@@ -724,6 +670,7 @@ c4x-*-rtems* | tic4x-*-rtems*)
        fi
        c_target_objs="c4x-c.o"
        cxx_target_objs="c4x-c.o"
+       use_fixproto=no
        ;;
 c4x-* | tic4x-*)
        tmake_file=c4x/t-c4x
@@ -734,15 +681,18 @@ cris-*-aout)
        tm_file="dbxelf.h ${tm_file} cris/aout.h"
        gas=yes
        tmake_file="cris/t-cris cris/t-aout"
+       use_fixproto=no
        ;;
 cris-*-elf | cris-*-none)
        tm_file="dbxelf.h elfos.h ${tm_file}"
        tmake_file="cris/t-cris cris/t-elfmulti"
        gas=yes
+       use_fixproto=no
        ;;
 cris-*-linux*)
        tm_file="dbxelf.h elfos.h svr4.h ${tm_file} linux.h cris/linux.h"
        tmake_file="cris/t-cris t-slibgcc-elf-ver cris/t-linux"
+       use_fixproto=no
        ;;
 d30v-*)
        tm_file="dbxelf.h elfos.h svr4.h ${tm_file}"
@@ -760,16 +710,18 @@ 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
+       use_fixproto=no
        ;;
 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)"
@@ -784,45 +736,46 @@ hppa*-*-linux* | parisc*-*-linux*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h linux.h pa/pa-linux.h \
                 pa/pa32-regs.h pa/pa32-linux.h"
        tmake_file="t-slibgcc-elf-ver t-linux pa/t-linux"
+       use_fixproto=no
        ;;
-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"
+#      use_fixproto=no
+#      ;;
 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"
+       tmake_file="pa/t-pro"
+       use_fixproto=no
        ;;
 hppa1.1-*-osf*)
        target_cpu_default="MASK_PA_11"
-       tm_file="${tm_file} pa/pa32-regs.h pa/som.h pa/pa-osf.h"
-       tmake_file="pa/t-bsd pa/t-pa"
-       xmake_file="pa/x-ada"
+       tm_file="${tm_file} pa/pa32-regs.h dbxelf.h pa/som.h pa/pa-osf.h"
+       tmake_file="pa/t-pa"
        use_collect2=yes
+       use_fixproto=no
        ;;
 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"
+       tmake_file="pa/t-pro t-rtems"
        if test x$enable_threads = xyes; then
          thread_file='rtems'
        fi
+       use_fixproto=no
        ;;
 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"
+       tmake_file="pa/t-pa"
        use_collect2=yes
+       use_fixproto=no
        ;;
 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
@@ -831,13 +784,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
@@ -846,7 +797,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*)
@@ -862,70 +812,60 @@ 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
-       tmake_file="i370/t-oe i370/t-i370"
+       tm_file="i370/oe.h i370/i370.h"
+       tmake_file="i370/t-i370"
        c_target_objs="i370-c.o"
        cxx_target_objs="i370-c.o"
+       # Don't bother fixing up header files; they're weird.
+       use_fixproto=no
        ;;
 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
+       use_fixproto=no
        ;;
 i[34567]86-*-darwin*)
        tm_file="${tm_file} i386/darwin.h"
@@ -942,7 +882,7 @@ i[34567]86-ncr-sysv4*)              # NCR 3000 - ix86 running system V.4
        ;;
 i[34567]86-*-netware)          # Intel 80386's running netware
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h i386/sysv4.h netware.h i386/netware.h"
-       tmake_file=i386/t-netware
+       use_fixproto=no
        ;;
 i[34567]86-sequent-ptx4* | i[34567]86-sequent-sysv4*)
        if test x$gas = xyes
@@ -953,7 +893,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"
@@ -962,44 +901,53 @@ i[34567]86-*-beoself* | i[34567]86-*-beos*)
        tmake_file='i386/t-beos i386/t-crtpic'
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h i386/beos-elf.h"
        extra_parts='crtbegin.o crtend.o'
+       use_fixproto=no
        ;;
 i[34567]86-*-freebsd2 | i[34567]86-*-freebsd2.* | i[34567]86-*-freebsd*aout*)
        tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h i386/freebsd-aout.h"
        tmake_file=t-freebsd
+       use_fixproto=no
        ;;
 i[34567]86-*-freebsd*)
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${fbsd_tm_file} i386/freebsd.h"
+       use_fixproto=no
        ;;
 x86_64-*-freebsd*)
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${fbsd_tm_file} i386/x86-64.h i386/freebsd.h i386/freebsd64.h"
+       use_fixproto=no
        ;;
 i[34567]86-*-netbsdelf*)
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h netbsd.h netbsd-elf.h i386/netbsd-elf.h"
+       use_fixproto=no
        ;;
 i[34567]86-*-netbsd*)
        tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h netbsd.h netbsd-aout.h i386/netbsd.h"
        tmake_file=t-netbsd
        extra_parts=""
        use_collect2=yes
+       use_fixproto=no
        ;;
 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"
+       use_fixproto=no
        ;;
 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...
        use_collect2=yes
+       use_fixproto=no
        ;;
 i[34567]86-*-coff*)
        tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h dbxcoff.h i386/i386-coff.h"
        ;;
 i[34567]86-*-linux*aout*)      # Intel 80386's running GNU/Linux
                                # with a.out format
-       tmake_file="t-linux-aout i386/t-crtstuff"
+       tmake_file="i386/t-crtstuff"
        tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h linux-aout.h i386/linux-aout.h"
        gnu_ld=yes
+       use_fixproto=no
        ;;
 i[34567]86-*-linux*libc1)      # Intel 80386's running GNU/Linux
                                # with ELF format using the
@@ -1011,19 +959,23 @@ i[34567]86-*-linux*libc1)        # Intel 80386's running GNU/Linux
        if test x$enable_threads = xyes; then
                thread_file='single'
        fi
+       use_fixproto=no
        ;;
 i[34567]86-*-linux*)   # Intel 80386's running GNU/Linux
                        # with ELF format using glibc 2
                        # aka GNU/Linux C library 6
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h linux.h i386/linux.h"
        tmake_file="t-slibgcc-elf-ver t-linux i386/t-crtstuff"
+       use_fixproto=no
        ;;
 x86_64-*-linux*)
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h linux.h \
                 i386/x86-64.h i386/linux64.h"
        tmake_file="t-slibgcc-elf-ver t-linux i386/t-linux64"
+       use_fixproto=no
        ;;
 i[34567]86-*-gnu*)
+       use_fixproto=no
        ;;
 i[34567]86-pc-msdosdjgpp*)
        xm_file=i386/xm-djgpp.h
@@ -1031,11 +983,6 @@ i[34567]86-pc-msdosdjgpp*)
        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"
@@ -1046,7 +993,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
@@ -1056,6 +1003,13 @@ 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
+       use_fixproto=no
+       ;;
 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"
@@ -1063,9 +1017,9 @@ i[34567]86-*-rtems*)
        if test x$enable_threads = xyes; then
          thread_file='rtems'
        fi
+       use_fixproto=no
        ;;
 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
@@ -1124,7 +1078,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
@@ -1147,8 +1100,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"
@@ -1160,25 +1113,24 @@ i[34567]86-*-pe | i[34567]86-*-cygwin*)
        if test x$enable_threads = xyes; then
                thread_file='posix'
        fi
-       exeext=.exe
+       use_fixproto=no
        ;;
 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
+       case ${target} in
                *mingw32crt*)
                        tm_file="${tm_file} i386/crtdll.h"
                        ;;
                *mingw32msv* | *mingw32*)
                        ;;
        esac
+       use_fixproto=no
        ;;
 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"
@@ -1187,23 +1139,22 @@ 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"
+       tmake_file="i386/t-interix"
        extra_objs=winnt.o
-       xmake_file="x-interix"
        if test x$enable_threads = xyes ; then
                thread_file='posix'
        fi
        if test x$stabs = xyes ; then
                tm_file="${tm_file} dbxcoff.h"
        fi
+       use_fixproto=no
        ;;
 i[34567]86-*-interix*)
        tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/i386-interix.h interix.h"
-       tmake_file="t-interix i386/t-interix"
+       tmake_file="i386/t-interix"
        extra_objs=winnt.o
        if test x$enable_threads = xyes ; then
                thread_file='posix'
@@ -1211,11 +1162,17 @@ i[34567]86-*-interix*)
        if test x$stabs = xyes ; then
                tm_file="${tm_file} dbxcoff.h"
        fi
+       use_fixproto=no
        ;;
 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
@@ -1230,6 +1187,7 @@ i960-*-rtems)
        fi
        c_target_objs="i960-c.o"
        cxx_target_objs="i960-c.o"
+       use_fixproto=no
        ;;
 i960-*-*)                      # Default i960 environment.
        use_collect2=yes
@@ -1256,6 +1214,7 @@ ia64*-*-freebsd*)
        target_cpu_default="MASK_GNU_AS|MASK_GNU_LD"
        tmake_file="${tmake_file} ia64/t-ia64"
        extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtfastmath.o"
+       use_fixproto=no
        ;;
 ia64*-*-linux*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h linux.h ia64/sysv4.h ia64/linux.h"
@@ -1265,21 +1224,34 @@ ia64*-*-linux*)
        if test x"$use_libunwind_exceptions" = xyes; then
          tmake_file="$tmake_file t-libunwind"
        fi
+       use_fixproto=no
        ;;
 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"
+       # 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).
+       use_fixproto=no
        ;;
 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"
@@ -1300,52 +1272,50 @@ 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"
        ;;
 m68010-*-netbsdelf* | m68k*-*-netbsdelf*)
        tm_file="${tm_file} dbxelf.h elfos.h netbsd.h netbsd-elf.h m68k/netbsd-elf.h"
-       case $machine in
+       case ${target} in
        m68010*)
                target_cpu_default="0"
                ;;
@@ -1353,51 +1323,60 @@ m68010-*-netbsdelf* | m68k*-*-netbsdelf*)
                target_cpu_default="MASK_68020|MASK_68881|MASK_BITFIELD"
                ;;
        esac
+       use_fixproto=no
        ;;
 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
+       use_fixproto=no
        ;;
 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
+       use_fixproto=no
        ;;
 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"
+       use_fixproto=no
        ;;
 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'
        fi
+       use_fixproto=no
        ;;
 mcore-*-elf)
        tm_file="dbxelf.h elfos.h svr4.h ${tm_file} mcore/mcore-elf.h"
        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="${tm_file} 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 mips/dbxmdebug.h"
@@ -1447,7 +1426,7 @@ mips-sgi-irix5*)          # SGI System V.4., IRIX 5
        tm_file="${tm_file} mips/iris5.h"
        if test x$gas = xyes
        then
-               tm_file="${tm_file} 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 mips/dbxmdebug.h"
@@ -1468,8 +1447,9 @@ 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}"
+       use_fixproto=no
        ;;
 mips64*-*-linux*)
        tm_file="dbxelf.h elfos.h svr4.h linux.h ${tm_file} mips/linux.h mips/linux64.h"
@@ -1488,23 +1468,29 @@ mips64*-*-linux*)
        if test x$enable_threads = xyes; then
                thread_file='posix'
        fi
+       use_fixproto=no
        ;;
 mips*-*-linux*)                                # Linux MIPS, either endian.
         tm_file="dbxelf.h elfos.h svr4.h linux.h ${tm_file} mips/linux.h"
-       case $machine in
+       case ${target} in
         mipsisa32*-*)
                 target_cpu_default="MASK_SOFT_FLOAT"
                tm_defines="MIPS_ISA_DEFAULT=32"
                 ;;
         esac
        tmake_file="t-slibgcc-elf-ver t-linux"
+       use_fixproto=no
        ;;
-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 ${target} in
+       mips*el-*-openbsd*) 
+           tm_defines="${tm_defines} TARGET_ENDIAN_DEFAULT=0";;
+       *)  tm_defines="${tm_defines} TARGET_ENDIAN_DEFAULT=MASK_BIG_ENDIAN";;
+        esac
+       use_fixproto=no
        ;;
 mipsisa32-*-elf* | mipsisa32el-*-elf*)
        tm_file="${tm_file} mips/elf.h"
@@ -1558,10 +1544,11 @@ 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
+       use_fixproto=no
        ;;
 mipstx39-*-elf* | mipstx39el-*-elf*)
        tm_file="${tm_file} mips/r3900.h mips/elf.h"
@@ -1579,7 +1566,8 @@ mn10300-*-*)
        use_collect2=no
        ;;
 ns32k-*-netbsdelf*)
-       echo "GCC does not yet support the ${machine} target"; exit 1
+       echo "GCC does not yet support the ${target} target"; exit 1
+       use_fixproto=no
        ;;
 ns32k-*-netbsd*)
        tm_file="${tm_file} netbsd.h netbsd-aout.h ns32k/netbsd.h"
@@ -1587,6 +1575,7 @@ ns32k-*-netbsd*)
        tmake_file="t-netbsd ns32k/t-ns32k"
        extra_parts=""
        use_collect2=yes
+       use_fixproto=no
        ;;
 pdp11-*-bsd)
        tm_file="${tm_file} pdp11/2bsd.h"
@@ -1595,10 +1584,12 @@ 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=
+#      use_fixproto=no
+#      ;;
 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
@@ -1606,10 +1597,12 @@ powerpc64-*-linux*)
        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"
+       use_fixproto=no
        ;;
 powerpc64-*-gnu*)
        tm_file="${cpu_type}/${cpu_type}.h elfos.h svr4.h freebsd-spec.h gnu.h rs6000/sysv4.h rs6000/linux64.h rs6000/gnu.h"
        tmake_file="rs6000/t-fprules t-slibgcc-elf-ver t-gnu rs6000/t-linux64"
+       use_fixproto=no
        ;;
 powerpc-*-beos*)
        tm_file="${tm_file} rs6000/aix.h rs6000/beos.h rs6000/xcoff.h"
@@ -1618,21 +1611,20 @@ 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"
        tmake_file="rs6000/t-fprules rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"
+       use_fixproto=no
        ;;
 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"
+       use_fixproto=no
        ;;
 powerpc-*-chorusos*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h chorus.h"
@@ -1654,6 +1646,7 @@ powerpc-*-eabisimaltivec*)
 powerpc-*-eabisim*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rs6000/eabisim.h"
        tmake_file="rs6000/t-fprules rs6000/t-ppcgas rs6000/t-ppccomm"
+       use_fixproto=no
        ;;
 powerpc-*-elf*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h"
@@ -1666,6 +1659,7 @@ powerpc-*-eabialtivec*)
 powerpc-*-eabi*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h"
        tmake_file="rs6000/t-fprules rs6000/t-ppcgas rs6000/t-ppccomm"
+       use_fixproto=no
        ;;
 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"
@@ -1673,18 +1667,22 @@ powerpc-*-rtems*)
        if test x$enable_threads = xyes; then
          thread_file='rtems'
        fi
+       use_fixproto=no
        ;;
 powerpc-*-linux*altivec*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/linux.h rs6000/linuxaltivec.h"
        tmake_file="rs6000/t-fprules rs6000/t-ppcos t-slibgcc-elf-ver t-linux rs6000/t-ppccomm"
+       use_fixproto=no
        ;;
 powerpc-*-linux*spe*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/linux.h rs6000/linuxspe.h"
        tmake_file="rs6000/t-fprules rs6000/t-ppcos t-slibgcc-elf-ver t-linux rs6000/t-ppccomm"
+       use_fixproto=no
        ;;
 powerpc-*-linux*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/linux.h"
        tmake_file="rs6000/t-fprules rs6000/t-ppcos t-slibgcc-elf-ver t-linux rs6000/t-ppccomm"
+       use_fixproto=no
        ;;
 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"
@@ -1692,6 +1690,7 @@ powerpc-*-gnu-gnualtivec*)
        if test x$enable_threads = xyes; then
                thread_file='posix'
        fi
+       use_fixproto=no
        ;;
 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"
@@ -1699,6 +1698,7 @@ powerpc-*-gnu*)
        if test x$enable_threads = xyes; then
                thread_file='posix'
        fi
+       use_fixproto=no
        ;;
 powerpc-wrs-vxworks*)
        # We want vxworks.h after rs6000/sysv4.h, which unfortunately
@@ -1707,6 +1707,7 @@ powerpc-wrs-vxworks*)
        tm_file="${tm_file} vxworks.h rs6000/vxworks.h"
        tmake_file="${tmake_file} rs6000/t-fprules rs6000/t-ppccomm rs6000/t-vxworks"
        extra_headers=ppc-asm.h
+       use_fixproto=no
        ;;
 powerpc-wrs-windiss*)
        tm_file="${tm_file} elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/windiss.h"
@@ -1724,10 +1725,12 @@ powerpcle-*-elf*)
 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"
+       use_fixproto=no
        ;;
 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"
+       use_fixproto=no
        ;;
 powerpc-*-kaos*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h kaos.h rs6000/kaos-ppc.h"
@@ -1765,13 +1768,14 @@ 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
        ;;
 s390-*-linux*)
        tm_file="s390/s390.h dbxelf.h elfos.h svr4.h linux.h s390/linux.h"
        tmake_file="t-slibgcc-elf-ver t-linux s390/t-crtstuff"
+       use_fixproto=no
        ;;
 s390x-*-linux*)
        tm_file="s390/s390x.h s390/s390.h dbxelf.h elfos.h svr4.h linux.h s390/linux.h"
@@ -1780,17 +1784,18 @@ s390x-*-linux*)
        extra_modes=s390/s390-modes.def
        out_file=s390/s390.c
        tmake_file="t-slibgcc-elf-ver t-linux s390/t-crtstuff s390/t-linux64"
+       use_fixproto=no
        ;;
 sh-*-elf* | sh[2346l]*-*-elf* | sh*-*-kaos*)
        tmake_file="sh/t-sh sh/t-elf"
-       case $machine in
+       case ${target} in
        shl* | sh64l*)
                tm_file="sh/little.h ${tm_file}"
                tmake_file="${tmake_file} sh/t-le"
                ;;
        esac
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sh/embed-elf.h"
-       case $machine in
+       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sh/elf.h sh/embed-elf.h"
+       case ${target} in
        sh64*)
                tmake_file="${tmake_file} sh/t-sh64"
                tm_file="${tm_file} sh/sh64.h"
@@ -1803,19 +1808,20 @@ sh-*-elf* | sh[2346l]*-*-elf* | sh*-*-kaos*)
        sh2e*) target_cpu_default="SELECT_SH2E" ;;
        sh2*)  target_cpu_default="SELECT_SH2" ;;
        esac
-       case $machine in
+       case ${target} in
        sh[234]*) tmake_file="${tmake_file} sh/t-monolib" ;;
        esac
-       case $machine in
+       case ${target} 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
+       use_fixproto=no
        ;;
 sh-*-rtems*)
        tmake_file="sh/t-sh t-rtems"
@@ -1823,18 +1829,20 @@ sh-*-rtems*)
        if test x$enable_threads = xyes; then
          thread_file='rtems'
        fi
+       use_fixproto=no
        ;;
 sh-*-linux* | sh[2346lbe]*-*-linux*)
-       tmake_file="sh/t-sh sh/t-elf t-slibgcc-elf-ver t-linux sh/t-linux"
-       case $machine in
+       tmake_file="sh/t-sh sh/t-elf t-slibgcc-elf-ver t-linux"
+       case ${target} in
        sh*be-*-* | sh*eb-*-*) ;;
        *)
                tm_file="sh/little.h ${tm_file}"
                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
+       case ${target} in
        sh64*)
                tmake_file="${tmake_file} sh/t-sh64"
                tm_file="${tm_file} sh/sh64.h"
@@ -1851,15 +1859,16 @@ sh-*-linux* | sh[2346lbe]*-*-linux*)
        sh2e*) target_cpu_default="SELECT_SH2E" ;;
        sh2*) target_cpu_default="SELECT_SH2" ;;
        esac
-       case $machine in
+       case ${target} in
        sh[234]*) tmake_file="${tmake_file} sh/t-monolib" ;;
        esac
+       use_fixproto=no
        ;;
 sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \
   sh64-*-netbsd* | sh64l*-*-netbsd*)
        tm_file="${tm_file} dbxelf.h elfos.h sh/elf.h netbsd.h netbsd-elf.h sh/netbsd-elf.h"
        tmake_file="${tmake_file} sh/t-sh sh/t-elf"
-       case $machine in
+       case ${target} in
        sh*l*-*)
                tm_file="sh/little.h ${tm_file}"
                tmake_file="${tmake_file} sh/t-le"
@@ -1868,7 +1877,7 @@ sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \
                tmake_file="${tmake_file} sh/t-be"
                ;;
        esac
-       case $machine in
+       case ${target} in
        sh5*-*)
                # SHmedia, 32-bit ABI
                target_cpu_default="SH5_BIT|SH4_BIT|SH3_BIT|SH_E_BIT"
@@ -1885,6 +1894,7 @@ sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \
                tmake_file="${tmake_file} sh/t-netbsd"
                ;;
        esac
+       use_fixproto=no
        ;;
 sh-*-*)
        tm_file="${tm_file} dbxcoff.h sh/coff.h"
@@ -1894,18 +1904,22 @@ sparc-tti-*)
        ;;
 sparc-*-netbsdelf*)
        tm_file="${tm_file} elfos.h svr4.h sparc/sysv4.h netbsd.h netbsd-elf.h sparc/netbsd-elf.h"
+       use_fixproto=no
        ;;
 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...
        use_collect2=yes
+       use_fixproto=no
        ;;
 sparc64-*-openbsd*)
        tm_file="sparc/openbsd1-64.h sparc/sparc.h elfos.h svr4.h sparc/sysv4.h sparc/sol2.h sparc/sp64-elf.h openbsd.h sparc/openbsd64.h"
        gas=yes gnu_ld=yes
        with_cpu=ultrasparc
+       use_fixproto=no
        ;;
 sparc-*-elf*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h sparc/sol2.h sparc/elf.h"
@@ -1915,6 +1929,7 @@ sparc-*-elf*)
 sparc-*-linux*)                # SPARC's running GNU/Linux, libc6
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/linux.h"
        tmake_file="t-slibgcc-elf-ver t-linux sparc/t-crtfm"
+       use_fixproto=no
        ;;
 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"
@@ -1923,6 +1938,7 @@ sparc-*-rtems*)
        if test x$enable_threads = xyes; then
          thread_file='rtems'
        fi
+       use_fixproto=no
        ;;
 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"
@@ -1965,7 +1981,7 @@ sparc-*-solaris2*)
        else
                tmake_file="$tmake_file t-slibgcc-sld"
        fi
-       case $machine in
+       case ${target} in
        *-*-solaris2.[0-6] | *-*-solaris2.[0-6].*)
                if test x$gnu_ld = xno; then
                        tm_file="${tm_file} sparc/sol26-sld.h"
@@ -2028,22 +2044,24 @@ 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 ;;
                *) echo "$with_cpu not supported for freebsd target"; exit 1 ;;
        esac
        need_64bit_hwint=yes
+       use_fixproto=no
        ;;
 sparc64-*-linux*)              # 64-bit SPARC's running GNU/Linux
        tmake_file="t-slibgcc-elf-ver t-linux 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"
+       use_fixproto=no
        ;;
 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"
+       use_fixproto=no
        ;;
 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"
@@ -2053,7 +2071,7 @@ 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
@@ -2067,11 +2085,26 @@ strongarm-*-kaos*)
        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
@@ -2103,24 +2136,23 @@ vax-*-sysv*)                    # VAXen running system V
        ;;
 vax-*-netbsdelf*)
        tm_file="${tm_file} elfos.h netbsd.h netbsd-elf.h vax/elf.h vax/netbsd-elf.h"
+       use_fixproto=no
        ;;
 vax-*-netbsd*)
        tm_file="${tm_file} netbsd.h netbsd-aout.h vax/netbsd.h"
        tmake_file=t-netbsd
        extra_parts=""
        use_collect2=yes
+       use_fixproto=no
        ;;
 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
+       use_fixproto=no
        ;;
 vax-*-ultrix*)                 # VAXen running ultrix
        tm_file="${tm_file} vax/ultrix.h"
        ;;
-vax-*-vms*)                    # VAXen running VMS
-       echo "Configuration $machine no longer supported" 1>&2
-       exit 1
-       ;;
 vax-*-*)                       # VAX default entry
        ;;
 xscale-*-elf)
@@ -2131,7 +2163,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
@@ -2149,10 +2181,12 @@ xstormy16-*-elf)
 xtensa-*-elf*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h xtensa/elf.h"
        tmake_file="xtensa/t-xtensa xtensa/t-elf"
+       use_fixproto=no
        ;;
 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"
+       use_fixproto=no
        ;;
 am33_2.0-*-linux*)
        tm_file="mn10300/mn10300.h dbxelf.h elfos.h linux.h mn10300/linux.h"
@@ -2163,25 +2197,16 @@ am33_2.0-*-linux*)
        fi
        extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
        use_collect2=no
+       use_fixproto=no
        ;;
 *)
-       echo "*** Configuration $machine not supported" 1>&2
+       echo "*** Configuration ${target} 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).  Only do this if $machine is the target, or we'll try to validate
-# the CPU argument against the wrong machine type.
-
-if test "x$pass2done" = xyes
-then
+# too).
        case "x$with_cpu" in
        xyes | xno)
                echo "--with-cpu must be passed a value" 1>&2
@@ -2189,11 +2214,11 @@ then
                ;;
        esac
 
-       # If there is no $with_cpu option, try to infer one from ${machine}.
+       # If there is no $with_cpu option, try to infer one from ${target}.
        # This block sets nothing except for with_cpu.
        if test x$with_cpu = x
        then
-               case $machine in
+               case ${target} in
                ep9312-*-*)
                        # A Cirrus ARM variant.
                        with_cpu="ep9312"
@@ -2249,7 +2274,7 @@ then
                        with_cpu=k8
                        ;;
                alpha*-*-*)
-                       case $machine in
+                       case ${target} in
                        alphaev6[78]*)
                                with_cpu=ev67
                                ;;
@@ -2268,7 +2293,7 @@ then
                        esac
                        ;;
                sparc*-*-*)
-                       with_cpu="`echo $machine | sed 's/-.*$//'`"
+                       with_cpu="`echo ${target} | sed 's/-.*$//'`"
                        if [ x$with_cpu = xsparc64 ]; then
                                with_cpu=v9
                        fi
@@ -2278,7 +2303,7 @@ then
 
        # Similarly for --with-schedule.
        if test x$with_schedule = x; then
-               case $machine in
+               case ${target} in
                hppa1* | parisc1*)
                        # Override default PA8000 scheduling model.
                        with_schedule=7100LC
@@ -2293,7 +2318,7 @@ then
        # supported_defaults.
 
        supported_defaults=
-       case "$machine" in
+       case "${target}" in
        alpha*-*-*)
                supported_defaults="cpu tune"
                for which in cpu tune; do
@@ -2527,7 +2552,7 @@ then
        v850*-*-*)
                supported_defaults=cpu
                case "x$with_cpu" in
-               x | xv850e)
+               x | xv850e | xv850e1)
                        # OK
                        ;;
                *)
@@ -2540,7 +2565,7 @@ then
 
        # Set some miscellaneous flags for particular targets.
        target_cpu_default2=
-       case $machine in
+       case ${target} in
        alpha*-*-*)
                if test x$gas = xyes
                then
@@ -2569,7 +2594,7 @@ then
                ;;
 
        mips*-*-*)
-               case $machine in
+               case ${target} in
                mips*-*-ecoff* | mips*-*-elf*)
                        if test x$gas = xyes
                        then
@@ -2588,7 +2613,7 @@ then
                        fi
                        ;;
                esac
-               case $machine in
+               case ${target} in
                        mips*el-*-*)
                                tm_defines="TARGET_ENDIAN_DEFAULT=0 $tm_defines"
                                ;;
@@ -2694,31 +2719,3 @@ then
                        target_cpu_default=$target_cpu_default2
                fi
        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
-       then
-               if test x$xm_file != x
-               then host_xm_file=$xm_file
-               fi
-               host_xm_defines=$xm_defines
-               host_xmake_file="$xmake_file"
-               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