OSDN Git Service

* config.gcc: Move use_fixproto=no from generic vxworks clause to
[pf3gnuchains/gcc-fork.git] / gcc / config.gcc
index 6881a45..0abadfc 100644 (file)
@@ -25,7 +25,7 @@
 # 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.
@@ -47,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.
 #
 #  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:
@@ -168,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
@@ -187,7 +194,7 @@ 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[123]*       \
@@ -205,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
@@ -215,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
@@ -304,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*)
                ;;
        *)
@@ -339,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}"
                ;;
@@ -372,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"
@@ -388,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"
                ;;
@@ -396,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
                ;;
@@ -430,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";;
@@ -445,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
@@ -476,10 +482,10 @@ 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
@@ -500,31 +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_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
@@ -538,10 +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*)
            # Set target_cpu_default except on 4.0a.
-           case $machine in
+           case ${target} in
                *-*-osf4.0a) ;;
                *) target_cpu_default=MASK_SUPPORT_ARCH
            esac
@@ -564,6 +573,7 @@ alpha64-dec-*vms*)
        tmake_file="alpha/t-alpha alpha/t-vms alpha/t-vms64 alpha/t-ieee"
        prefix=/gnu
        local_prefix=/gnu
+       use_fixproto=no
        ;;
 alpha*-dec-*vms*)
        tm_file="${tm_file} alpha/vms.h"
@@ -571,6 +581,7 @@ alpha*-dec-*vms*)
        tmake_file="alpha/t-alpha alpha/t-vms alpha/t-ieee"
        prefix=/gnu
        local_prefix=/gnu
+       use_fixproto=no
        ;;
 arc-*-elf*)
        tm_file="dbxelf.h elfos.h svr4.h ${tm_file}"
@@ -583,20 +594,24 @@ arm-*-coff* | armel-*-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"
@@ -608,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"
@@ -623,6 +639,7 @@ 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"
@@ -653,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
@@ -663,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}"
@@ -693,6 +714,7 @@ h8300-*-rtems*)
        if test x$enable_threads = xyes; then
          thread_file='rtems'
        fi
+       use_fixproto=no
        ;;
 h8300-*-elf*)
        tmake_file="h8300/t-h8300 h8300/t-elf"
@@ -714,36 +736,41 @@ 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
        ;;
 # port not yet contributed.
 #hppa*-*-openbsd*)
 #      target_cpu_default="MASK_PA_11"
-#      tmake_file=pa/t-bsd
+#      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"
+       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 dbxelf.h pa/som.h pa/pa-osf.h"
-       tmake_file="pa/t-bsd pa/t-pa"
+       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"
+       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 dbxelf.h pa/som.h"
        target_cpu_default="MASK_PA_11"
-       tmake_file="pa/t-bsd pa/t-pa"
+       tmake_file="pa/t-pa"
        use_collect2=yes
+       use_fixproto=no
        ;;
 hppa1.1-*-hpux10* | hppa2*-*-hpux10*)
        target_cpu_default="MASK_PA_11"
@@ -821,9 +848,11 @@ hppa1.0-*-hpux11*)
 i370-*-opened*)                         # IBM 360/370/390 Architecture
        xm_defines='FATAL_EXIT_CODE=12'
        tm_file="i370/oe.h i370/i370.h"
-       tmake_file="i370/t-oe i370/t-i370"
+       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'
@@ -836,7 +865,7 @@ i370-*-linux*)
        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"
@@ -853,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
@@ -872,28 +901,35 @@ 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="i386/i386.h i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h openbsd-oldgas.h openbsd.h i386/openbsd.h"
@@ -901,15 +937,17 @@ i[34567]86-*-openbsd*)
        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
@@ -921,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
@@ -966,6 +1008,7 @@ i[34567]86-*-nto-qnx*)
        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"
@@ -974,6 +1017,7 @@ 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
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h i386/sco5.h"
@@ -1069,6 +1113,7 @@ i[34567]86-*-pe | i[34567]86-*-cygwin*)
        if test x$enable_threads = xyes; then
                thread_file='posix'
        fi
+       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"
@@ -1078,13 +1123,14 @@ i[34567]86-*-mingw32*)
        if test x$enable_threads = xyes; then
                thread_file='win32'
        fi
-       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"
@@ -1096,7 +1142,7 @@ i[34567]86-*-uwin*)
        ;;
 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
        if test x$enable_threads = xyes ; then
                thread_file='posix'
@@ -1104,10 +1150,11 @@ i[34567]86-*-interix3*)
        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'
@@ -1115,6 +1162,7 @@ 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"
@@ -1139,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
@@ -1165,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"
@@ -1174,6 +1224,7 @@ 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"
@@ -1187,6 +1238,10 @@ ia64*-*-hpux*)
        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}"
@@ -1260,7 +1315,7 @@ m68020-*-elf* | m68k-*-elf*)
        ;;
 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"
                ;;
@@ -1268,12 +1323,14 @@ m68010-*-netbsdelf* | m68k*-*-netbsdelf*)
                target_cpu_default="MASK_68020|MASK_68881|MASK_BITFIELD"
                ;;
        esac
+       use_fixproto=no
        ;;
 m68k*-*-netbsd*)
        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
@@ -1282,6 +1339,7 @@ m68k*-*-openbsd*)
        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/m68k.h m68k/sgs.h dbxelf.h elfos.h svr4.h m68k/m68kv4.h"
@@ -1295,14 +1353,16 @@ m68k-*-linux*)          # Motorola m68k's running GNU/Linux
        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"
+       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"
@@ -1389,6 +1449,7 @@ mips*-*-netbsd*)                  # NetBSD/mips, either endian.
        target_cpu_default="MASK_GAS|MASK_ABICALLS"
        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"
@@ -1407,26 +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*-*-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/mips.h openbsd.h mips/openbsd.h mips/sdb.h"
-       case $machine in
+       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"
@@ -1480,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"
@@ -1501,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"
@@ -1509,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"
@@ -1521,6 +1588,7 @@ avr-*-*)
 #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"
@@ -1529,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"
@@ -1549,10 +1619,12 @@ powerpc-*-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"
@@ -1574,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"
@@ -1586,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"
@@ -1593,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"
@@ -1612,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"
@@ -1619,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
@@ -1627,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"
@@ -1644,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"
@@ -1692,6 +1775,7 @@ rs6000-*-lynxos*)
 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"
@@ -1700,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/elf.h sh/embed-elf.h"
-       case $machine in
+       case ${target} in
        sh64*)
                tmake_file="${tmake_file} sh/t-sh64"
                tm_file="${tm_file} sh/sh64.h"
@@ -1723,10 +1808,10 @@ 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
        ;;
@@ -1736,6 +1821,7 @@ sh-*-rtemself*)
        if test x$enable_threads = xyes; then
          thread_file='rtems'
        fi
+       use_fixproto=no
        ;;
 sh-*-rtems*)
        tmake_file="sh/t-sh t-rtems"
@@ -1743,10 +1829,11 @@ 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"
-       case $machine in
+       case ${target} in
        sh*be-*-* | sh*eb-*-*) ;;
        *)
                tm_file="sh/little.h ${tm_file}"
@@ -1755,7 +1842,7 @@ sh-*-linux* | sh[2346lbe]*-*-linux*)
        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"
@@ -1772,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"
@@ -1789,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"
@@ -1806,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"
@@ -1815,6 +1904,7 @@ 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_defines=OBSD_OLD_GAS
@@ -1823,11 +1913,13 @@ sparc-*-openbsd*)
        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"
@@ -1837,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"
@@ -1845,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"
@@ -1887,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"
@@ -1956,15 +2050,18 @@ sparc64-*-freebsd*|ultrasparc-*-freebsd*)
                *) 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"
@@ -1988,6 +2085,21 @@ 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"
@@ -2024,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 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)
@@ -2070,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"
@@ -2084,9 +2197,10 @@ 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
@@ -2100,11 +2214,11 @@ esac
                ;;
        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"
@@ -2160,7 +2274,7 @@ esac
                        with_cpu=k8
                        ;;
                alpha*-*-*)
-                       case $machine in
+                       case ${target} in
                        alphaev6[78]*)
                                with_cpu=ev67
                                ;;
@@ -2179,7 +2293,7 @@ esac
                        esac
                        ;;
                sparc*-*-*)
-                       with_cpu="`echo $machine | sed 's/-.*$//'`"
+                       with_cpu="`echo ${target} | sed 's/-.*$//'`"
                        if [ x$with_cpu = xsparc64 ]; then
                                with_cpu=v9
                        fi
@@ -2189,7 +2303,7 @@ esac
 
        # 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
@@ -2204,7 +2318,7 @@ esac
        # supported_defaults.
 
        supported_defaults=
-       case "$machine" in
+       case "${target}" in
        alpha*-*-*)
                supported_defaults="cpu tune"
                for which in cpu tune; do
@@ -2438,7 +2552,7 @@ esac
        v850*-*-*)
                supported_defaults=cpu
                case "x$with_cpu" in
-               x | xv850e)
+               x | xv850e | xv850e1)
                        # OK
                        ;;
                *)
@@ -2451,7 +2565,7 @@ esac
 
        # Set some miscellaneous flags for particular targets.
        target_cpu_default2=
-       case $machine in
+       case ${target} in
        alpha*-*-*)
                if test x$gas = xyes
                then
@@ -2480,7 +2594,7 @@ esac
                ;;
 
        mips*-*-*)
-               case $machine in
+               case ${target} in
                mips*-*-ecoff* | mips*-*-elf*)
                        if test x$gas = xyes
                        then
@@ -2499,7 +2613,7 @@ esac
                        fi
                        ;;
                esac
-               case $machine in
+               case ${target} in
                        mips*el-*-*)
                                tm_defines="TARGET_ENDIAN_DEFAULT=0 $tm_defines"
                                ;;