OSDN Git Service

* config.gcc (sh5-*-netbsd*, sh5l*-*-netbsd*)
[pf3gnuchains/gcc-fork.git] / gcc / config.gcc
index f13cf2d..7dd42e2 100644 (file)
@@ -207,6 +207,26 @@ gas="$gas_flag"
 gnu_ld="$gnu_ld_flag"
 enable_threads=$enable_threads_flag
 
+# Obsolete configurations.
+case $machine in
+   m88k-*-aout*     \
+ | m88k-*-openbsd*  \
+ | m88k-*-sysv4*    \
+ | mips-sni-sysv4   \
+ | mn10200-*-*      \
+ | ns32k-*-netbsd*  \
+ | ns32k-*-openbsd* \
+ | romp-*-openbsd*  \
+ )
+    if test "x$enable_obsolete" != xyes; then
+      echo "*** Configuration $machine 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
+      exit 1
+    fi;;
+esac
+
 # Set default cpu_type, tm_file, tm_p_file and xm_file so it can be
 # updated in each machine entry.  Also set default extra_headers for some
 # machines.
@@ -225,10 +245,6 @@ arm*-*-*)
 xscale-*-*)
        cpu_type=arm
        ;;
-c*-convex-*)
-       cpu_type=convex
-       extra_headers=proto.h
-       ;;
 i[34567]86-*-*)
        cpu_type=i386
        extra_headers="mmintrin.h xmmintrin.h"
@@ -253,9 +269,6 @@ m68k-*-*)
 mips*-*-*)
        cpu_type=mips
        ;;
-pj*-*-*)
-       cpu_type=pj
-       ;;
 powerpc*-*-*)
        cpu_type=rs6000
        extra_headers="ppc-asm.h altivec.h"
@@ -263,7 +276,8 @@ powerpc*-*-*)
 sparc*-*-*)
        cpu_type=sparc
        ;;
-sh64-*-*)
+# Note the 'l'; we need to be able to match e.g. "shle" or "shl".
+sh[123456789l]*-*-*)
        cpu_type=sh
        ;;
 esac
@@ -402,39 +416,6 @@ case $machine in
        then tmake_file=${cpu_type}/t-$rest
        fi
        ;;
-1750a-*-*)
-       # 1750a is only supported as a target.
-       case "$build,$host" in 1750a*,* | *,1750a* )
-               echo "*** $machine is only supported as a target" >&2
-               exit 1
-       esac
-       ;;
-a29k-*-bsd* | a29k-*-sym1*)
-       tm_file="${tm_file} a29k/unix.h"
-       xm_defines=POSIX
-       use_collect2=yes
-       ;;
-a29k-*-udi | a29k-*-coff)
-       tm_file="${tm_file} dbxcoff.h"
-       tmake_file=a29k/t-a29kbare
-       ;;
-a29k*-*-rtems*)
-       xm_defines=POSIX
-       tm_file="a29k/a29k.h a29k/rtems.h rtems.h"
-       tmake_file="a29k/t-a29kbare t-rtems"
-       if test x$enable_threads = xyes; then
-         thread_file='rtems'
-       fi
-       ;;
-a29k-wrs-vxworks*)
-       tm_file="${tm_file} dbxcoff.h a29k/vx29k.h"
-       tmake_file=a29k/t-vx29k
-       extra_parts="crtbegin.o crtend.o"
-       thread_file='vxworks'
-       ;;
-a29k-*-*)                      # Default a29k environment.
-       use_collect2=yes
-       ;;
 alpha*-*-unicosmk*)
        use_collect2=yes
        tm_file="${tm_file} alpha/unicosmk.h"
@@ -502,7 +483,6 @@ 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"
-       extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o"
        ;;
 
 alpha*-*-openbsd*)
@@ -512,7 +492,7 @@ alpha*-*-openbsd*)
        tmake_file="alpha/t-alpha alpha/t-ieee"
        ;;
 
-alpha*-dec-osf*)
+alpha*-dec-osf[45]*)
        xm_defines=POSIX
        if test x$stabs = xyes
        then
@@ -523,31 +503,24 @@ alpha*-dec-osf*)
                extra_passes="mips-tfile mips-tdump"
        fi
        use_collect2=yes
-       tmake_file="alpha/t-alpha alpha/t-ieee alpha/t-crtfm"
+       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
-         *-*-osf1*)
-           tm_file="${tm_file} alpha/osf.h alpha/osf12.h alpha/osf2or3.h"
-           ;;
-         *-*-osf[23]*)
-           tm_file="${tm_file} alpha/osf.h alpha/osf2or3.h"
-           ;;
          *-*-osf4*)
-           tm_file="${tm_file} alpha/osf.h"
-           tmake_file="$tmake_file alpha/t-osf4"
            # Some versions of OSF4 (specifically X4.0-9 296.7) have
            # a broken tar, so we use cpio instead.
            install_headers_dir=install-headers-cpio
+           # Set target_cpu_default except on 4.0a.
+           case $machine in
+               *-*-osf4.0a) ;;
+               *) target_cpu_default=MASK_SUPPORT_ARCH
+           esac
            ;;
          *-*-osf5*)
-           tm_file="${tm_file} alpha/osf.h alpha/osf5.h"
-           tmake_file="$tmake_file alpha/t-osf4"
-           float_format=i128
-           ;;
-       esac
-       case $machine in
-         *-*-osf4.0[b-z] | *-*-osf4.[1-9]* | *-*-osf5*)
+           tm_file="${tm_file} alpha/osf5.h"
            target_cpu_default=MASK_SUPPORT_ARCH
+           float_format=i128
            ;;
        esac
        ;;
@@ -611,20 +584,6 @@ arm-*-vxworks*)
        tmake_file=arm/t-arm-coff
        thread_file='vxworks'
        ;;
-arm-*-riscix1.[01]*)           # Acorn RISC machine (early versions)
-       tm_file="arm/riscix1-1.h arm/arm.h"
-       use_collect2=yes
-       ;;
-arm-*-riscix*)                 # Acorn RISC machine
-       if test x$gas = xyes
-       then
-           tm_file="arm/riscix.h arm/rix-gas.h arm/arm.h"
-       else
-           tm_file="arm/riscix.h arm/arm.h"
-       fi
-       tmake_file=arm/t-riscix
-       use_collect2=yes
-       ;;
 arm-semi-aout | armel-semi-aout)
        tm_file="arm/semi.h arm/aout.h arm/arm.h"
        tmake_file=arm/t-semi
@@ -695,26 +654,6 @@ arm-*-pe*)
        ;;
 avr-*-*)
        ;;
-c1-convex-*)                   # Convex C1
-       target_cpu_default=1
-       use_collect2=yes
-       ;;
-c2-convex-*)                   # Convex C2
-       target_cpu_default=2
-       use_collect2=yes
-       ;;
-c32-convex-*)
-       target_cpu_default=4
-       use_collect2=yes
-       ;;
-c34-convex-*)
-       target_cpu_default=8
-       use_collect2=yes
-       ;;
-c38-convex-*)
-       target_cpu_default=16
-       use_collect2=yes
-       ;;
 c4x-*-rtems*)
        xm_defines=POSIX
        tmake_file="c4x/t-c4x t-rtems"
@@ -731,12 +670,6 @@ c4x-*)
        c_target_objs="c4x-c.o"
        cxx_target_objs="c4x-c.o"
        ;;
-clipper-intergraph-clix*)
-       tm_file="${tm_file} svr3.h clipper/clix.h"
-       xm_defines=POSIX
-       extra_parts="crtbegin.o crtend.o"
-       install_headers_dir=install-headers-cpio
-       ;;
 cris-*-aout)
        tm_file="dbxelf.h ${tm_file} cris/aout.h"
        gas=yes
@@ -764,9 +697,6 @@ d30v-*)
        ;;
 dsp16xx-*)
        ;;
-elxsi-elxsi-*)
-       use_collect2=yes
-       ;;
 fr30-*-elf)
        tm_file="dbxelf.h elfos.h svr4.h ${tm_file}"
        tmake_file=fr30/t-fr30
@@ -815,11 +745,13 @@ hppa1.1-*-pro*)
        target_cpu_default="(MASK_JUMP_IN_DELAY | MASK_PORTABLE_RUNTIME | MASK_GAS | MASK_NO_SPACE_REGS | MASK_SOFT_FLOAT)"
        tm_file="${tm_file} pa/pa32-regs.h dbxelf.h elfos.h pa/elf.h pa/pa-pro-end.h libgloss.h"
        tmake_file="pa/t-bsd pa/t-pro"
+       xmake_file="pa/x-ada"
        ;;
 hppa1.1-*-osf*)
        target_cpu_default="MASK_PA_11"
        tm_file="${tm_file} pa/pa32-regs.h pa/som.h pa/pa-osf.h"
        tmake_file="pa/t-bsd pa/t-pa"
+       xmake_file="pa/x-ada"
        use_collect2=yes
        ;;
 hppa1.1-*-rtems*)
@@ -827,21 +759,25 @@ 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"
+       xmake_file="pa/x-ada"
        ;;
 hppa1.0-*-osf*)
        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"
        use_collect2=yes
        ;;
 hppa1.1-*-bsd*)
        tm_file="${tm_file} pa/pa32-regs.h pa/som.h"
        target_cpu_default="MASK_PA_11"
        tmake_file="pa/t-bsd pa/t-pa"
+       xmake_file="pa/x-ada"
        use_collect2=yes
        ;;
 hppa1.0-*-bsd*)
        tm_file="${tm_file} pa/pa32-regs.h pa/som.h"
        tmake_file="pa/t-bsd pa/t-pa"
+       xmake_file="pa/x-ada"
        use_collect2=yes
        ;;
 hppa1.0-*-hpux7*)
@@ -895,6 +831,7 @@ hppa1.1-*-hpux10* | hppa2*-*-hpux10*)
        float_format=i128
        xm_defines=POSIX
        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
@@ -911,6 +848,7 @@ hppa1.0-*-hpux10*)
        float_format=i128
        xm_defines=POSIX
        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
@@ -927,6 +865,7 @@ hppa*64*-*-hpux11*)
        tm_file="pa/pa64-start.h ${tm_file} pa/pa64-regs.h pa/long_double.h pa/elf.h pa/pa-hpux.h pa/pa-hpux11.h pa/pa-64.h pa/pa64-hpux.h"
        float_format=i128
        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)"
 
 #      if [ x$enable_threads = x ]; then
@@ -945,6 +884,7 @@ hppa1.1-*-hpux11* | hppa2*-*-hpux11*)
        float_format=i128
        xm_defines=POSIX
        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
@@ -960,6 +900,7 @@ hppa1.0-*-hpux11*)
        float_format=i128
        xm_defines=POSIX
        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
@@ -1004,6 +945,7 @@ hppa*-*-lites*)
        tm_file="${tm_file} pa/pa32-regs.h dbxelf.h elfos.h pa/elf.h"
        target_cpu_default="MASK_PA_11"
        tmake_file="pa/t-bsd pa/t-pa"
+       xmake_file="pa/x-ada"
        use_collect2=yes
        ;;
 hppa*-*-mpeix*)
@@ -1041,33 +983,11 @@ i370-*-linux*)
                thread_file='posix'
        fi
        ;;
-i[34567]86-*-chorusos*)
-       xm_defines=POSIX
-       tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h i386/i386elf.h chorus.h"
-       tmake_file="i386/t-i386elf t-svr4"
-       case x${enable_threads} in
-         xyes | xpthreads | xposix)
-               thread_file='posix'
-               ;;
-       esac
-       ;;
 i[34567]86-*-elf*)
        xm_defines=POSIX
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h i386/i386elf.h"
        tmake_file="i386/t-i386elf t-svr4"
        ;;
-i[34567]86-ibm-aix*)           # IBM PS/2 running AIX
-        if test x$gas = xyes
-       then
-               tm_file="${tm_file} svr3.h i386/unix.h i386/att.h i386/aix386.h"
-               extra_parts="crtbegin.o crtend.o"
-               tmake_file=i386/t-crtstuff
-       else
-               tm_file="${tm_file} svr3.h i386/unix.h i386/att.h i386/aix386ng.h"
-               use_collect2=yes
-       fi
-       xm_defines=POSIX
-       ;;
 i[34567]86-ncr-sysv4*)         # NCR 3000 - ix86 running system V.4
        xm_defines="POSIX SMALL_ARG_MAX"
        if test x$stabs = xyes -a x$gas = xyes
@@ -1079,43 +999,10 @@ i[34567]86-ncr-sysv4*)           # NCR 3000 - ix86 running system V.4
        extra_parts="crtbegin.o crtend.o"
        tmake_file=i386/t-crtpic
        ;;
-i[34567]86-next-*)
-       tm_p_file="${tm_p_file} nextstep-protos.h"
-       tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h nextstep.h i386/next.h"
-       tmake_file=i386/t-next
-       extra_objs=nextstep.o
-       extra_parts="crtbegin.o crtend.o"
-       if test x$enable_threads = xyes; then
-               thread_file='mach'
-       fi
-       ;;
 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
        ;;
-i[34567]86-sequent-bsd*)               # 80386 from Sequent
-       use_collect2=yes
-       if test x$gas = xyes
-       then
-               tm_file="${tm_file} i386/unix.h i386/bsd.h i386/sequent.h i386/seq-gas.h"
-       else
-               tm_file="${tm_file} i386/unix.h i386/bsd.h i386/sequent.h"
-       fi
-       ;;
-i[34567]86-sequent-ptx1*)
-       xm_defines=POSIX
-       tm_file="${tm_file} svr3.h i386/unix.h i386/att.h i386/sysv3.h i386/seq-sysv3.h"
-       tmake_file=i386/t-crtstuff
-       extra_parts="crtbegin.o crtend.o"
-       install_headers_dir=install-headers-cpio
-       ;;
-i[34567]86-sequent-ptx2* | i[34567]86-sequent-sysv3*)
-       xm_defines=POSIX
-       tm_file="${tm_file} svr3.h i386/unix.h i386/att.h i386/sysv3.h i386/seq-sysv3.h i386/seq2-sysv3.h"
-       tmake_file=i386/t-crtstuff
-       extra_parts="crtbegin.o crtend.o"
-       install_headers_dir=install-headers-cpio
-       ;;
 i[34567]86-sequent-ptx4* | i[34567]86-sequent-sysv4*)
        if test x$gas = xyes
        then
@@ -1127,10 +1014,9 @@ i[34567]86-sequent-ptx4* | i[34567]86-sequent-sysv4*)
        extra_parts="crtbegin.o crtend.o"
        install_headers_dir=install-headers-cpio
        ;;
-i386-sun-sunos*)               # Sun i386 roadrunner
-       xm_defines=POSIX
-       tm_file="${tm_file} i386/unix.h i386/sun386.h i386/sun.h"
-       use_collect2=yes
+i[34567]86-sequent-sysv*)      # would otherwise be caught by i?86-*-sysv*
+       echo "*** Configuration $machine not supported" 1>&2
+       exit 1
        ;;
 i[34567]86-wrs-vxworks*)
        tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h i386/i386-aout.h i386/vxi386.h"
@@ -1145,17 +1031,7 @@ i[34567]86-*-beoself* | i[34567]86-*-beos*)
        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'
        ;;
-i[34567]86-*-bsdi* | i[34567]86-*-bsd386*)
-       tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h i386/386bsd.h i386/bsd386.h"
-#      tmake_file=t-libc-ok
-       ;;
-i[34567]86-*-bsd*)
-       tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h i386/386bsd.h"
-#      tmake_file=t-libc-ok
-# Next line turned off because both 386BSD and BSD/386 use GNU ld.
-#      use_collect2=yes
-       ;;
-i[34567]86-*-freebsd[12] | i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd*aout*)
+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
        ;;
@@ -1188,27 +1064,9 @@ i[34567]86-*-openbsd*)
 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-*-isc*)             # 80386 running ISC system
-       xm_defines=POSIX
-        if test x$gas = xyes -a x$stabs = xyes
-       then
-               tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/svr3gas.h i386/svr3dbx.h i386/iscdbx.h"
-               tmake_file=i386/t-svr3dbx
-               extra_parts="svr3.ifile svr3z.ifile"
-       else
-               tm_file="${tm_file} svr3.h i386/unix.h i386/att.h i386/sysv3.h i386/isc.h"
-               tmake_file=i386/t-crtstuff
-               extra_parts="crtbegin.o crtend.o"
-       fi
-       install_headers_dir=install-headers-cpio
-       ;;
-i[34567]86-*-linux*oldld*)     # Intel 80386's running GNU/Linux
-                               # with a.out format using
-                               # pre BFD linkers
-       tmake_file="t-linux-aout i386/t-crtstuff"
-       tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h linux-aout.h i386/linux-oldld.h"
-       gnu_ld=yes
-       float_format=i386
+i[34567]86-*-linux*oldld*)     # would otherwise be caught by i?86-*-linux*
+       echo "*** Configuration $machine not supported" 1>&2
+       exit 1
        ;;
 i[34567]86-*-linux*aout*)      # Intel 80386's running GNU/Linux
                                # with a.out format
@@ -1291,35 +1149,12 @@ i[34567]86-*-mach*)
 #      tmake_file=t-libc-ok
        use_collect2=yes
        ;;
-i[34567]86-*-osfrose*)         # 386 using OSF/rose
-        if test x$elf = xyes
-       then
-               tm_file="${tm_file} halfpic.h i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h i386/osfrose.h i386/osfelf.h"
-               use_collect2=
-       else
-               tm_file="${tm_file} halfpic.h i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h i386/osfrose.h"
-               use_collect2=yes
-       fi
-       tmake_file=i386/t-osf
-       extra_objs=halfpic.o
-       ;;
-i[34567]86-go32-rtems*)
-       xm_defines=POSIX
-       tm_file="dbxcoff.h ${tm_file} i386/djgpp.h i386/djgpp-rtems.h rtems.h"
-       tmake_file=t-rtems
-       if test x$enable_threads = xyes; then
-         thread_file='rtems'
-       fi
-       ;;
-i[34567]86-*-rtemscoff*)
-       xm_defines=POSIX
-       tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h dbxcoff.h i386/i386-coff.h i386/rtems.h rtems.h"
-       tmake_file=t-rtems
-       if test x$enable_threads = xyes; then
-         thread_file='rtems'
-       fi
+i[34567]86-go32-rtems* | i[34567]86-*-rtemscoff*)
+       # would otherwise be caught by i?86-*-rtems*
+       echo "*** Configuration $machine not supported" 1>&2
+       exit 1
        ;;
-i[34567]86-*-rtems*|i[34567]86-*-rtemself*)
+i[34567]86-*-rtems*)
        xm_defines=POSIX
        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"
@@ -1398,17 +1233,6 @@ i[34567]86-*-udk*)      # Intel x86 on SCO UW/OSR5 Dev Kit
        extra_parts="crtbegin.o crtend.o"
        install_headers_dir=install-headers-cpio
        ;;
-i[34567]86-*-osf1*)            # Intel 80386's running OSF/1 1.3+
-       xm_defines='POSIX USE_C_ALLOCA SMALL_ARG_MAX'
-       if test x$stabs = xyes
-       then
-               tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h i386/sysv4.h i386/osf1elf.h i386/osf1elfgdb.h"
-       else
-               tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h i386/sysv4.h i386/osf1elf.h"
-       fi
-       tmake_file=i386/t-osf1elf
-       extra_parts="crti.o crtn.o crtbegin.o crtend.o"
-       ;;
 i[34567]86-*-sysv*)            # Intel 80386's running system V
        xm_defines=POSIX
        if test x$gas = xyes
@@ -1417,7 +1241,7 @@ i[34567]86-*-sysv*)               # Intel 80386's running system V
                then
                        tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/svr3gas.h i386/svr3dbx.h"
                        tmake_file=i386/t-svr3dbx
-                       extra_parts="svr3.ifile svr3z.rfile"
+                       extra_parts="svr3.ifile svr3z.ifile"
                else
                        tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/svr3gas.h"
                        extra_parts="crtbegin.o crtend.o"
@@ -1513,44 +1337,6 @@ i[34567]86-*-interix*)
                tm_file="${tm_file} dbxcoff.h"
        fi
        ;;
-i[34567]86-dg-dgux*)
-       xm_defines=POSIX
-       tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h i386/sysv4.h i386/dgux.h"
-       tmake_file=i386/t-dgux
-       install_headers_dir=install-headers-cpio
-      ;;
-i860-alliant-*)                # Alliant FX/2800
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h i860/sysv4.h i860/fx2800.h"
-       tmake_file=i860/t-fx2800
-       extra_parts="crtbegin.o crtend.o"
-       ;;
-i860-*-bsd*)
-       tm_file="${tm_file} i860/bsd.h"
-       if test x$gas = xyes
-       then
-               tm_file="${tm_file} i860/bsd-gas.h"
-       fi
-       use_collect2=yes
-       ;;
-i860-*-mach*)
-       tm_file="${tm_file} i860/mach.h"
-       tmake_file=t-libc-ok
-       ;;
-i860-*-osf*)                   # Intel Paragon XP/S, OSF/1AD
-       tm_file="${tm_file} svr3.h i860/paragon.h"
-       xm_defines=POSIX
-       ;;
-i860-*-sysv3*)
-       tm_file="${tm_file} svr3.h i860/sysv3.h"
-       xm_defines=POSIX
-       extra_parts="crtbegin.o crtend.o"
-       ;;
-i860-*-sysv4*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h i860/sysv4.h"
-       xm_defines=POSIX
-       tmake_file=t-svr4
-       extra_parts="crtbegin.o crtend.o"
-       ;;
 i960-wrs-vxworks5 | i960-wrs-vxworks5.0*)
        tm_file="${tm_file} i960/vx960.h"
        tmake_file=i960/t-vxworks960
@@ -1659,11 +1445,6 @@ m68hc12-*-*|m6812-*-*)
        out_file="m68hc11/m68hc11.c"
        tmake_file="m68hc11/t-m68hc11-gas"
         ;;
-m68000-convergent-sysv*)
-       tm_file=m68k/ctix.h
-       xm_defines=POSIX
-       use_collect2=yes
-       ;;
 m68000-hp-bsd*)                        # HP 9000/200 running BSD
        tm_file=m68k/hp2bsd.h
        use_collect2=yes
@@ -1698,57 +1479,6 @@ m68000-att-sysv*)
        fi
        use_collect2=yes
        ;;
-m68k-apple-aux*)               # Apple Macintosh running A/UX
-       xm_defines=POSIX
-       tmake_file=m68k/t-aux
-       install_headers_dir=install-headers-cpio
-       extra_parts="crt1.o mcrt1.o maccrt1.o crt2.o crtn.o"
-       tm_file=
-       if test "$gnu_ld" = yes
-       then
-               tm_file="${tm_file} m68k/auxgld.h"
-       else
-               tm_file="${tm_file} m68k/auxld.h"
-       fi
-       if test "$gas" = yes
-       then
-               tm_file="${tm_file} m68k/auxgas.h"
-       else
-               tm_file="${tm_file} m68k/auxas.h"
-       fi
-       tm_file="${tm_file} m68k/a-ux.h"
-       float_format=m68k
-       ;;
-m68k-apollo-*)
-       tm_file=m68k/apollo68.h
-       use_collect2=yes
-       float_format=m68k
-       ;;
-m68k-altos-sysv*)                 # Altos 3068
-       if test x$gas = xyes
-       then
-               tm_file=m68k/altos3068.h
-               xm_defines=POSIX
-       else
-               echo "The Altos is supported only with the GNU assembler" 1>&2
-               exit 1
-       fi
-        ;;
-m68k-bull-sysv*)               # Bull DPX/2
-       if test x$gas = xyes
-       then
-               if test x$stabs = xyes
-               then
-                       tm_file=m68k/dpx2cdbx.h
-               else
-                       tm_file=m68k/dpx2g.h
-               fi
-       else
-               tm_file=m68k/dpx2.h
-       fi
-       xm_defines=POSIX
-       use_collect2=yes
-       ;;
 m68k-atari-sysv4*)              # Atari variant of V.4.
        tm_file=m68k/atari.h
        xm_defines=POSIX
@@ -1756,6 +1486,11 @@ m68k-atari-sysv4*)              # Atari variant of V.4.
        extra_parts="crtbegin.o crtend.o"
        float_format=m68k
        ;;
+m68k-apollo-sysv* | m68k-bull-sysv*)
+       # can otherwise be caught by m68k-*-sysv4*
+       echo "*** Configuration $machine not supported" 1>&2
+       exit 1
+       ;;
 m68k-motorola-sysv*)
        tm_file=m68k/mot3300.h
        xm_defines=POSIX
@@ -1822,16 +1557,6 @@ m68k-hp-bsd*)                    # HP 9000/3xx running Berkeley Unix
        use_collect2=yes
        float_format=m68k
        ;;
-m68k-isi-bsd*)
-       if test x$with_fp = xno
-       then
-               tm_file=m68k/isi-nfp.h
-       else
-               tm_file=m68k/isi.h
-               float_format=m68k
-       fi
-       use_collect2=yes
-       ;;
 m68k-hp-hpux7*)        # HP 9000 series 300 running HPUX version 7.
        xm_defines=POSIX
        if test x$gas = xyes
@@ -1865,47 +1590,6 @@ m68k-sun-mach*)
        use_collect2=yes
        float_format=m68k
        ;;
-m68k-sony-newsos3*)
-       if test x$gas = xyes
-       then
-               tm_file=m68k/news3gas.h
-       else
-               tm_file=m68k/news3.h
-       fi
-       use_collect2=yes
-       float_format=m68k
-       ;;
-m68k-sony-bsd* | m68k-sony-newsos*)
-       if test x$gas = xyes
-       then
-               tm_file=m68k/newsgas.h
-       else
-               tm_file=m68k/news.h
-       fi
-       use_collect2=yes
-       float_format=m68k
-       ;;
-m68k-next-nextstep2*)
-       tm_p_file="${tm_p_file} nextstep-protos.h"
-       tm_file=m68k/next21.h
-       tmake_file=m68k/t-next
-       xmake_file=m68k/x-next
-       extra_objs=nextstep.o
-       use_collect2=yes
-       float_format=m68k
-        ;;
-m68k-next-nextstep[34]*)
-       tm_p_file="${tm_p_file} nextstep-protos.h"
-       tm_file=m68k/next.h
-       tmake_file=m68k/t-next
-       xmake_file=m68k/x-next
-       extra_objs=nextstep.o
-       extra_parts="crtbegin.o crtend.o"
-       float_format=m68k
-       if test x$enable_threads = xyes; then
-               thread_file='mach'
-       fi
-       ;;
 m68k-sun-sunos3*)
        if test x$with_fp = xno
        then
@@ -1948,16 +1632,6 @@ m68020-*-elf* | m68k-*-elf*)
        tmake_file=m68k/t-m68kelf
        extra_parts="crtbegin.o crtend.o"
        ;;
-m68k-*-lynxos*)
-       if test x$gas = xyes
-       then
-               tm_file=m68k/lynx.h
-       else
-               tm_file=m68k/lynx-ng.h
-       fi
-       tmake_file=m68k/t-lynx
-       float_format=m68k
-       ;;
 m68010-*-netbsdelf* | m68k*-*-netbsdelf*)
        tm_file="${tm_file} dbxelf.h elfos.h netbsd.h netbsd-elf.h m68k/netbsd-elf.h"
        case $machine in
@@ -1983,11 +1657,6 @@ m68k*-*-openbsd*)
        # we need collect2 until our bug is fixed...
        use_collect2=yes
        ;;
-m68k-*-sysv3*)                 # Motorola m68k's running system V.3
-       xm_defines=POSIX
-       extra_parts="crtbegin.o crtend.o"
-       float_format=m68k
-       ;;
 m68k-*-sysv4*)                 # Motorola m68k's running system V.4
        tm_file=m68k/m68kv4.h
        xm_defines=POSIX
@@ -2028,16 +1697,11 @@ m68k-*-psos*)
        tm_file=m68k/m68k-psos.h
        float_format=m68k
        ;;
-m68k-*-rtemscoff*)
-       xm_defines=POSIX
-       tmake_file="m68k/t-m68kbare t-rtems"
-       tm_file="m68k/m68k-coff.h m68k/rtems.h rtems.h"
-       float_format=m68k
-       if test x$enable_threads = xyes; then
-         thread_file='rtems'
-       fi
+m68k-*-rtemscoff*)     # would otherwise be caught by m68k-*-rtems*
+       echo "*** Configuration $machine not supported" 1>&2
+       exit 1
        ;;
-m68k-*-rtemself*|m68k-*-rtems*)
+m68k-*-rtems*)
        xm_defines=POSIX
        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"
@@ -2047,79 +1711,17 @@ m68k-*-rtemself*|m68k-*-rtems*)
          thread_file='rtems'
        fi
        ;;
-m88k-dg-dgux*)
-       xm_defines=POSIX
-       case $machine in
-         m88k-dg-dguxbcs*)
-           tm_file="dbxelf.h elfos.h svr4.h m88k/dgux.h m88k/dguxbcs.h"
-           tmake_file="m88k/t-dgux m88k/t-dguxbcs"
-           ;;
-         *)
-           tm_file="dbxelf.h elfos.h svr4.h m88k/dgux.h"
-           tmake_file=m88k/t-dgux
-           ;;
-       esac
-       extra_parts="crtbegin.o bcscrtbegin.o crtend.o m88kdgux.ld"
-       if test x$gas = xyes
-       then
-               tmake_file=m88k/t-dgux-gas
-       fi
-       ;;
-m88k-dolphin-sysv3*)
-       xm_defines=POSIX
-       tm_file=m88k/dolph.h
-       extra_parts="crtbegin.o crtend.o"
-       tmake_file=m88k/t-dolph
-       if test x$gas = xyes
-       then
-               tmake_file=m88k/t-m88k-gas
-       fi
-       ;;
-m88k-tektronix-sysv3)
-       xm_defines=POSIX
-       tm_file=m88k/tekXD88.h
-       extra_parts="crtbegin.o crtend.o"
-       tmake_file=m88k/t-tekXD88
-       if test x$gas = xyes
-       then
-               tmake_file=m88k/t-m88k-gas
-       fi
-       ;;
 m88k-*-aout*)
        xm_defines=POSIX
        tm_file=m88k/m88k-aout.h
        ;;
-m88k-*-coff*)
-       xm_defines=POSIX
-       tm_file=m88k/m88k-coff.h
-       tmake_file=m88k/t-bug
-       ;;
-m88k-*-luna*)
-       tm_file=m88k/luna.h
-       extra_parts="crtbegin.o crtend.o"
-       if test x$gas = xyes
-       then
-               tmake_file=m88k/t-luna-gas
-       else
-               tmake_file=m88k/t-luna
-       fi
-       ;;
 m88k-*-openbsd*)
        tmake_file="${tmake_file} m88k/t-luna-gas"
        tm_file="m88k/aout-dbx.h aoutos.h m88k/m88k.h openbsd.h ${tm_file}"
        ;;
-m88k-*-sysv3*)
+m88k-*-sysv4*)
        xm_defines=POSIX
-       tm_file=m88k/sysv3.h
-       extra_parts="crtbegin.o crtend.o"
-       if test x$gas = xyes
-       then
-               tmake_file=m88k/t-m88k-gas
-       fi
-       ;;
-m88k-*-sysv4*)
-       xm_defines=POSIX
-       tm_file="dbxelf.h elfos.h svr4.h m88k/sysv4.h"
+       tm_file="dbxelf.h elfos.h svr4.h m88k/sysv4.h"
        extra_parts="crtbegin.o crtend.o"
        tmake_file=m88k/t-sysv4
        ;;
@@ -2202,96 +1804,10 @@ mips-sgi-irix5*)                # SGI System V.4., IRIX 5
 #              thread_file='irix'
 #      fi
        ;;
-mips-sgi-irix4loser*)          # Mostly like a MIPS.
-       tm_file="mips/iris4loser.h mips/iris3.h ${tm_file} mips/iris4.h"
-       if test x$stabs = xyes; then
-               tm_file="${tm_file} dbx.h"
-       fi
-       tmake_file=mips/t-iris
-       xm_defines=POSIX
-       if test x$gas = xyes
-       then    :
-       else
-               extra_passes="mips-tfile mips-tdump"
-       fi
-       if test x$gnu_ld != xyes
-       then
-               use_collect2=yes
-       fi
-#      if test x$enable_threads = xyes; then
-#              thread_file='irix'
-#      fi
-       ;;
-mips-sgi-irix4*)               # Mostly like a MIPS.
-       tm_file="mips/iris3.h ${tm_file} mips/iris4.h"
-       if test x$stabs = xyes; then
-               tm_file="${tm_file} dbx.h"
-       fi
-       tmake_file=mips/t-iris
-       xm_defines=POSIX
-       if test x$gas = xyes
-       then    :
-       else
-               extra_passes="mips-tfile mips-tdump"
-       fi
-       if test x$gnu_ld != xyes
-       then
-               use_collect2=yes
-       fi
-#      if test x$enable_threads = xyes; then
-#              thread_file='irix'
-#      fi
-       ;;
-mips-sgi-*)                    # Mostly like a MIPS.
-       tm_file="mips/iris3.h ${tm_file}"
-       if test x$stabs = xyes; then
-               tm_file="${tm_file} dbx.h"
-       fi
-       xm_defines=POSIX
-       if test x$gas = xyes
-       then    :
-       else
-               extra_passes="mips-tfile mips-tdump"
-       fi
-       if test x$gnu_ld != xyes
-       then
-               use_collect2=yes
-       fi
-       ;;
-mips-dec-osfrose*)             # Decstation running OSF/1 reference port with OSF/rose.
-       tm_file="mips/osfrose.h ${tm_file}"
-       extra_objs=halfpic.o
-       use_collect2=yes
-       ;;
-mips-dec-osf*)                 # Decstation running OSF/1 as shipped by DIGITAL
-       tm_file=mips/dec-osf1.h
-       if test x$stabs = xyes; then
-               tm_file="${tm_file} dbx.h"
-       fi
-       if test x$gas = xyes
-       then    :
-       else
-               tmake_file=mips/t-ultrix
-               extra_passes="mips-tfile mips-tdump"
-       fi
-       if test x$gnu_ld != xyes
-       then
-               use_collect2=yes
-       fi
+mips-sgi-*)    # would otherwise be caught by mips-*-elf*
+       echo "*** Configuration $machine not supported" 1>&2
+       exit 1
        ;;
-mips-dec-bsd*)                  # Decstation running 4.4 BSD
-      tm_file=mips/dec-bsd.h
-      if test x$gas = xyes
-      then     :
-      else
-               tmake_file=mips/t-ultrix
-               extra_passes="mips-tfile mips-tdump"
-      fi
-      if test x$gnu_ld != xyes
-      then
-               use_collect2=yes
-      fi
-      ;;
 mips*-*-netbsd*)                       # NetBSD/mips, either endian.
        tm_file="elfos.h mips/netbsd.h"
        case $machine in
@@ -2328,192 +1844,6 @@ mips*-*-openbsd*)               # mips big endian
        target_cpu_default="MASK_GAS|MASK_ABICALLS"
        tm_file="mips/openbsd-be.h ${tm_file}"
        ;;
-mips-sony-bsd* | mips-sony-newsos*)    # Sony NEWS 3600 or risc/news.
-       tm_file="mips/news4.h ${tm_file}"
-       if test x$stabs = xyes; then
-               tm_file="${tm_file} dbx.h"
-       fi
-       if test x$gas = xyes
-       then    :
-       else
-               extra_passes="mips-tfile mips-tdump"
-       fi
-       if test x$gnu_ld != xyes
-       then
-               use_collect2=yes
-       fi
-       ;;
-mips-sony-sysv*)               # Sony NEWS 3800 with NEWSOS5.0.
-                               # That is based on svr4.
-       # t-svr4 is not right because this system doesn't use ELF.
-       tm_file="mips/news5.h ${tm_file}"
-       if test x$stabs = xyes; then
-               tm_file="${tm_file} dbx.h"
-       fi
-       xm_defines=POSIX
-       if test x$gas = xyes
-       then    :
-       else
-               extra_passes="mips-tfile mips-tdump"
-       fi
-       if test x$gnu_ld != xyes
-       then
-               use_collect2=yes
-       fi
-       ;;
-mips-tandem-sysv4*)            # Tandem S2 running NonStop UX
-       tm_file="mips/svr4-5.h mips/svr4-t.h"
-       if test x$stabs = xyes; then
-               tm_file="${tm_file} dbx.h"
-       fi
-       xm_defines=POSIX
-       if test x$gas = xyes
-       then
-               extra_parts="crtbegin.o crtend.o"
-       else
-               extra_passes="mips-tfile mips-tdump"
-       fi
-       if test x$gnu_ld != xyes
-       then
-               use_collect2=yes
-       fi
-       ;;
-mips-*-ultrix* | mips-dec-mach3)       # Decstation.
-       tm_file="mips/ultrix.h ${tm_file}"
-       if test x$stabs = xyes; then
-               tm_file="${tm_file} dbx.h"
-       fi
-       if test x$gas = xyes
-       then    :
-       else
-               tmake_file=mips/t-ultrix
-               extra_passes="mips-tfile mips-tdump"
-       fi
-       if test x$gnu_ld != xyes
-       then
-               use_collect2=yes
-       fi
-        ;;
-mips-*-riscos[56789]bsd*)
-       tm_file=mips/bsd-5.h    # MIPS BSD 4.3, RISC-OS 5.0
-       if test x$stabs = xyes; then
-               tm_file="${tm_file} dbx.h"
-       fi
-       if test x$gas = xyes
-       then
-               tmake_file=mips/t-bsd-gas
-       else
-               tmake_file=mips/t-bsd
-               extra_passes="mips-tfile mips-tdump"
-       fi
-       if test x$gnu_ld != xyes
-       then
-               use_collect2=yes
-       fi
-        ;;
-mips-*-bsd* | mips-*-riscosbsd* | mips-*-riscos[1234]bsd*)
-       tm_file="mips/bsd-4.h ${tm_file}" # MIPS BSD 4.3, RISC-OS 4.0
-       if test x$stabs = xyes; then
-               tm_file="${tm_file} dbx.h"
-       fi
-       if test x$gas = xyes
-       then
-               tmake_file=mips/t-bsd-gas
-       else
-               tmake_file=mips/t-bsd
-               extra_passes="mips-tfile mips-tdump"
-       fi
-       if test x$gnu_ld != xyes
-       then
-               use_collect2=yes
-       fi
-        ;;
-mips-*-riscos[56789]sysv4*)
-       tm_file=mips/svr4-5.h   # MIPS System V.4., RISC-OS 5.0
-       if test x$stabs = xyes; then
-               tm_file="${tm_file} dbx.h"
-       fi
-       if test x$gas = xyes
-       then
-               tmake_file=mips/t-svr4-gas
-       else
-               tmake_file=mips/t-svr4
-               extra_passes="mips-tfile mips-tdump"
-       fi
-       if test x$gnu_ld != xyes
-       then
-               use_collect2=yes
-       fi
-       ;;
-mips-*-sysv4* | mips-*-riscos[1234]sysv4* | mips-*-riscossysv4*)
-       tm_file="mips/svr4-4.h ${tm_file}"
-       if test x$stabs = xyes; then
-               tm_file="${tm_file} dbx.h"
-       fi
-       xm_defines=POSIX
-       if test x$gas = xyes
-       then
-               tmake_file=mips/t-svr4-gas
-       else
-               tmake_file=mips/t-svr4
-               extra_passes="mips-tfile mips-tdump"
-       fi
-       if test x$gnu_ld != xyes
-       then
-               use_collect2=yes
-       fi
-       ;;
-mips-*-riscos[56789]sysv*)
-       tm_file=mips/svr3-5.h   # MIPS System V.3, RISC-OS 5.0
-       if test x$stabs = xyes; then
-               tm_file="${tm_file} dbx.h"
-       fi
-       xm_defines=POSIX
-       if test x$gas = xyes
-       then
-               tmake_file=mips/t-svr3-gas
-       else
-               tmake_file=mips/t-svr3
-               extra_passes="mips-tfile mips-tdump"
-       fi
-       if test x$gnu_ld != xyes
-       then
-               use_collect2=yes
-       fi
-       ;;
-mips-*-sysv* | mips-*-riscos*sysv*)
-       tm_file="mips/svr3-4.h ${tm_file}"
-       if test x$stabs = xyes; then
-               tm_file="${tm_file} dbx.h"
-       fi
-       xm_defines=POSIX
-       if test x$gas = xyes
-       then
-               tmake_file=mips/t-svr3-gas
-       else
-               tmake_file=mips/t-svr3
-               extra_passes="mips-tfile mips-tdump"
-       fi
-       if test x$gnu_ld != xyes
-       then
-               use_collect2=yes
-       fi
-       ;;
-mips-*-riscos[56789]*)         # Default MIPS RISC-OS 5.0.
-       tm_file=mips/mips-5.h
-       if test x$stabs = xyes; then
-               tm_file="${tm_file} dbx.h"
-       fi
-       if test x$gas = xyes
-       then    :
-       else
-               extra_passes="mips-tfile mips-tdump"
-       fi
-       if test x$gnu_ld != xyes
-       then
-               use_collect2=yes
-       fi
-       ;;
 mipsel-*-ecoff*)
        tm_file=mips/ecoffl.h
        if test x$stabs = xyes; then
@@ -2582,20 +1912,6 @@ mipstx39-*-elf*)
        tm_file="mips/r3900.h mips/elf.h mips/abi64.h"
        tmake_file=mips/t-r3900
        ;;
-mips-*-*)                              # Default MIPS RISC-OS 4.0.
-       if test x$stabs = xyes; then
-               tm_file="${tm_file} dbx.h"
-       fi
-       if test x$gas = xyes
-       then    :
-       else
-               extra_passes="mips-tfile mips-tdump"
-       fi
-       if test x$gnu_ld != xyes
-       then
-               use_collect2=yes
-       fi
-       ;;
 mmix-knuth-mmixware)
        ;;
 mn10200-*-*)
@@ -2615,40 +1931,11 @@ mn10300-*-*)
        fi
        use_collect2=no
        ;;
-ns32k-encore-bsd*)
-       tm_file=ns32k/encore.h
-       use_collect2=yes
-       ;;
-ns32k-sequent-bsd*)
-       tm_file=ns32k/sequent.h
-       use_collect2=yes
-       ;;
-ns32k-tek6100-bsd*)
-       tm_file=ns32k/tek6100.h
-       use_collect2=yes
-       ;;
-ns32k-tek6200-bsd*)
-       tm_file=ns32k/tek6200.h
-       use_collect2=yes
-       ;;
-ns32k-merlin-*)
-       tm_file=ns32k/merlin.h
-       use_collect2=yes
-       ;;
-ns32k-pc532-mach*)
-       tm_file=ns32k/pc532-mach.h
-       use_collect2=yes
-       ;;
-ns32k-pc532-minix*)
-       tm_file=ns32k/pc532-min.h
-       xm_defines='POSIX HZ=60'
-       use_collect2=yes
-       ;;
 ns32k-*-netbsdelf*)
        echo "GCC does not yet support the ${machine} target"; exit 1
        ;;
 ns32k-*-netbsd*)
-       tm_file=ns32k/netbsd.h
+       tm_file="${tm_file} netbsd.h netbsd-aout.h ns32k/netbsd.h"
        # On NetBSD, the headers are already okay, except for math.h.
        tmake_file=t-netbsd
        use_collect2=yes
@@ -2663,21 +1950,6 @@ avr-*-*)
 ns32k-*-openbsd*)
        # Nothing special
        ;;
-pj*-linux*)
-       tm_file="dbxelf.h elfos.h svr4.h pj/linux.h ${tm_file}"
-       ;;
-pj-*)
-       ;;
-pjl-*)
-       tm_file="dbxelf.h elfos.h svr4.h pj/pjl.h ${tm_file}"
-       ;;
-
-romp-*-aos*)
-       use_collect2=yes
-       ;;
-romp-*-mach*)
-       use_collect2=yes
-       ;;
 romp-*-openbsd*)
        # Nothing special
        ;;
@@ -2821,6 +2093,12 @@ powerpc-wrs-vxworks*)
         tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
        thread_file='vxworks'
         ;;
+powerpc-wrs-windiss*)
+        xm_defines=POSIX
+       tm_file="${tm_file} elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/windiss.h"
+        tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
+        thread_file=""
+        ;;
 powerpcle-wrs-vxworks*)
        xm_defines=POSIX
         tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/sysv4le.h rs6000/vxppc.h"
@@ -2930,14 +2208,14 @@ s390x-*-linux*)
        ;;
 sh-*-elf*)
        tmake_file="sh/t-sh sh/t-elf"
-       tm_file="${tm_file} sh/embed-elf.h"
+       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sh/embed-elf.h"
        float_format=sh
        ;;
 sh64-*-elf*)
        tmake_file="sh/t-sh sh/t-elf sh/t-sh64"
-       tm_file="${tm_file} sh/sh.h sh/embed-elf.h sh/sh64.h"
+       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sh/embed-elf.h sh/sh64.h"
        float_format=sh
-       extra_headers="../../config/sh/shmedia.h ../../config/sh/ushmedia.h ../../config/sh/sshmedia.h"
+       extra_headers="shmedia.h ushmedia.h sshmedia.h"
        # Not strictly necessary to check this, but a good idea anyway.
        if test $machine = $target; then
                target_requires_64bit_host_wide_int=yes
@@ -2946,7 +2224,7 @@ sh64-*-elf*)
 sh-*-rtemself*)
        xm_defines=POSIX
        tmake_file="sh/t-sh sh/t-elf t-rtems"
-       tm_file="${tm_file} sh/embed-elf.h sh/rtemself.h rtems.h"
+       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sh/embed-elf.h sh/rtemself.h rtems.h"
        float_format=sh
        if test x$enable_threads = xyes; then
          thread_file='rtems'
@@ -2955,22 +2233,55 @@ sh-*-rtemself*)
 sh-*-rtems*)
        xm_defines=POSIX
        tmake_file="sh/t-sh t-rtems"
-       tm_file="${tm_file} sh/rtems.h rtems.h"
+       tm_file="${tm_file} sh/coff.h sh/rtems.h rtems.h"
        float_format=sh
        if test x$enable_threads = xyes; then
          thread_file='rtems'
        fi
        ;;
 sh-*-linux*)
-       tm_file="${tm_file} sh/elf.h sh/linux.h"
-       tmake_file="sh/t-sh sh/t-elf sh/t-linux"
+       tm_file="sh/little.h ${tm_file} dbxelf.h elfos.h svr4.h sh/elf.h sh/linux.h"
+       tmake_file="sh/t-sh sh/t-elf sh/t-le sh/t-linux"
        gas=yes gnu_ld=yes
        if test x$enable_threads = xyes; then
                thread_file='posix'
        fi
        float_format=sh
        ;;
+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
+       sh*l*-*)
+               tm_file="sh/little.h ${tm_file}"
+               tmake_file="${tmake_file} sh/t-le"
+               ;;
+       *)
+               tmake_file="${tmake_file} sh/t-be"
+               ;;
+       esac
+       case $machine in
+       sh5*-*)
+               # SHmedia, 32-bit ABI
+               target_cpu_default="SH5_BIT|SH4_BIT|SH3E_BIT"
+               tmake_file="${tmake_file} sh/t-netbsd-sh5 sh/t-netbsd-sh5-32"
+               ;;
+       sh64*-*)
+               # SHmedia, 64-bit ABI
+               target_cpu_default="SH5_BIT|SH4_BIT"
+               tmake_file="${tmake_file} sh/t-netbsd-sh5 sh/t-netbsd-sh5-64"
+               ;;
+       *)
+               # SH3, software floating point
+               target_cpu_default="SH1_BIT|SH2_BIT|SH3_BIT"
+               tmake_file="${tmake_file} sh/t-netbsd"
+               ;;
+       esac
+       float_format=sh
+       ;;
 sh-*-*)
+       tm_file="${tm_file} sh/coff.h"
        float_format=sh
        ;;
 sparc-tti-*)
@@ -3007,6 +2318,13 @@ sparc-*-openbsd*)
        # we need collect2 until our bug is fixed...
        use_collect2=yes
        ;;
+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"
+       xm_file=sparc/xm-sp64.h
+       gas=yes gnu_ld=yes
+       with_cpu=ultrasparc
+       float_format=i128
+       ;;
 sparc-*-bsd*)
        tm_file="${tm_file} sparc/bsd.h"
        ;;
@@ -3058,15 +2376,11 @@ sparc-*-lynxos*)
        fi
        tmake_file=sparc/t-sunos41
        ;;
-sparc-*-rtemsaout*)
-       xm_defines=POSIX
-       tmake_file="sparc/t-sparcbare t-rtems"
-       tm_file="${tm_file} aoutos.h sparc/aout.h sparc/rtems.h rtems.h"
-       if test x$enable_threads = xyes; then
-         thread_file='rtems'
-       fi
+sparc-*-rtemsaout*)    # would otherwise be caught by sparc-*-rtems*
+       echo "*** Configuration $machine not supported" 1>&2
+       exit 1
        ;;
-sparc-*-rtems*|sparc-*-rtemself*)
+sparc-*-rtems*)
        xm_defines=POSIX
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/sol2.h sparc/elf.h sparc/rtemself.h rtems.h"
        tmake_file="sparc/t-elf sparc/t-crtfm t-rtems"
@@ -3093,7 +2407,7 @@ sparc64-*-solaris2* | sparcv9-*-solaris2*)
                tmake_file="$tmake_file t-slibgcc-sld"
        fi
        extra_parts="crt1.o crti.o crtn.o gcrt1.o crtbegin.o crtend.o"
-       float_format=sparc
+       float_format=i128
        if test x${enable_threads} = x ; then
            enable_threads=$have_pthread_h
            if test x${enable_threads} = x ; then
@@ -3119,14 +2433,7 @@ sparc-hal-solaris2*)
                tmake_file="$tmake_file t-slibgcc-sld"
        fi
         extra_parts="crt1.o crti.o crtn.o gmon.o crtbegin.o crtend.o"
-        case $machine in
-        *-*-solaris2.[0-4])
-                float_format=i128
-        ;;
-        *)
-                float_format=sparc
-                ;;
-        esac
+       float_format=i128
        thread_file='solaris'
         ;;
 sparc-*-solaris2*)
@@ -3159,14 +2466,7 @@ sparc-*-solaris2*)
        esac
        xm_defines=POSIX
        extra_parts="crt1.o crti.o crtn.o gcrt1.o gmon.o crtbegin.o crtend.o"
-       case $machine in
-       *-*-solaris2.[0-4])
-               float_format=i128
-               ;;
-       *)
-               float_format=sparc
-               ;;
-       esac
+       float_format=i128
        if test x${enable_threads} = x; then
            enable_threads=$have_pthread_h
            if test x${enable_threads} = x; then
@@ -3352,10 +2652,6 @@ vax-*-vms*)                      # VAXen running VMS
 vax-*-*)                       # VAX default entry
        float_format=vax
        ;;
-we32k-att-sysv*)
-       xm_defines=POSIX
-       use_collect2=yes
-       ;;
 xscale-*-elf)
        tm_file="arm/xscale-elf.h dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h"
        tmake_file=arm/t-xscale-elf
@@ -3394,7 +2690,7 @@ xtensa-*-linux*)
        fi
        ;;
 *)
-       echo "Configuration $machine not supported" 1>&2
+       echo "*** Configuration $machine not supported" 1>&2
        exit 1
        ;;
 esac
@@ -3526,6 +2822,14 @@ hppa*-*-* | parisc*-*-*)
        then
                target_cpu_default2="MASK_GAS|MASK_JUMP_IN_DELAY"
        fi
+       case $machine in
+               hppa1.0* | parisc1.0*)
+                       tm_file="pa/pa-700.h ${tm_file}"
+                       ;;
+               hppa1.1* | parisc1.1*)
+                       tm_file="pa/pa-7100.h ${tm_file}"
+                       ;;
+       esac
        ;;
 
 mips*-*-ecoff* | mips*-*-elf*)
@@ -3579,6 +2883,15 @@ powerpc*-*-* | rs6000-*-*)
                        fi
                        ;;
        esac
+       case $machine in
+         *-*-darwin*)
+           ;;
+         *)
+           c_target_objs="rs6000-c.o"
+           cxx_target_objs="rs6000-c.o"
+           tmake_file="${tmake_file} rs6000/t-rs6000-c-rule"
+           ;;
+       esac
        ;;
 sparc*-*-*)
        case ".$with_cpu" in