* config.gcc: Remove all stanzas for previously obsoleted

	systems.  Where necessary, add explicit error stanzas to
	prevent removed systems from being misidentified as something
	else.  Begin a fresh obsoletions list, with the systems that
	were reprieved last round.
	* doc/install.texi: Remove all mention of dead targets.
	* fixinc/mkfixinc.sh: Likewise.

	* config/arm/arm.h: Bit 31 of target_flags is no longer
	reserved.

	* config/1750a/1750a-protos.h, config/1750a/1750a.c,
	config/1750a/1750a.h, config/1750a/1750a.md, config/1750a/ms1750.inc,
	config/a29k/a29k-protos.h, config/a29k/a29k.c, config/a29k/a29k.h,
	config/a29k/a29k.md, config/a29k/rtems.h, config/a29k/t-a29kbare,
	config/a29k/t-vx29k, config/a29k/unix.h, config/a29k/vx29k.h,
	config/alpha/osf12.h, config/alpha/osf2or3.h,
	config/arm/arm-wince-pe.h, config/arm/arm.h, config/arm/riscix.h,
	config/arm/riscix1-1.h, config/arm/rix-gas.h, config/arm/t-riscix,
	config/clipper/clipper-protos.h, config/clipper/clipper.c,
	config/clipper/clipper.h, config/clipper/clipper.md,
	config/clipper/clix.h, config/convex/convex-protos.h,
	config/convex/convex.c, config/convex/convex.h,
	config/convex/convex.md, config/convex/fixinc.convex,
	config/convex/proto.h, config/elxsi/elxsi-protos.h,
	config/elxsi/elxsi.c, config/elxsi/elxsi.h, config/elxsi/elxsi.md,
	config/i386/386bsd.h, config/i386/aix386.h, config/i386/aix386ng.h,
	config/i386/bsd386.h, config/i386/dgux.h, config/i386/djgpp-rtems.h,
	config/i386/isc.h, config/i386/iscdbx.h, config/i386/linux-oldld.h,
	config/i386/next.h, config/i386/osf1-ci.asm, config/i386/osf1-cn.asm,
	config/i386/osf1elf.h, config/i386/osf1elfgdb.h, config/i386/osfelf.h,
	config/i386/osfrose.h, config/i386/rtems.h, config/i386/seq-gas.h,
	config/i386/seq-sysv3.h, config/i386/seq2-sysv3.h,
	config/i386/sequent.h, config/i386/sun.h, config/i386/sun386.h,
	config/i386/t-dgux, config/i386/t-next, config/i386/t-osf,
	config/i386/t-osf1elf, config/i860/bsd-gas.h, config/i860/bsd.h,
	config/i860/fx2800.h, config/i860/i860-protos.h, config/i860/i860.c,
	config/i860/i860.h, config/i860/i860.md, config/i860/mach.h,
	config/i860/paragon.h, config/i860/sysv3.h, config/i860/sysv4.h,
	config/i860/t-fx2800, config/i860/varargs.asm, config/m68k/a-ux.h,
	config/m68k/altos3068.h, config/m68k/apollo68.h,
	config/m68k/aux-crt1.c, config/m68k/aux-crt2.asm,
	config/m68k/aux-crtn.asm, config/m68k/aux-exit.c,
	config/m68k/aux-low.gld, config/m68k/aux-mcount.c,
	config/m68k/auxas.h, config/m68k/auxgas.h, config/m68k/auxgld.h,
	config/m68k/auxld.h, config/m68k/ctix.h, config/m68k/dpx2.h,
	config/m68k/dpx2.ifile, config/m68k/dpx2cdbx.h, config/m68k/dpx2g.h,
	config/m68k/isi-nfp.h, config/m68k/isi.h, config/m68k/lynx-ng.h,
	config/m68k/lynx.h, config/m68k/math-3300.h, config/m68k/news.h,
	config/m68k/news3.h, config/m68k/news3gas.h, config/m68k/newsgas.h,
	config/m68k/next.h, config/m68k/next21.h, config/m68k/rtems.h,
	config/m68k/t-aux, config/m68k/t-lynx, config/m68k/t-next,
	config/m68k/x-next, config/m88k/dgux.h, config/m88k/dgux.ld,
	config/m88k/dguxbcs.h, config/m88k/dolph.h, config/m88k/dolphin.ld,
	config/m88k/luna.h, config/m88k/m88k-coff.h, config/m88k/sysv3.h,
	config/m88k/t-bug, config/m88k/t-dgux, config/m88k/t-dgux-gas,
	config/m88k/t-dguxbcs, config/m88k/t-dolph, config/m88k/t-m88k-gas,
	config/m88k/t-tekXD88, config/m88k/tekXD88.h, config/m88k/tekXD88.ld,
	config/mips/bsd-4.h, config/mips/bsd-5.h, config/mips/dec-bsd.h,
	config/mips/dec-osf1.h, config/mips/elflorion.h,
	config/mips/iris4loser.h, config/mips/mips-5.h, config/mips/news4.h,
	config/mips/news5.h, config/mips/nws3250v4.h, config/mips/osfrose.h,
	config/mips/svr3-4.h, config/mips/svr3-5.h, config/mips/svr4-4.h,
	config/mips/svr4-5.h, config/mips/svr4-t.h, config/mips/t-bsd,
	config/mips/t-bsd-gas, config/mips/t-svr3, config/mips/t-svr3-gas,
	config/mips/t-svr4, config/mips/t-svr4-gas, config/mips/t-ultrix,
	config/mips/ultrix.h, config/nextstep-protos.h, config/nextstep.c,
	config/nextstep.h, config/nextstep21.h, config/ns32k/encore.h,
	config/ns32k/merlin.h, config/ns32k/pc532-mach.h,
	config/ns32k/pc532-min.h, config/ns32k/pc532.h,
	config/ns32k/sequent.h, config/ns32k/tek6000.h,
	config/ns32k/tek6100.h, config/ns32k/tek6200.h, config/pj/lib1funcs.S,
	config/pj/linux.h, config/pj/pj-protos.h, config/pj/pj.c,
	config/pj/pj.h, config/pj/pj.md, config/pj/pjl.h, config/pj/t-pj,
	config/sparc/rtems.h, config/we32k/we32k-protos.h,
	config/we32k/we32k.c, config/we32k/we32k.h, config/we32k/we32k.md:
	Delete file.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@53862 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 49 insertions, 872 deletions

diff --git a/gcc/config.gcc b/gcc/config.gcc
index 8f7debb6e0a..171173b0b56 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -208,69 +208,15 @@ gnu_ld="$gnu_ld_flag"
 enable_threads=$enable_threads_flag
 
 # Obsolete configurations.
-# To avoid some tedious lists, we have a blacklist with a whitelist
-# embedded within it.
 case $machine in
-	  1750a-* \
-	| a29k-* \
-	| alpha*-*-osf[123]* \
-	| arm-*-riscix* \
-	| c*-convex-* \
-	| clipper-* \
-	| elxsi-* \
-	| i860-* \
-	| i?86-*-aix* \
-	| i?86-*-bsd* \
-	| i?86-*-chorusos* \
-	| i?86-*-dgux* \
-	| i?86-*-freebsd1.* \
-	| i?86-*-isc* \
-	| i?86-*-linux*oldld* \
-	| i?86-*-osf1* \
-	| i?86-*-osfrose* \
-	| i?86-*-rtemscoff* \
-	| i?86-*-sunos* \
-	| i?86-go32-rtems* \
-	| i?86-next-* \
-	| i?86-sequent-bsd* \
-	| i?86-sequent-ptx[12]* \
-	| i?86-sequent-sysv3* \
-	| m68[k0]*-*-lynxos* \
-	| m68[k0]*-*-rtemscoff* \
-	| m68[k0]*-*-sysv3* \
-	| m68[k0]*-altos-* \
-	| m68[k0]*-apollo-* \
-	| m68[k0]*-apple-* \
-	| m68[k0]*-bull-* \
-	| m68[k0]*-convergent-* \
-	| m68[k0]*-isi-* \
-	| m68[k0]*-next-* \
-	| m68[k0]*-sony-* \
-	| m88k-* \
-	| mips-*-bsd* \
-	| mips-*-riscos* \
-	| mips-*-sysv* \
-	| mips-*-ultrix* \
-	| mips-dec-* \
-	| mips-sgi-irix[1234]* \
-	| mips-sony-* \
-	| mips-tandem-* \
-	| ns32k-* \
-	| pj-* \
-	| pjl-* \
-	| romp-* \
-	| sparc-*-rtemsaout* \
-	| we32k-* \
-)
-  case $machine in
-	  mips-sni-sysv4 \
-	| m88k-*-aout* | m88k-*-openbsd* | m88k-*-sysv4* \
-	| ns32k-*-netbsd* | ns32k-*-openbsd* \
-	| romp-*-openbsd* \
-   )
-    # Whitelisted.
-    ;;
-  *)
+   m88k-*-aout*     \
+ | m88k-*-openbsd*  \
+ | m88k-*-sysv4*    \
+ | mips-sni-sysv4   \
+ | 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
@@ -278,7 +224,6 @@ case $machine in
       echo "*** unless a maintainer comes forward." >&2
       exit 1
     fi;;
-  esac
 esac
 
 # Set default cpu_type, tm_file, tm_p_file and xm_file so it can be
@@ -299,10 +244,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"
@@ -327,9 +268,6 @@ m68k-*-*)
 mips*-*-*)
 	cpu_type=mips
 	;;
-pj*-*-*)
-	cpu_type=pj
-	;;
 powerpc*-*-*)
 	cpu_type=rs6000
 	extra_headers="ppc-asm.h altivec.h"
@@ -476,39 +414,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"
@@ -585,7 +490,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
@@ -596,31 +501,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
 	;;
@@ -684,20 +582,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
@@ -768,26 +652,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"
@@ -804,12 +668,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
@@ -837,9 +695,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
@@ -1126,33 +981,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
@@ -1164,43 +997,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
@@ -1212,10 +1012,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"
@@ -1230,17 +1029,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
 	;;
@@ -1273,27 +1062,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
@@ -1376,35 +1147,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"
@@ -1483,17 +1231,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
@@ -1502,7 +1239,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"
@@ -1598,44 +1335,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
@@ -1744,11 +1443,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
@@ -1783,57 +1477,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
@@ -1841,6 +1484,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
@@ -1907,16 +1555,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
@@ -1950,47 +1588,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
@@ -2033,16 +1630,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
@@ -2068,11 +1655,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
@@ -2113,16 +1695,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"
@@ -2132,76 +1709,14 @@ 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*)
-	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"
@@ -2287,96 +1802,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
@@ -2413,192 +1842,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
@@ -2667,20 +1910,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-*-*)
@@ -2700,35 +1929,6 @@ 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
 	;;
@@ -2748,21 +1948,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
 	;;
@@ -3028,7 +2213,7 @@ 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"
 	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
@@ -3149,15 +2334,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"
@@ -3429,10 +2610,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
@@ -3471,7 +2648,7 @@ xtensa-*-linux*)
 	fi
 	;;
 *)
-	echo "Configuration $machine not supported" 1>&2
+	echo "*** Configuration $machine not supported" 1>&2
 	exit 1
 	;;
 esac