This is the mail archive of the libstdc++@gcc.gnu.org mailing list for the libstdc++ project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Remove deprecated targets


This patch (diff with --no-diff-deleted, generated file diffs omitted)
removes from trunk the targets deprecated in 4.3 (and some relics of
targets deprecated longer ago); though 4.3.1 isn't out yet, I think
we've had long enough by now for volunteers to come forward to
resurrect targets.

I have hopefully not removed support for the deprecated systems as
host or build systems, since the deprecation was as targets; nor have
I changed stddef.h, stdarg.h or longlong.h where they had mentions of
deprecated targets.  There are also some pieces where I think the
relevant target or subsystem maintainers are best placed to remove the
obsolete code or documentation and I have not removed it all myself;
these maintainers are CC:ed.

* gcc/ada/mlib-tgt-specific-vxworks.adb contains code looking for
  "xscale" in a target name; if this is using a target triplet then
  that is no longer needed, as "xscale" is now obsoleted in target
  triplets in favour of "arm".

* libstdc++-v3/doc/xml/manual/test.xml and the generated HTML have
  examples using "xscale" names that should probably use "arm".

* gcc/doc/install.texi has details of Solaris patches for various
  Solaris versions, and these should probably be cleaned up to remove
  information no longer relevant to supported versions.

* gcc/config/alpha has a lot of code specific to UNICOS/mk, for which
  support has been removed, and that code should be removed.

* There may be code or comments in gcc/config/cris that are only
  relevant for the cris-aout port and associated options that have
  been removed.

* Note for the fixincludes maintainer: I removed fixes that were
  either restricted by target triplet to triplets being obsoleted, or
  indicated by the comments only to be relevant on such systems; it's
  likely many more fixes are only relevant to systems obsoleted now or
  longer ago.  I could not however complete this by removing the
  AAB_ultrix_string fix; if I did so, I got an error "autogen Error:
  Unterminated HereString in inclhack.def on line 4148".  So this one
  is, arbitrarily, left in there to avoid this error, although
  conditioned to apply only to a system that is no longer supported.

I'm running tests on i686-pc-linux-gnu.  OK to commit if those pass?

2008-05-21  Joseph Myers  <joseph@codesourcery.com>

	* MAINTAINERS (mt port): Remove.
	(sco5, unixware, sco udk): Remove.
	(Kean Johnston): Add to Write After Approval.

fixincludes:
2008-05-21  Joseph Myers  <joseph@codesourcery.com>

	* inclhack.def (AAB_svr4_replace_byteorder,
	AAB_ultrix_ansi_compat, AAB_ultrix_limits, AAB_ultrix_memory,
	libc1_G_va_list, libc1_ifdefd_memx, nested_motorola,
	ptx_sys_mc_param_h, sco_regset, sco_static_func, sco_utime,
	solaris_mutex_init_1, solaris_socket, solaris_unistd,
	solaris_widec, svr4_krnl, ultrix_atexit_param, ultrix_atof_param,
	ultrix_const3, ultrix_fix_fixproto, ultrix_ifdef, ultrix_locale,
	ultrix_math_ifdef, ultrix_nested_ioctl, ultrix_nested_svc,
	ultrix_stat, ultrix_static, ultrix_stdlib, ultrix_strings,
	ultrix_strings2, ultrix_sys_time, ultrix_unistd,
	unicosmk_restrict, uw7_byteorder_fix, windiss_math1,
	windiss_math2, windiss_valist): Remove.
	* fixincl.x: Regenerate.
	* mkfixinc.sh: (arm-semi-aof, hppa1.1-*-osf*, hppa1.1-*-bsd*,
	i370-*-openedition, i?86-*-moss*, i?86-*-uwin*,
	powerpc-*-eabiaix*): Remove.
	* tests/base/math.h: Update.
	* tests/base/pthread.h: Update.
	* tests/base/stdio.h: Update.
	* tests/base/stdlib.h: Update.
	* tests/base/string.h: Update.
	* tests/base/strings.h: Update.
	* tests/base/sys/file.h: Update.
	* tests/base/sys/limits.h: Update.
	* tests/base/sys/socket.h: Update.
	* tests/base/sys/stat.h: Update.
	* tests/base/sys/time.h: Update.
	* tests/base/testing.h: Update.
	* tests/base/unistd.h: Update.
	* tests/base/_G_config.h: Remove.
	* tests/base/arpa: Remove directory.
	* tests/base/fs: Remove directory.
	* tests/base/locale.h: Remove.
	* tests/base/machine: Remove directory.
	* tests/base/rpc/svc.h: Remove.
	* tests/base/sys/ioctl.h: Remove.
	* tests/base/sys/regset.h: Remove.
	* tests/base/sys/times.h: Remove.
	* tests/base/sys/utsname.h: Remove.
	* tests/base/widec.h: Remove.

gcc:
2008-05-21  Joseph Myers  <joseph@codesourcery.com>

	* config.gcc (Obsolete configurations): Remove list of
	configurations.
	(Unsupported targets list): Add *-*-linux*aout*, *-*-linux*libc1*,
	*-*-solaris2.[0-6], *-*-solaris2.[0-6].*, *-*-sysv*.  Remove other
	targets matched by those patterns.
	(strongarm*-*-*, ep9312*-*-*, xscale-*-*, parisc*-*-*,
	m680[012]0-*-*, *-*-linux*libc1*, *-*-linux*aout*,
	alpha*-*-unicosmk*, strongarm*-*-freebsd*, ep9312-*-elf,
	arm*-*-kaos*, cris-*-aout, parisc*64*-*-linux*, parisc*-*-linux*,
	hppa1.1-*-pro*, hppa1.1-*-osf*, hppa1.1-*-bsd*,
	i[34567]86-sequent-ptx4*, i[34567]86-sequent-sysv4*,
	i[34567]86-*-beoself*, i[34567]86-*-beos*, i[34567]86-*-sco3.2v5*,
	i[34567]86-*-sysv5*, i[34567]86-*-sysv4*, i[34567]86-*-uwin*,
	i[34567]86-*-kaos*, m68020-*-elf*, m68010-*-netbsdelf*,
	mips-wrs-windiss, mt-*-elf, powerpc-*-beos*, powerpc-*-chorusos*,
	powerpc-wrs-windiss*, powerpcle-*-sysv*, powerpc-*-kaos*,
	powerpcle-*-kaos*, sh*-*-kaos*, sparc-*-sysv4*, strongarm-*-elf*,
	strongarm-*-pe, strongarm-*-kaos*, vax-*-bsd*, vax-*-sysv*,
	vax-*-ultrix*, xscale-*-elf, xscale-*-coff,
	i[34567]86-*-linux*aout*, i[34567]86-*-linux*libc1): Remove.
	Make code for Solaris 7 and greater unconditional for Solaris.
	(ep9312-*-*, parisc1*, m680[012]0-*-*, parisc*-*-*, mt-*-*):
	Remove --with-* handling.
	* config/rs6000/sysv4.h (-mwindiss): Remove from all specs.
	(LIB_WINDISS_SPEC, CPP_OS_WINDISS_SPEC, STARTFILE_WINDISS_SPEC,
	ENDFILE_WINDISS_SPEC, LINK_START_WINDISS_SPEC,
	LINK_OS_WINDISS_SPEC): Remove.
	* config/rs6000/sysv4.opt (mwindiss): Remove.
	* configure.ac (strongarm*-*-*, xscale*-*-*): Remove.
	* configure: Regenerate.
	* doc/cpp.texi: Don't mention BeOS.
	* doc/extend.texi (interrupt): Don't mention MS1.
	* doc/install.texi: (i386-@var{any}-sysv, m68k-bull-sysv,
	m68k-hp-hpux, m68000-hp-hpux, m68000-att-sysv,
	alphaev5-cray-unicosmk*, xscale-*-*, i?86-*-linux*aout,
	i?86-*-sco3.2v5*, i?86-*-udk, m68k-hp-hpux, powerpc-*-sysv4,
	powerpc-*-sysv4, powerpcle-*-sysv4, *-*-sysv*, vax-dec-ultrix):
	Remove.
	* doc/invoke.texi (MT Options): Remove.
	(-mwindiss): Remove.
	(CRIS Options): Remove cris-axis-aout references.
	(HPPA Options): Don't mention hppa1.1-*-pro.
	* doc/md.texi: (MorphoTech family): Remove.
	* libgcc2.c: Don't handle UWIN.
	* config/alpha/t-unicosmk: Remove.
	* config/alpha/unicosmk.h: Remove.
	* config/arm/kaos-arm.h: Remove.
	* config/arm/kaos-strongarm.h: Remove.
	* config/arm/strongarm-coff.h: Remove.
	* config/arm/strongarm-elf.h: Remove.
	* config/arm/strongarm-pe.h: Remove.
	* config/arm/t-strongarm-pe: Remove.
	* config/arm/t-xscale-coff: Remove.
	* config/arm/t-xscale-elf: Remove.
	* config/arm/xscale-coff.h: Remove.
	* config/arm/xscale-elf.h: Remove.
	* config/chorus.h: Remove.
	* config/cris/aout.h: Remove.
	* config/cris/aout.opt: Remove.
	* config/cris/t-aout: Remove.
	* config/i386/beos-elf.h: Remove.
	* config/i386/kaos-i386.h: Remove.
	* config/i386/ptx4-i.h: Remove.
	* config/i386/sco5.h: Remove.
	* config/i386/sco5.opt: Remove.
	* config/i386/sysv4-cpp.h: Remove.
	* config/i386/sysv5.h: Remove.
	* config/i386/t-beos: Remove.
	* config/i386/t-sco5: Remove.
	* config/i386/t-uwin: Remove.
	* config/i386/uwin.asm: Remove.
	* config/i386/uwin.h: Remove.
	* config/kaos.h: Remove.
	* config/mips/windiss.h: Remove.
	* config/mt: Remove directory.
	* config/pa/pa-osf.h: Remove.
	* config/pa/pa-pro-end.h: Remove.
	* config/pa/t-pro: Remove.
	* config/ptx4.h: Remove.
	* config/rs6000/beos.h: Remove.
	* config/rs6000/kaos-ppc.h: Remove.
	* config/rs6000/t-beos: Remove.
	* config/rs6000/windiss.h: Remove.
	* config/sh/kaos-sh.h: Remove.
	* config/sol2-6.h: Remove.
	* config/sparc/sol26-sld.h: Remove.
	* config/sparc/sysv4-only.h: Remove.
	* config/vax/bsd.h: Remove.
	* config/vax/t-memfuncs: Remove.
	* config/vax/ultrix.h: Remove.
	* config/vax/vaxv.h: Remove.
	* config/windiss.h: Remove.

gcc/testsuite:
2008-05-21  Joseph Myers  <joseph@codesourcery.com>

	* g++.dg/abi/arm_cxa_vec1.C: Don't handle xscale*-*-*.
	* g++.dg/eh/spbp.C: Don't handle *-*-solaris2.[56]*.
	* g++.dg/warn/miss-format-1.C: Don't handle Solaris before Solaris
	7.
	* gcc.c-torture/compile/981006-1.c: Don't handle xscale*-*-*,
	strongarm*-*-* and cris-*-aout*.
	* gcc.c-torture/execute/941014-1.x: Don't handle xscale*-*-* and
	strongarm*-*-*.
	* gcc.dg/20030909-1.c: Don't handle xscale*-*-* and
	strongarm*-*-*.
	* gcc.dg/20031108-1.c: Don't handle xscale*-*-* and
	strongarm*-*-*.
	* gcc.dg/20040813-1.c: Don't handle *-*-sysv5*.
	* gcc.dg/arm-asm.c: Don't handle strongarm*-*-* and xscale*-*-*.
	* gcc.dg/arm-scd42-1.c: Use target arm*-*-*.
	* gcc.dg/arm-scd42-3.c: Use target arm*-*-*.
	* gcc.dg/cpp/assert4.c: Don't handle BeOS.
	* gcc.dg/debug/pr35154.c: Don't handle *-*-sysv5*.
	* gcc.dg/intmax_t-1.c: Don't handle *-*-solaris2.5.1 and
	xscale*-*-elf*.
	* gcc.dg/pragma-align.c: Don't handle i?86-*-sco3.2v5*.
	* gcc.dg/pthread-init-2.c: Don't handle *-*-solaris2.5.1.
	* gcc.misc-tests/arm-isr.exp: Use target arm*-*-*.
	* gcc.target/powerpc/ppc-sdata-1.c: Don't handle powerpc-*-sysv*.
	* gcc.target/powerpc/ppc-sdata-2.c: Don't handle powerpc-*-sysv*.
	* gcc.target/powerpc/ppc-stackalign-1.c: Don't handle
	powerpc-*-sysv*.
	* gfortran.dg/debug/pr35154-stabs.f: Don't handle *-*-sysv5*.
	* lib/target-supports.exp: Don't handle strongarm*-*-elf,
	xscale*-*-elf and *-*-windiss.
	* obj-c++.dg/dwarf-2.mm: Don't handle *-*-solaris2.[56]*.
	* objc.dg/dwarf-1.m: Don't handle *-*-solaris2.[56]*.
	* objc.dg/dwarf-2.m: Don't handle *-*-solaris2.[56]*.
	* gcc.dg/mt-loopi1.c: Remove.

gnattools:
2008-05-21  Joseph Myers  <joseph@codesourcery.com>

	* configure.ac (xscale*-wrs-vx*, xscale*-wrs-coff): Remove.
	* configure: Regenerate.

libcpp:
2008-05-21  Joseph Myers  <joseph@codesourcery.com>

	* configure.ac (parisc*64*-*-*): Remove.
	* configure: Regenerate.

libffi:
2008-05-21  Joseph Myers  <joseph@codesourcery.com>

	* configure.ac (parisc*-*-linux*, powerpc-*-sysv*,
	powerpc-*-beos*): Remove.
	* configure: Regenerate.

libgcc:
2008-05-21  Joseph Myers  <joseph@codesourcery.com>

	* config.host (strongarm*-*-*, ep9312*-*-*, xscale-*-*,
	parisc*-*-*, m680[012]0-*-*, *-*-linux*libc1*, *-*-linux*aout*,
	alpha*-*-unicosmk*, strongarm*-*-freebsd*, ep9312-*-elf,
	arm*-*-kaos*, cris-*-aout, parisc*64*-*-linux*, parisc*-*-linux*,
	hppa1.1-*-pro*, hppa1.1-*-osf*, hppa1.1-*-bsd*,
	i[34567]86-sequent-ptx4*, i[34567]86-sequent-sysv4*,
	i[34567]86-*-beoself*, i[34567]86-*-beos*, i[34567]86-*-sco3.2v5*,
	i[34567]86-*-sysv5*, i[34567]86-*-sysv4*, i[34567]86-*-uwin*,
	i[34567]86-*-kaos*, m68020-*-elf*, m68010-*-netbsdelf*,
	mips-wrs-windiss, mt-*-elf, powerpc-*-beos*, powerpc-*-chorusos*,
	powerpc-wrs-windiss*, powerpcle-*-sysv*, powerpc-*-kaos*,
	powerpcle-*-kaos*, sh*-*-kaos*, sparc-*-sysv4*, strongarm-*-elf*,
	strongarm-*-pe, strongarm-*-kaos*, vax-*-bsd*, vax-*-sysv*,
	vax-*-ultrix*, xscale-*-elf, xscale-*-coff): Remove.

libjava:
2008-05-21  Joseph Myers  <joseph@codesourcery.com>

	* configure.host (strongarm*-elf, xscale*-elf): Remove.

libstdc++-v3:
2008-05-21  Joseph Myers  <joseph@codesourcery.com>

	* configure.host (xscale, ep9312, m680[246]0, solaris2.5,
	solaris2.5.[0-9], solaris2.6, windiss*): Remove.
	* crossconfig.m4 (*-solaris2.5, *-solaris2.6, *-windiss*): Remove.
	* configure: Regenerate.
	* config/os/solaris/solaris2.5: Remove directory.
	* config/os/solaris/solaris2.6: Remove directory.
	* config/os/windiss: Remove directory.

Index: libgcc/config.host
===================================================================
--- libgcc/config.host	(revision 135721)
+++ libgcc/config.host	(working copy)
@@ -71,9 +71,6 @@
 am33_2.0-*-linux*)
 	cpu_type=mn10300
 	;;
-strongarm*-*-*)
-	cpu_type=arm
-	;;
 arm*-*-*)
 	cpu_type=arm
 	;;
@@ -83,17 +80,11 @@
 bfin*-*)
 	cpu_type=bfin
 	;;
-ep9312*-*-*)
-	cpu_type=arm
-	;;
 fido-*-*)
 	cpu_type=m68k
 	;;
 frv*)	cpu_type=frv
 	;;
-xscale-*-*)
-	cpu_type=arm
-	;;
 i[34567]86-*-*)
 	cpu_type=i386
 	;;
@@ -102,15 +93,12 @@
 	;;
 ia64-*-*)
 	;;
-hppa*-*-* | parisc*-*-*)
+hppa*-*-*)
 	cpu_type=pa
 	;;
 m32r*-*-*)
         cpu_type=m32r
         ;;
-m680[012]0-*-*)
-	cpu_type=m68k
-	;;
 m68k-*-*)
 	;;
 mips*-*-*)
@@ -162,9 +150,6 @@
   # machine-specific sections may refine and add to this
   # configuration.
   ;;
-*-*-linux*libc1* | *-*-linux*aout*)
-  # Avoid the generic linux case.
-  ;;
 *-*-linux* | frv-*-*linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu)
   # Must come before *-*-gnu* (because of *-*-linux-gnu* systems).
   extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o"
@@ -191,8 +176,6 @@
 	then tmake_file=${cpu_type}/t-$rest
 	fi
 	;;
-alpha*-*-unicosmk*)
-	;;
 alpha*-*-linux*)
 	tmake_file="${tmake_file} alpha/t-crtfm"
 	extra_parts="$extra_parts crtfastmath.o"
@@ -219,7 +202,7 @@
 	;;
 arm-wrs-vxworks)
 	;;
-arm*-*-freebsd*|strongarm*-*-freebsd*)
+arm*-*-freebsd*)
 	;;
 arm*-*-netbsdelf*)
 	;;
@@ -235,14 +218,12 @@
 	;;
 arm*-*-rtems*)
 	;;
-arm*-*-elf | ep9312-*-elf)
+arm*-*-elf)
 	;;
 arm*-wince-pe*)
 	;;
 arm-*-pe*)
 	;;
-arm*-*-kaos*)
-	;;
 avr-*-rtems*)
 	;;
 avr-*-*)
@@ -260,8 +241,6 @@
 	;;
 bfin*-*)
         ;;
-cris-*-aout)
-	;;
 crisv32-*-elf | crisv32-*-none | cris-*-elf | cris-*-none)
 	extra_parts="crtbegin.o crtend.o"
 	;;
@@ -283,16 +262,10 @@
 	;;
 h8300-*-*)
 	;;
-hppa*64*-*-linux* | parisc*64*-*-linux*)
+hppa*64*-*-linux*)
 	;;
-hppa*-*-linux* | parisc*-*-linux*)
+hppa*-*-linux*)
 	;;
-hppa1.1-*-pro*)
-	;;
-hppa1.1-*-osf*)
-	;;
-hppa1.1-*-bsd*)
-	;;
 hppa[12]*-*-hpux10*)
 	;;
 hppa*64*-*-hpux11*)
@@ -308,12 +281,8 @@
 	;;
 x86_64-*-elf*)
 	;;
-i[34567]86-sequent-ptx4* | i[34567]86-sequent-sysv4*)
-	;;
 i[34567]86-*-aout*)
 	;;
-i[34567]86-*-beoself* | i[34567]86-*-beos*)
-	;;
 i[34567]86-*-freebsd*)
 	;;
 x86_64-*-freebsd*)
@@ -355,14 +324,8 @@
 	;;
 i[34567]86-*-rtems*)
 	;;
-i[34567]86-*-sco3.2v5*)	# 80386 running SCO Open Server 5
-	;;
 i[34567]86-*-solaris2*)
 	;;
-i[34567]86-*-sysv5*)           # Intel x86 on System V Release 5
-       ;;
-i[34567]86-*-sysv4*)		# Intel 80386's running system V.4
-	;;
 i[4567]86-wrs-vxworks|i[4567]86-wrs-vxworksae)
 	;;
 i[34567]86-*-pe)
@@ -373,12 +336,8 @@
 	;;
 x86_64-*-mingw*)
 	;;
-i[34567]86-*-uwin*)
-	;;
 i[34567]86-*-interix3*)
 	;;
-i[34567]86-*-kaos*)
-	;;
 ia64*-*-elf*)
 	extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtfastmath.o"
 	tmake_file="ia64/t-ia64"
@@ -409,9 +368,9 @@
 	;;
 m68k-*-coff*)
 	;;
-m68020-*-elf* | m68k-*-elf*)
+m68k-*-elf*)
 	;;
-m68010-*-netbsdelf* | m68k*-*-netbsdelf*)
+m68k*-*-netbsdelf*)
 	;;
 m68k*-*-openbsd*)
 	;;
@@ -459,16 +418,12 @@
 	;;
 mips-wrs-vxworks)
 	;;
-mips-wrs-windiss)	# Instruction-level simulator for VxWorks.
-	;;
 mipstx39-*-elf* | mipstx39el-*-elf*)
 	;;
 mmix-knuth-mmixware)
 	;;
 mn10300-*-*)
 	;;
-mt-*-elf)
-        ;;
 pdp11-*-bsd)
         ;;
 pdp11-*-*)
@@ -479,8 +434,6 @@
 powerpc64-*-gnu*)
 	tmake_file="${tmake_file} rs6000/t-ldbl128"
 	;;
-powerpc-*-beos*)
-	;;
 powerpc-*-darwin*)
 	;;
 powerpc64-*-darwin*)
@@ -489,8 +442,6 @@
 	;;
 powerpc-*-netbsd*)
 	;;
-powerpc-*-chorusos*)
-	;;
 powerpc-*-eabispe*)
 	;;
 powerpc-*-eabisimaltivec*)
@@ -522,22 +473,14 @@
 	;;
 powerpc-wrs-vxworks|powerpc-wrs-vxworksae)
 	;;
-powerpc-wrs-windiss*)  # Instruction-level simulator for VxWorks.
-	;;
 powerpc-*-lynxos*)
 	;;
-powerpcle-*-sysv*)
-	;;
 powerpcle-*-elf*)
 	;;
 powerpcle-*-eabisim*)
 	;;
 powerpcle-*-eabi*)
 	;;
-powerpc-*-kaos*)
-	;;
-powerpcle-*-kaos*)
-	;;
 rs6000-ibm-aix4.[12]* | powerpc-ibm-aix4.[12]*)
 	;;
 rs6000-ibm-aix4.[3456789]* | powerpc-ibm-aix4.[3456789]*)
@@ -554,7 +497,7 @@
 	;;
 score-*-elf)
         ;;
-sh-*-elf* | sh[12346l]*-*-elf* | sh*-*-kaos* | \
+sh-*-elf* | sh[12346l]*-*-elf* | \
 sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
   sh-*-linux* | sh[346lbe]*-*-linux* | \
   sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \
@@ -587,8 +530,6 @@
 	;;
 sparc-*-solaris2*)
 	;;
-sparc-*-sysv4*)
-	;;
 sparc64-*-elf*)
 	;;
 sparc-wrs-vxworks)
@@ -603,34 +544,18 @@
 	;;
 spu-*-elf*)
 	;;
-strongarm-*-elf*)
-	;;
-strongarm-*-pe)
-	;;
-strongarm-*-kaos*)
-	;;
 v850e1-*-*)
 	;;
 v850e-*-*)
 	;;
 v850-*-*)
 	;;
-vax-*-bsd*)			# VAXen running BSD
-	;;
-vax-*-sysv*)			# VAXen running system V
-	;;
 vax-*-netbsdelf*)
 	;;
 vax-*-netbsd*)
 	;;
 vax-*-openbsd*)
 	;;
-vax-*-ultrix*)			# VAXen running ultrix
-	;;
-xscale-*-elf)
-	;;
-xscale-*-coff)
-	;;
 xstormy16-*-elf)
 	;;
 xtensa-*-elf*)
Index: gcc/doc/cpp.texi
===================================================================
--- gcc/doc/cpp.texi	(revision 135721)
+++ gcc/doc/cpp.texi	(working copy)
@@ -3918,8 +3918,8 @@
 identifier characters by default.
 
 Currently the targets that by default do not permit @samp{$} are AVR,
-IP2K, MMIX, MIPS Irix 3, ARM aout, and PowerPC targets for the AIX and
-BeOS operating systems.
+IP2K, MMIX, MIPS Irix 3, ARM aout, and PowerPC targets for the AIX
+operating system.
 
 You can override the default with @option{-fdollars-in-identifiers} or
 @option{fno-dollars-in-identifiers}.  @xref{fdollars-in-identifiers}.
Index: gcc/doc/extend.texi
===================================================================
--- gcc/doc/extend.texi	(revision 135721)
+++ gcc/doc/extend.texi	(working copy)
@@ -2362,7 +2362,7 @@
 
 @item interrupt
 @cindex interrupt handler functions
-Use this attribute on the ARM, AVR, CRX, M32C, M32R/D, m68k, MS1,
+Use this attribute on the ARM, AVR, CRX, M32C, M32R/D, m68k,
 and Xstormy16 ports to indicate that the specified function is an
 interrupt handler.  The compiler will generate function entry and exit
 sequences suitable for use in an interrupt handler when this attribute
Index: gcc/doc/invoke.texi
===================================================================
--- gcc/doc/invoke.texi	(revision 135721)
+++ gcc/doc/invoke.texi	(working copy)
@@ -666,10 +666,6 @@
 -mreturn-pointer-on-d0 @gol
 -mno-crt0  -mrelax}
 
-@emph{MT Options}
-@gccoptlist{-mno-crt0 -mbacc -msim @gol
--march=@var{cpu-type} }
-
 @emph{PDP-11 Options}
 @gccoptlist{-mfpu  -msoft-float  -mac0  -mno-ac0  -m40  -m45  -m10 @gol
 -mbcopy  -mbcopy-builtin  -mint32  -mno-int16 @gol
@@ -719,7 +715,7 @@
 -mfloat-gprs=yes  -mfloat-gprs=no -mfloat-gprs=single -mfloat-gprs=double @gol
 -mprototype  -mno-prototype @gol
 -msim  -mmvme  -mads  -myellowknife  -memb  -msdata @gol
--msdata=@var{opt}  -mvxworks  -mwindiss  -G @var{num}  -pthread}
+-msdata=@var{opt}  -mvxworks  -G @var{num}  -pthread}
 
 @emph{S/390 and zSeries Options}
 @gccoptlist{-mtune=@var{cpu-type}  -march=@var{cpu-type} @gol
@@ -8380,7 +8376,6 @@
 * MIPS Options::
 * MMIX Options::
 * MN10300 Options::
-* MT Options::
 * PDP-11 Options::
 * PowerPC Options::
 * RS/6000 and PowerPC Options::
@@ -9051,12 +9046,6 @@
 @opindex mmax-stack-frame
 Warn when the stack frame of a function exceeds @var{n} bytes.
 
-@item -melinux-stacksize=@var{n}
-@opindex melinux-stacksize
-Only available with the @samp{cris-axis-aout} target.  Arranges for
-indications in the program to the kernel loader that the stack of the
-program should be set to @var{n} bytes.
-
 @item -metrax4
 @itemx -metrax100
 @opindex metrax4
@@ -9136,28 +9125,18 @@
 of the GOT rather than (traditional on other architectures) calls to the
 PLT@.  The default is @option{-mgotplt}.
 
-@item -maout
-@opindex maout
-Legacy no-op option only recognized with the cris-axis-aout target.
-
 @item -melf
 @opindex melf
 Legacy no-op option only recognized with the cris-axis-elf and
 cris-axis-linux-gnu targets.
 
-@item -melinux
-@opindex melinux
-Only recognized with the cris-axis-aout target, where it selects a
-GNU/linux-like multilib, include files and instruction set for
-@option{-march=v8}.
-
 @item -mlinux
 @opindex mlinux
 Legacy no-op option only recognized with the cris-axis-linux-gnu target.
 
 @item -sim
 @opindex sim
-This option, recognized for the cris-axis-aout and cris-axis-elf arranges
+This option, recognized for the cris-axis-elf arranges
 to link with input-output functions from a simulator library.  Code,
 initialized data and zero-initialized data are allocated consecutively.
 
@@ -10266,8 +10245,7 @@
 targets.  Normally the facilities of the machine's usual C compiler are
 used, but this cannot be done directly in cross-compilation.  You must make
 your own arrangements to provide suitable library functions for
-cross-compilation.  The embedded target @samp{hppa1.1-*-pro}
-does provide software floating point support.
+cross-compilation.
 
 @option{-msoft-float} changes the calling convention in the output file;
 therefore, it is only useful if you compile @emph{all} of a program with
@@ -12698,44 +12676,6 @@
 This option makes symbolic debugging impossible.
 @end table
 
-@node MT Options
-@subsection MT Options
-@cindex MT options
-
-These @option{-m} options are defined for Morpho MT architectures:
-
-@table @gcctabopt
-
-@item -march=@var{cpu-type}
-@opindex march
-Generate code that will run on @var{cpu-type}, which is the name of a system
-representing a certain processor type.  Possible values for
-@var{cpu-type} are @samp{ms1-64-001}, @samp{ms1-16-002},
-@samp{ms1-16-003} and @samp{ms2}.
-
-When this option is not used, the default is @option{-march=ms1-16-002}.
-
-@item -mbacc
-@opindex mbacc
-Use byte loads and stores when generating code.
-
-@item -mno-bacc
-@opindex mno-bacc
-Do not use byte loads and stores when generating code.
-
-@item -msim
-@opindex msim
-Use simulator runtime
-
-@item -mno-crt0
-@opindex mno-crt0
-Do not link in the C run-time initialization object file
-@file{crti.o}.  Other run-time initialization and termination files
-such as @file{startup.o} and @file{exit.o} are still included on the
-linker command line.
-
-@end table
-
 @node PDP-11 Options
 @subsection PDP-11 Options
 @cindex PDP-11 Options
@@ -13518,10 +13458,6 @@
 On System V.4 and embedded PowerPC systems, specify that you are
 compiling for a VxWorks system.
 
-@item -mwindiss
-@opindex mwindiss
-Specify that you are compiling for the WindISS simulation environment.
-
 @item -memb
 @opindex memb
 On embedded PowerPC systems, set the @var{PPC_EMB} bit in the ELF flags
Index: gcc/doc/md.texi
===================================================================
--- gcc/doc/md.texi	(revision 135721)
+++ gcc/doc/md.texi	(working copy)
@@ -1949,35 +1949,6 @@
 
 @end table
 
-@item MorphoTech family---@file{config/mt/mt.h}
-@table @code
-@item I
-Constant for an arithmetic insn (16-bit signed integer).
-
-@item J
-The constant 0.
-
-@item K
-Constant for a logical insn (16-bit zero-extended integer).
-
-@item L
-A constant that can be loaded with @code{lui} (i.e.@: the bottom 16
-bits are zero).
-
-@item M
-A constant that takes two words to load (i.e.@: not matched by
-@code{I}, @code{K}, or @code{L}).
-
-@item N
-Negative 16-bit constants other than -65536.
-
-@item O
-A 15-bit signed integer constant.
-
-@item P
-A positive 16-bit constant.
-@end table
-
 @item Intel 386---@file{config/i386/constraints.md}
 @table @code
 @item R
Index: gcc/doc/install.texi
===================================================================
--- gcc/doc/install.texi	(revision 135721)
+++ gcc/doc/install.texi	(working copy)
@@ -835,11 +835,6 @@
 @itemize @bullet
 @item @samp{hppa1.0-@var{any}-@var{any}}
 @item @samp{hppa1.1-@var{any}-@var{any}}
-@item @samp{i386-@var{any}-sysv}
-@item @samp{m68k-bull-sysv}
-@item @samp{m68k-hp-hpux}
-@item @samp{m68000-hp-hpux}
-@item @samp{m68000-att-sysv}
 @item @samp{sparc-sun-solaris2.@var{any}}
 @item @samp{sparc64-@var{any}-solaris2.@var{any}}
 @end itemize
@@ -2470,16 +2465,12 @@
 @item
 @uref{#alpha-dec-osf,,alpha*-dec-osf*}
 @item
-@uref{#alphaev5-cray-unicosmk,,alphaev5-cray-unicosmk*}
-@item
 @uref{#arc-x-elf,,arc-*-elf}
 @item
 @uref{#arm-x-elf,,arm-*-elf}
 @uref{#arm-x-coff,,arm-*-coff}
 @uref{#arm-x-aout,,arm-*-aout}
 @item
-@uref{#xscale-x-x,,xscale-*-*}
-@item
 @uref{#avr,,avr}
 @item
 @uref{#bfin,,Blackfin}
@@ -2498,16 +2489,10 @@
 @item
 @uref{#x-x-linux-gnu,,*-*-linux-gnu}
 @item
-@uref{#ix86-x-linuxaout,,i?86-*-linux*aout}
-@item
 @uref{#ix86-x-linux,,i?86-*-linux*}
 @item
-@uref{#ix86-x-sco32v5,,i?86-*-sco3.2v5*}
-@item
 @uref{#ix86-x-solaris210,,i?86-*-solaris2.10}
 @item
-@uref{#ix86-x-udk,,i?86-*-udk}
-@item
 @uref{#ia64-x-linux,,ia64-*-linux}
 @item
 @uref{#ia64-x-hpux,,ia64-*-hpux*}
@@ -2526,8 +2511,6 @@
 @item
 @uref{#m68k-x-x,,m68k-*-*}
 @item
-@uref{#m68k-hp-hpux,,m68k-hp-hpux}
-@item
 @uref{#m68k-uclinux,,m68k-uclinux}
 @item
 @uref{#mips-x-x,,mips-*-*}
@@ -2536,11 +2519,11 @@
 @item
 @uref{#mips-sgi-irix6,,mips-sgi-irix6}
 @item
-@uref{#powerpc-x-x,,powerpc*-*-*, powerpc-*-sysv4}
+@uref{#powerpc-x-x,,powerpc*-*-*}
 @item
 @uref{#powerpc-x-darwin,,powerpc-*-darwin*}
 @item
-@uref{#powerpc-x-elf,,powerpc-*-elf, powerpc-*-sysv4}
+@uref{#powerpc-x-elf,,powerpc-*-elf}
 @item
 @uref{#powerpc-x-linux-gnu,,powerpc*-*-linux-gnu*}
 @item
@@ -2550,7 +2533,7 @@
 @item
 @uref{#powerpc-x-eabi,,powerpc-*-eabi}
 @item
-@uref{#powerpcle-x-elf,,powerpcle-*-elf, powerpcle-*-sysv4}
+@uref{#powerpcle-x-elf,,powerpcle-*-elf}
 @item
 @uref{#powerpcle-x-eabisim,,powerpcle-*-eabisim}
 @item
@@ -2574,10 +2557,6 @@
 @item
 @uref{#sparcv9-x-solaris2,,sparcv9-*-solaris2*}
 @item
-@uref{#x-x-sysv,,*-*-sysv*}
-@item
-@uref{#vax-dec-ultrix,,vax-dec-ultrix}
-@item
 @uref{#x-x-vxworks,,*-*-vxworks*}
 @item
 @uref{#x86-64-x-x,,x86_64-*-*, amd64-*-*}
@@ -2700,32 +2679,6 @@
 @html
 <hr />
 @end html
-@heading @anchor{alphaev5-cray-unicosmk}alphaev5-cray-unicosmk*
-Cray T3E systems running Unicos/Mk.
-
-This port is incomplete and has many known bugs.  We hope to improve the
-support for this target soon.  Currently, only the C front end is supported,
-and it is not possible to build parallel applications.  Cray modules are not
-supported; in particular, Craylibs are assumed to be in
-@file{/opt/ctl/craylibs/craylibs}.
-
-On this platform, you need to tell GCC where to find the assembler and
-the linker.  The simplest way to do so is by providing @option{--with-as}
-and @option{--with-ld} to @file{configure}, e.g.@:
-
-@smallexample
-    configure --with-as=/opt/ctl/bin/cam --with-ld=/opt/ctl/bin/cld \
-      --enable-languages=c
-@end smallexample
-
-The comparison test at the end of the bootstrapping process fails on Unicos/Mk
-because the assembler inserts timestamps into object files.  You should
-be able to work around this by doing @samp{make all} after getting this
-failure.
-
-@html
-<hr />
-@end html
 @heading @anchor{arc-x-elf}arc-*-elf
 Argonaut ARC processor.
 This configuration is intended for embedded systems.
@@ -2734,11 +2687,10 @@
 <hr />
 @end html
 @heading @anchor{arm-x-elf}arm-*-elf
-@heading @anchor{xscale-x-x}xscale-*-*
 ARM-family processors.  Subtargets that use the ELF object format
 require GNU binutils 2.13 or newer.  Such subtargets include:
-@code{arm-*-freebsd}, @code{arm-*-netbsdelf}, @code{arm-*-*linux},
-@code{arm-*-rtems} and @code{arm-*-kaos}.
+@code{arm-*-freebsd}, @code{arm-*-netbsdelf}, @code{arm-*-*linux}
+and @code{arm-*-rtems}.
 
 @html
 <hr />
@@ -2830,9 +2782,6 @@
 
 There are a few different CRIS targets:
 @table @code
-@item cris-axis-aout
-Old target.  Includes a multilib for the @samp{elinux} a.out-based
-target.  No multilibs for newer architecture variants.
 @item cris-axis-elf
 Mainly for monolithic embedded systems.  Includes a multilib for the
 @samp{v10} core used in @samp{ETRAX 100 LX}.
@@ -2841,7 +2790,7 @@
 @samp{ETRAX 100 LX} by default.
 @end table
 
-For @code{cris-axis-aout} and @code{cris-axis-elf} you need binutils 2.11
+For @code{cris-axis-elf} you need binutils 2.11
 or newer.  For @code{cris-axis-linux-gnu} you need binutils 2.12 or newer.
 
 Pre-packaged tools can be obtained from
@@ -3182,13 +3131,6 @@
 @html
 <hr />
 @end html
-@heading @anchor{ix86-x-linuxaout}i?86-*-linux*aout
-Use this configuration to generate @file{a.out} binaries on Linux-based
-GNU systems.  This configuration is being superseded.
-
-@html
-<hr />
-@end html
 @heading @anchor{ix86-x-linux}i?86-*-linux*
 
 As of GCC 3.3, binutils 2.13.1 or later is required for this platform.
@@ -3201,50 +3143,6 @@
 @html
 <hr />
 @end html
-@heading @anchor{ix86-x-sco32v5}i?86-*-sco3.2v5*
-Use this for the SCO OpenServer Release 5 family of operating systems.
-
-Unlike earlier versions of GCC, the ability to generate COFF with this
-target is no longer provided.
-
-Earlier versions of GCC emitted DWARF 1 when generating ELF to allow
-the system debugger to be used.  That support was too burdensome to
-maintain.  GCC now emits only DWARF 2 for this target.  This means you
-may use either the UDK debugger or GDB to debug programs built by this
-version of GCC@.
-
-GCC is now only supported on releases 5.0.4 and later, and requires that
-you install Support Level Supplement OSS646B or later, and Support Level
-Supplement OSS631C or later.  If you are using release 5.0.7 of
-OpenServer, you must have at least the first maintenance pack installed
-(this includes the relevant portions of OSS646).  OSS646, also known as
-the ``Execution Environment Update'', provides updated link editors and
-assemblers, as well as updated standard C and math libraries.  The C
-startup modules are also updated to support the System V gABI draft, and
-GCC relies on that behavior.  OSS631 provides a collection of commonly
-used open source libraries, some of which GCC depends on (such as GNU
-gettext and zlib).  SCO OpenServer Release 5.0.7 has all of this built
-in by default, but OSS631C and later also apply to that release.  Please
-visit
-@uref{ftp://ftp.sco.com/pub/openserver5,,ftp://ftp.sco.com/pub/openserver5}
-for the latest versions of these (and other potentially useful)
-supplements.
-
-Although there is support for using the native assembler, it is
-recommended that you configure GCC to use the GNU assembler.  You do
-this by using the flags
-@uref{./configure.html#with-gnu-as,,@option{--with-gnu-as}}.  You should
-use a modern version of GNU binutils.  Version 2.13.2.1 was used for all
-testing.  In general, only the @option{--with-gnu-as} option is tested.
-A modern bintuils (as well as a plethora of other development related
-GNU utilities) can be found in Support Level Supplement OSS658A, the
-``GNU Development Tools'' package.  See the SCO web and ftp sites for details.
-That package also contains the currently ``officially supported'' version of
-GCC, version 2.95.3.  It is useful for bootstrapping this version.
-
-@html
-<hr />
-@end html
 @heading @anchor{ix86-x-solaris210}i?86-*-solaris2.10
 Use this for Solaris 10 or later on x86 and x86-64 systems.  This
 configuration is supported by GCC 4.0 and later versions only.
@@ -3257,42 +3155,6 @@
 @html
 <hr />
 @end html
-@heading @anchor{ix86-x-udk}i?86-*-udk
-
-This target emulates the SCO Universal Development Kit and requires that
-package be installed.  (If it is installed, you will have a
-@file{/udk/usr/ccs/bin/cc} file present.)  It's very much like the
-@samp{i?86-*-unixware7*} target
-but is meant to be used when hosting on a system where UDK isn't the
-default compiler such as OpenServer 5 or Unixware 2.  This target will
-generate binaries that will run on OpenServer, Unixware 2, or Unixware 7,
-with the same warnings and caveats as the SCO UDK@.
-
-This target is a little tricky to build because we have to distinguish
-it from the native tools (so it gets headers, startups, and libraries
-from the right place) while making the tools not think we're actually
-building a cross compiler.   The easiest way to do this is with a configure
-command like this:
-
-@smallexample
-    CC=/udk/usr/ccs/bin/cc @var{/your/path/to}/gcc/configure \
-      --host=i686-pc-udk --target=i686-pc-udk --program-prefix=udk-
-@end smallexample
-
-@emph{You should substitute @samp{i686} in the above command with the appropriate
-processor for your host.}
-
-After the usual @samp{make} and
-@samp{make install}, you can then access the UDK-targeted GCC
-tools by adding @command{udk-} before the commonly known name.  For
-example, to invoke the C compiler, you would use @command{udk-gcc}.
-They will coexist peacefully with any native-target GCC tools you may
-have installed.
-
-
-@html
-<hr />
-@end html
 @heading @anchor{ia64-x-linux}ia64-*-linux
 IA-64 processor (also known as IPF, or Itanium Processor Family)
 running GNU/Linux.
@@ -3518,59 +3380,6 @@
 @html
 <hr />
 @end html
-@heading @anchor{m68k-hp-hpux}m68k-hp-hpux
-HP 9000 series 300 or 400 running HP-UX@.  HP-UX version 8.0 has a bug in
-the assembler that prevents compilation of GCC@.  This
-bug manifests itself during the first stage of compilation, while
-building @file{libgcc2.a}:
-
-@smallexample
-_floatdisf
-cc1: warning: `-g' option not supported on this version of GCC
-cc1: warning: `-g1' option not supported on this version of GCC
-./xgcc: Internal compiler error: program as got fatal signal 11
-@end smallexample
-
-A patched version of the assembler is available as the file
-@uref{ftp://altdorf.ai.mit.edu/archive/cph/hpux-8.0-assembler}.  If you
-have HP software support, the patch can also be obtained directly from
-HP, as described in the following note:
-
-@quotation
-This is the patched assembler, to patch SR#1653-010439, where the
-assembler aborts on floating point constants.
-
-The bug is not really in the assembler, but in the shared library
-version of the function ``cvtnum(3c)''.  The bug on ``cvtnum(3c)'' is
-SR#4701-078451.  Anyway, the attached assembler uses the archive
-library version of ``cvtnum(3c)'' and thus does not exhibit the bug.
-@end quotation
-
-This patch is also known as PHCO_4484.
-
-In addition gdb does not understand that native HP-UX format, so
-you must use gas if you wish to use gdb.
-
-On HP-UX version 8.05, but not on 8.07 or more recent versions, the
-@command{fixproto} shell script triggers a bug in the system shell.  If you
-encounter this problem, upgrade your operating system or use BASH (the
-GNU shell) to run @command{fixproto}.  This bug will cause the fixproto
-program to report an error of the form:
-
-@smallexample
-./fixproto: sh internal 1K buffer overflow
-@end smallexample
-
-To fix this, you can also change the first line of the fixproto script
-to look like:
-
-@smallexample
-#!/bin/ksh
-@end smallexample
-
-@html
-<hr />
-@end html
 @heading @anchor{m68k-x-uclinux}m68k-*-uclinux
 GCC 4.3 changed the uClinux configuration so that it uses the
 @samp{m68k-linux-gnu} ABI rather than the @samp{m68k-elf} ABI.
@@ -3779,7 +3588,7 @@
 @html
 <hr />
 @end html
-@heading @anchor{powerpc-x-elf}powerpc-*-elf, powerpc-*-sysv4
+@heading @anchor{powerpc-x-elf}powerpc-*-elf
 PowerPC system in big endian mode, running System V.4.
 
 @html
@@ -3815,7 +3624,7 @@
 @html
 <hr />
 @end html
-@heading @anchor{powerpcle-x-elf}powerpcle-*-elf, powerpcle-*-sysv4
+@heading @anchor{powerpcle-x-elf}powerpcle-*-elf
 PowerPC system in little endian mode, running System V.4.
 
 @html
@@ -4126,47 +3935,6 @@
 @html
 <hr />
 @end html
-@heading @anchor{x-x-sysv}*-*-sysv*
-On System V release 3, you may get this error message
-while linking:
-
-@smallexample
-ld fatal: failed to write symbol name @var{something}
- in strings table for file @var{whatever}
-@end smallexample
-
-This probably indicates that the disk is full or your ulimit won't allow
-the file to be as large as it needs to be.
-
-This problem can also result because the kernel parameter @code{MAXUMEM}
-is too small.  If so, you must regenerate the kernel and make the value
-much larger.  The default value is reported to be 1024; a value of 32768
-is said to work.  Smaller values may also work.
-
-On System V, if you get an error like this,
-
-@smallexample
-/usr/local/lib/bison.simple: In function `yyparse':
-/usr/local/lib/bison.simple:625: virtual memory exhausted
-@end smallexample
-
-@noindent
-that too indicates a problem with disk space, ulimit, or @code{MAXUMEM}.
-
-On a System V release 4 system, make sure @file{/usr/bin} precedes
-@file{/usr/ucb} in @code{PATH}.  The @command{cc} command in
-@file{/usr/ucb} uses libraries which have bugs.
-
-@html
-<hr />
-@end html
-@heading @anchor{vax-dec-ultrix}vax-dec-ultrix
-Don't try compiling with VAX C (@command{vcc}).  It produces incorrect code
-in some cases (for example, when @code{alloca} is used).
-
-@html
-<hr />
-@end html
 @heading @anchor{x-x-vxworks}*-*-vxworks*
 Support for VxWorks is in flux.  At present GCC supports @emph{only} the
 very recent VxWorks 5.5 (aka Tornado 2.2) release, and only on PowerPC@.
Index: gcc/testsuite/gcc.c-torture/execute/941014-1.x
===================================================================
--- gcc/testsuite/gcc.c-torture/execute/941014-1.x	(revision 135721)
+++ gcc/testsuite/gcc.c-torture/execute/941014-1.x	(working copy)
@@ -1,12 +1,11 @@
 # This doesn't always work for Thumb.
  
-if { [istarget arm*-*-*] || [istarget xscale*-*-*] \
-     || [istarget strongarm*-*-*] } {
+if { [istarget arm*-*-*] } {
     set torture_eval_before_execute {
 	global compiler_conditional_xfail_data
 	set compiler_conditional_xfail_data {
 	    "Thumb sets the last bit of function relocations" \
-		    { "arm*-*-*" "xscale*-*-*" "strongarm*-*-*" } \
+		    { "arm*-*-*" } \
 		    { { "-mthumb" "-O0" } } \
 		    { "" }
 	}
Index: gcc/testsuite/gcc.c-torture/compile/981006-1.c
===================================================================
--- gcc/testsuite/gcc.c-torture/compile/981006-1.c	(revision 135721)
+++ gcc/testsuite/gcc.c-torture/compile/981006-1.c	(working copy)
@@ -6,7 +6,7 @@
 /* { dg-do assemble } */
 /* For MIPS at least, pic is needed to trigger the problem. */
 /* { dg-options "-w -Wuninitialized -Werror -fpic" } */
-/* { dg-options "-w -Wuninitialized -Werror" { target { { rs6000-*-aix* powerpc*-*-aix* arm*-*-* xscale*-*-* strongarm*-*-* fr30-*-* sh-*-hms sh-*-coff h8300*-*-* cris-*-elf* cris-*-aout* mmix-*-* } || { ! fpic } } } } */
+/* { dg-options "-w -Wuninitialized -Werror" { target { { rs6000-*-aix* powerpc*-*-aix* arm*-*-* fr30-*-* sh-*-hms sh-*-coff h8300*-*-* cris-*-elf* mmix-*-* } || { ! fpic } } } } */
 
 int foo (int a, int b)
 {
Index: gcc/testsuite/gcc.target/powerpc/ppc-sdata-2.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/ppc-sdata-2.c	(revision 135721)
+++ gcc/testsuite/gcc.target/powerpc/ppc-sdata-2.c	(working copy)
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { { powerpc*-*-linux* && ilp32 } || { powerpc-*-sysv* powerpc-*-eabi* } } } } */
+/* { dg-do compile { target { { powerpc*-*-linux* && ilp32 } || { powerpc-*-eabi* } } } } */
 /* { dg-options "-O2 -fno-common -G 8 -msdata=sysv" } */
 /* { dg-final { scan-assembler "\\.section\[ \t\]\\.sdata," } } */
 /* { dg-final { scan-assembler-not "\\.section\[ \t\]\\.sdata2," } } */
Index: gcc/testsuite/gcc.target/powerpc/ppc-stackalign-1.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/ppc-stackalign-1.c	(revision 135721)
+++ gcc/testsuite/gcc.target/powerpc/ppc-stackalign-1.c	(working copy)
@@ -1,4 +1,4 @@
-/* { dg-do run { target powerpc*-*-linux* powerpc-*-sysv* powerpc*-*-eabi* } } */
+/* { dg-do run { target powerpc*-*-linux* powerpc*-*-eabi* } } */
 /* { dg-options {} } */
 
 /* Test stack pointer alignment against variable alloca.  */
Index: gcc/testsuite/gcc.target/powerpc/ppc-sdata-1.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/ppc-sdata-1.c	(revision 135721)
+++ gcc/testsuite/gcc.target/powerpc/ppc-sdata-1.c	(working copy)
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { { powerpc*-*-linux* && ilp32 } || { powerpc-*-sysv* powerpc-*-eabi* } } } } */
+/* { dg-do compile { target { { powerpc*-*-linux* && ilp32 } || { powerpc-*-eabi* } } } } */
 /* { dg-options "-O2 -fno-common -G 8 -meabi -msdata=eabi" } */
 /* { dg-final { scan-assembler "\\.section\[ \t\]\\.sdata," } } */
 /* { dg-final { scan-assembler "\\.section\[ \t\]\\.sdata2," } } */
Index: gcc/testsuite/gcc.dg/20031108-1.c
===================================================================
--- gcc/testsuite/gcc.dg/20031108-1.c	(revision 135721)
+++ gcc/testsuite/gcc.dg/20031108-1.c	(working copy)
@@ -1,5 +1,5 @@
 /* PR optimization/10467  */
-/* { dg-do compile { target arm*-*-* xscale*-*-* strongarm*-*-* } } */
+/* { dg-do compile { target arm*-*-* } } */
 /* { dg-options "-O2 -mthumb" } */
 
 typedef enum {Ident_1} Enumeration;
Index: gcc/testsuite/gcc.dg/20030909-1.c
===================================================================
--- gcc/testsuite/gcc.dg/20030909-1.c	(revision 135721)
+++ gcc/testsuite/gcc.dg/20030909-1.c	(working copy)
@@ -1,5 +1,5 @@
 /* Verify that ands are combined.  */
-/* { dg-do compile { target arm*-*-* strongarm*-*-* xscale*-*-* } } */
+/* { dg-do compile { target arm*-*-* } } */
 /* { dg-options "-O" } */
 /* { dg-final { scan-assembler-not "#255.*#255" } } */
 int f(int a, int b) { return ((a & 0xff) + (b & 0xff)) & 0xff; }
Index: gcc/testsuite/gcc.dg/pragma-align.c
===================================================================
--- gcc/testsuite/gcc.dg/pragma-align.c	(revision 135721)
+++ gcc/testsuite/gcc.dg/pragma-align.c	(working copy)
@@ -1,6 +1,6 @@
 /* Prove that HANDLE_SYSTEMV_PRAGMA alignment handling works somewhat. */
 
-/* { dg-do run { target i?86-*-linux* x86_64-*-linux* i?86-*-*bsd* i?86-*-sco3.2v5* *-*-solaris2.* } } */
+/* { dg-do run { target i?86-*-linux* x86_64-*-linux* i?86-*-*bsd* *-*-solaris2.* } } */
 
 extern void abort (void);
 
Index: gcc/testsuite/gcc.dg/cpp/assert4.c
===================================================================
--- gcc/testsuite/gcc.dg/cpp/assert4.c	(revision 135721)
+++ gcc/testsuite/gcc.dg/cpp/assert4.c	(working copy)
@@ -128,14 +128,6 @@
 # error
 #endif
 
-#if defined __BEOS__
-# if !#system(beos)
-#  error
-# endif
-#elif #system(beos)
-# error
-#endif
-
 #if defined __netware__
 # if !#system(netware)
 #  error
Index: gcc/testsuite/gcc.dg/mt-loopi1.c (deleted)
===================================================================
Index: gcc/testsuite/gcc.dg/20040813-1.c
===================================================================
--- gcc/testsuite/gcc.dg/20040813-1.c	(revision 135721)
+++ gcc/testsuite/gcc.dg/20040813-1.c	(working copy)
@@ -2,7 +2,7 @@
 /* Contributed by Devang Patel  <dpatel@apple.com>  */
 
 /* { dg-do compile } */
-/* { dg-skip-if "No stabs" { mmix-*-* *-*-aix* *-*-netware* alpha*-*-* hppa*64*-*-* ia64-*-* *-*-sysv5* *-*-vxworks* } { "*" } { "" } } */
+/* { dg-skip-if "No stabs" { mmix-*-* *-*-aix* *-*-netware* alpha*-*-* hppa*64*-*-* ia64-*-* *-*-vxworks* } { "*" } { "" } } */
 /* { dg-options "-gstabs" } */
 
 int
Index: gcc/testsuite/gcc.dg/intmax_t-1.c
===================================================================
--- gcc/testsuite/gcc.dg/intmax_t-1.c	(revision 135721)
+++ gcc/testsuite/gcc.dg/intmax_t-1.c	(working copy)
@@ -1,6 +1,6 @@
 /* { dg-do compile } */
 /* { dg-options "-Wall" } */
-/* { dg-error "" "" { target { { *-*-solaris2.5.1 *arm*-*-*elf* xscale*-*-elf* xtensa-*-elf* } || vxworks_kernel } } 0 } */
+/* { dg-error "" "" { target { { *arm*-*-*elf* xtensa-*-elf* } || vxworks_kernel } } 0 } */
 
 /* Compile with -Wall to get a warning if built-in and system intmax_t don't
    match.  */
Index: gcc/testsuite/gcc.dg/debug/pr35154.c
===================================================================
--- gcc/testsuite/gcc.dg/debug/pr35154.c	(revision 135721)
+++ gcc/testsuite/gcc.dg/debug/pr35154.c	(working copy)
@@ -23,7 +23,7 @@
    optb.f2 = 'D';
    i_outer = 'e';
 /* { dg-do compile } */
-/* { dg-skip-if "No stabs" { mmix-*-* *-*-netware* alpha*-*-* hppa*64*-*-* ia64-*-* *-*-sysv5* *-*-vxworks* } { "*" } { "" } } */
+/* { dg-skip-if "No stabs" { mmix-*-* *-*-netware* alpha*-*-* hppa*64*-*-* ia64-*-* *-*-vxworks* } { "*" } { "" } } */
 /* { dg-skip-if "stabs only" { *-*-* } { "*" } { "-gstabs" } } */
    return 0;
 }
Index: gcc/testsuite/gcc.dg/pthread-init-2.c
===================================================================
--- gcc/testsuite/gcc.dg/pthread-init-2.c	(revision 135721)
+++ gcc/testsuite/gcc.dg/pthread-init-2.c	(working copy)
@@ -7,7 +7,7 @@
 /* { dg-do compile } */
 /* { dg-require-effective-target pthread_h } */
 /* { dg-options "-Wextra -Wall -ansi" } */
-/* { dg-options "-Wextra -Wall -ansi -D_POSIX_C_SOURCE=199506L" { target { *-*-hpux* *-*-solaris2.5.1 } } } */
+/* { dg-options "-Wextra -Wall -ansi -D_POSIX_C_SOURCE=199506L" { target { *-*-hpux* } } } */
 
 #include "pthread-init-common.h"
 
Index: gcc/testsuite/gcc.dg/arm-scd42-1.c
===================================================================
--- gcc/testsuite/gcc.dg/arm-scd42-1.c	(revision 135721)
+++ gcc/testsuite/gcc.dg/arm-scd42-1.c	(working copy)
@@ -1,5 +1,5 @@
 /* Verify that mov is preferred on XScale for loading a 1 byte constant. */
-/* { dg-do compile { target xscale-*-* } } */
+/* { dg-do compile { target arm*-*-* } } */
 /* { dg-options "-mcpu=xscale -O" } */
 
 unsigned load1(void) __attribute__ ((naked));
Index: gcc/testsuite/gcc.dg/arm-asm.c
===================================================================
--- gcc/testsuite/gcc.dg/arm-asm.c	(revision 135721)
+++ gcc/testsuite/gcc.dg/arm-asm.c	(working copy)
@@ -1,6 +1,6 @@
 /* ARM and Thumb asm statements should be able to access the constant
    pool.  */
-/* { dg-do compile { target arm*-*-* strongarm*-*-* xscale*-*-* } } */
+/* { dg-do compile { target arm*-*-* } } */
 extern unsigned x[];
 unsigned *trapTable()
 {
Index: gcc/testsuite/gcc.dg/arm-scd42-3.c
===================================================================
--- gcc/testsuite/gcc.dg/arm-scd42-3.c	(revision 135721)
+++ gcc/testsuite/gcc.dg/arm-scd42-3.c	(working copy)
@@ -1,5 +1,5 @@
 /* Verify that ldr is preferred on XScale for loading a 3 or 4 byte constant. */
-/* { dg-do compile { target xscale-*-* } } */
+/* { dg-do compile { target arm*-*-* } } */
 /* { dg-options "-mcpu=xscale -O" } */
 
 unsigned load4(void) __attribute__ ((naked));
Index: gcc/testsuite/gcc.misc-tests/arm-isr.exp
===================================================================
--- gcc/testsuite/gcc.misc-tests/arm-isr.exp	(revision 135721)
+++ gcc/testsuite/gcc.misc-tests/arm-isr.exp	(working copy)
@@ -21,7 +21,7 @@
 load_lib gcc-dg.exp
 
 dg-init
-if {[istarget "*arm-*-*"] || [istarget "xscale-*-*"]} {
+if { [istarget "arm*-*-*"] } {
   dg-runtest "$srcdir/$subdir/arm-isr.c" "" ""
 }
 dg-finish
Index: gcc/testsuite/g++.dg/warn/miss-format-1.C
===================================================================
--- gcc/testsuite/g++.dg/warn/miss-format-1.C	(revision 135721)
+++ gcc/testsuite/g++.dg/warn/miss-format-1.C	(working copy)
@@ -3,7 +3,7 @@
 /* { dg-do compile } */
 /* { dg-options "-Wmissing-format-attribute" } */
 /* VxWorks does not provide vscanf, either in kernel or RTP mode.  */
-/* { dg-error "not declared" "" { target *-*-solaris2.5.1 *-*-solaris2.[5-8] *-*-vxworks* } 25 } */
+/* { dg-error "not declared" "" { target *-*-solaris2.[7-8] *-*-vxworks* } 25 } */
 
 #include <stdio.h>
 #include <stdarg.h>
@@ -22,7 +22,7 @@
 {
   va_list ap;
   va_start (ap, fmt);
-  vscanf (fmt, ap); /* { dg-warning "candidate" "scanf attribute warning" { xfail *-*-solaris2.5.1 *-*-solaris2.[5-8] *-*-vxworks* } } */
+  vscanf (fmt, ap); /* { dg-warning "candidate" "scanf attribute warning" { xfail *-*-solaris2.[7-8] *-*-vxworks* } } */
   va_end (ap);
 }
 
Index: gcc/testsuite/g++.dg/abi/arm_cxa_vec1.C
===================================================================
--- gcc/testsuite/g++.dg/abi/arm_cxa_vec1.C	(revision 135721)
+++ gcc/testsuite/g++.dg/abi/arm_cxa_vec1.C	(working copy)
@@ -1,5 +1,5 @@
 // Check that __cxa_vec_[c]ctor returns a pointer to the array
-// { dg-do run { target arm*-*-* xscale*-*-* } }
+// { dg-do run { target arm*-*-* } }
 
 #include <cxxabi.h>
 
Index: gcc/testsuite/g++.dg/eh/spbp.C
===================================================================
--- gcc/testsuite/g++.dg/eh/spbp.C	(revision 135721)
+++ gcc/testsuite/g++.dg/eh/spbp.C	(working copy)
@@ -1,6 +1,6 @@
 /* { dg-do run } */
 /* { dg-options "-gdwarf-2" } */
-/* { dg-skip-if "No Dwarf" { { *-*-aix* hppa*-*-hpux* *-*-solaris2.[56]* } && { ! hppa*64*-*-* } } { "*" } { "" } } */
+/* { dg-skip-if "No Dwarf" { { *-*-aix* hppa*-*-hpux* } && { ! hppa*64*-*-* } } { "*" } { "" } } */
 
 /* This was a bug on x86-darwin, where the register numbering for SP
    and BP was swapped (it's easy to do because on that port it's
Index: gcc/testsuite/objc.dg/dwarf-1.m
===================================================================
--- gcc/testsuite/objc.dg/dwarf-1.m	(revision 135721)
+++ gcc/testsuite/objc.dg/dwarf-1.m	(working copy)
@@ -1,6 +1,6 @@
 /* { dg-options "-gdwarf-2 -dA" } */
 /* { dg-final { scan-assembler "\"id.0\".*DW_AT_name" } } */
-/* { dg-skip-if "No Dwarf" { { *-*-aix* hppa*-*-hpux* *-*-solaris2.[56]* } && { ! hppa*64*-*-* } } { "*" } { "" } } */
+/* { dg-skip-if "No Dwarf" { { *-*-aix* hppa*-*-hpux* } && { ! hppa*64*-*-* } } { "*" } { "" } } */
 @interface foo
   id x;
 @end
Index: gcc/testsuite/objc.dg/dwarf-2.m
===================================================================
--- gcc/testsuite/objc.dg/dwarf-2.m	(revision 135721)
+++ gcc/testsuite/objc.dg/dwarf-2.m	(working copy)
@@ -1,4 +1,4 @@
 /* { dg-options "-gdwarf-2 -dA" } */
 /* { dg-final { scan-assembler "0x10\[^0-9a-f\].*DW_AT_language" } } */
-/* { dg-skip-if "No Dwarf" { { *-*-aix* hppa*-*-hpux* *-*-solaris2.[56]* } && { ! hppa*64*-*-* } } { "*" } { "" } } */
+/* { dg-skip-if "No Dwarf" { { *-*-aix* hppa*-*-hpux* } && { ! hppa*64*-*-* } } { "*" } { "" } } */
 int x;
Index: gcc/testsuite/lib/target-supports.exp
===================================================================
--- gcc/testsuite/lib/target-supports.exp	(revision 135721)
+++ gcc/testsuite/lib/target-supports.exp	(working copy)
@@ -453,8 +453,6 @@
 	     || [istarget avr-*-*]
 	     || [istarget bfin-*-*]
 	     || [istarget powerpc-*-eabi*]
-	     || [istarget strongarm*-*-elf]
-	     || [istarget xscale*-*-elf]
 	     || [istarget cris-*-*]
 	     || [istarget crisv32-*-*]
 	     || [istarget fido-*-elf]
@@ -465,8 +463,7 @@
 	     || [istarget mips*-*-elf*]
 	     || [istarget xstormy16-*]
 	     || [istarget xtensa-*-elf]
-	     || [istarget *-*-vxworks*]
-	     || [istarget *-*-windiss] } {
+	     || [istarget *-*-vxworks*] } {
 	    set profiling_available_saved 0
 	} else {
 	    set profiling_available_saved 1
Index: gcc/testsuite/obj-c++.dg/dwarf-2.mm
===================================================================
--- gcc/testsuite/obj-c++.dg/dwarf-2.mm	(revision 135721)
+++ gcc/testsuite/obj-c++.dg/dwarf-2.mm	(working copy)
@@ -1,4 +1,4 @@
 /* { dg-options "-gdwarf-2 -dA" } */
-/* { dg-skip-if "" { { hppa*-*-hpux* *-*-solaris2.[56]* } && { ! hppa*64*-*-* } } { "*" } { "" } } */
+/* { dg-skip-if "" { { hppa*-*-hpux* } && { ! hppa*64*-*-* } } { "*" } { "" } } */
 /* { dg-final { scan-assembler "0x11\[^0-9a-f\].*DW_AT_language" } } */
 int x;
Index: gcc/testsuite/gfortran.dg/debug/pr35154-stabs.f
===================================================================
--- gcc/testsuite/gfortran.dg/debug/pr35154-stabs.f	(revision 135721)
+++ gcc/testsuite/gfortran.dg/debug/pr35154-stabs.f	(working copy)
@@ -1,6 +1,6 @@
 C     Test program for common block debugging.  G. Helffrich 11 July 2004.
 C { dg-do compile }
-C { dg-skip-if "No stabs" { mmix-*-* *-*-netware* alpha*-*-* hppa*64*-*-* ia64-*-* *-*-sysv5* *-*-vxworks* } { "*" } { "" } }
+C { dg-skip-if "No stabs" { mmix-*-* *-*-netware* alpha*-*-* hppa*64*-*-* ia64-*-* *-*-vxworks* } { "*" } { "" } }
 C { dg-skip-if "No stabs" {*-*-* } { "*" } { "-gstabs" } }
       common i,j
       common /label/l,m
Index: gcc/libgcc2.c
===================================================================
--- gcc/libgcc2.c	(revision 135721)
+++ gcc/libgcc2.c	(working copy)
@@ -2046,7 +2046,7 @@
 
 /* Jump to a trampoline, loading the static chain address.  */
 
-#if defined(WINNT) && ! defined(__CYGWIN__) && ! defined (_UWIN)
+#if defined(WINNT) && ! defined(__CYGWIN__)
 
 int
 getpagesize (void)
@@ -2082,7 +2082,7 @@
     return -1;
 }
 
-#endif /* WINNT && ! __CYGWIN__ && ! _UWIN */
+#endif /* WINNT && ! __CYGWIN__ */
 
 #ifdef TRANSFER_FROM_TRAMPOLINE
 TRANSFER_FROM_TRAMPOLINE
Index: gcc/configure.ac
===================================================================
--- gcc/configure.ac	(revision 135721)
+++ gcc/configure.ac	(working copy)
@@ -3052,7 +3052,7 @@
 # version to the per-target configury.
 case "$target" in
   i?86*-*-* | mips*-*-* | alpha*-*-* | powerpc*-*-* | sparc*-*-* | m68*-*-* \
-  | x86_64*-*-* | hppa*-*-* | arm*-*-* | strongarm*-*-* | xscale*-*-* \
+  | x86_64*-*-* | hppa*-*-* | arm*-*-* \
   | xstormy16*-*-* | cris-*-* | xtensa-*-* | bfin-*-* | score*-*-* | spu-*-*)
     insn="nop"
     ;;
Index: gcc/config.gcc
===================================================================
--- gcc/config.gcc	(revision 135721)
+++ gcc/config.gcc	(working copy)
@@ -200,63 +200,35 @@
 md_file=
 
 # Obsolete configurations.
-case ${target} in
-   mt-*			\
- | strongarm*-*		\
- | ep9312*-*		\
- | xscale*-*		\
- | parisc*-*		\
- | m680[012]0-*		\
- | *-*-beos*		\
- | *-*-kaos*		\
- | *-*-linux*aout*	\
- | *-*-linux*libc1*	\
- | *-*-solaris2.[0-6]	\
- | *-*-solaris2.[0-6].*	\
- | *-*-sysv*		\
- | *-*-windiss*		\
- | alpha*-*-unicosmk*	\
- | cris-*-aout		\
- | hppa1.1-*-pro*	\
- | hppa1.1-*-osf*	\
- | hppa1.1-*-bsd*	\
- | i[34567]86-sequent-ptx4*	\
- | i[34567]86-*-sco3.2v5*	\
- | i[34567]86-*-uwin*	\
- | powerpc-*-chorusos*	\
- | vax-*-bsd*		\
- | vax-*-ultrix*	\
- )
-    if test "x$enable_obsolete" != xyes; then
-      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
-      exit 1
-    fi;;
-esac
+#case ${target} in
+# )
+#    if test "x$enable_obsolete" != xyes; then
+#      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
+#      exit 1
+#    fi;;
+#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 ${target} in
-   alpha*-*-linux*libc1*		\
- | i[34567]86-sequent-sysv		\
- | i[34567]86-sequent-sysv[123]*	\
- | i[34567]86-go32-*			\
+   i[34567]86-go32-*			\
  | i[34567]86-*-go32*			\
- | m68k-*-linux*aout*			\
- | m68k-*-linux*libc1*			\
  | mips64orion*-*-rtems*		\
- | powerpc-*-linux*libc1*		\
- | sparc-*-linux*aout*			\
- | sparc-*-linux*libc1*			\
  | sparc-hal-solaris2*			\
  | thumb-*-*				\
+ | *-*-linux*aout*			\
  | *-*-linux*coff*			\
+ | *-*-linux*libc1*			\
  | *-*-linux*oldld*			\
  | *-*-rtemsaout*			\
  | *-*-rtemscoff*			\
+ | *-*-solaris2.[0-6]			\
+ | *-*-solaris2.[0-6].*			\
+ | *-*-sysv*		\
  | vax-*-vms*				\
  )
 	echo "*** Configuration ${target} not supported" 1>&2
@@ -282,9 +254,6 @@
 am33_2.0-*-linux*)
 	cpu_type=mn10300
 	;;
-strongarm*-*-*)
-	cpu_type=arm
-	;;
 arm*-*-*)
 	cpu_type=arm
 	extra_headers="mmintrin.h arm_neon.h"
@@ -297,19 +266,12 @@
 crisv32-*)
 	cpu_type=cris
 	;;
-ep9312*-*-*)
-	cpu_type=arm
-	;;
 frv*)	cpu_type=frv
 	;;
 fido-*-*)
 	cpu_type=m68k
 	extra_headers=math-68881.h
         ;;
-xscale-*-*)
-	cpu_type=arm
-	extra_headers="mmintrin.h"
-	;;
 i[34567]86-*-*)
 	cpu_type=i386
 	extra_headers="cpuid.h mmintrin.h mm3dnow.h xmmintrin.h emmintrin.h
@@ -329,16 +291,12 @@
 	extra_headers=ia64intrin.h
 	need_64bit_hwint=yes
 	;;
-hppa*-*-* | parisc*-*-*)
+hppa*-*-*)
 	cpu_type=pa
 	;;
 m32r*-*-*)
         cpu_type=m32r
         ;;
-m680[012]0-*-*)
-	cpu_type=m68k
-	extra_headers=math-68881.h
-	;;
 m68k-*-*)
 	extra_headers=math-68881.h
 	;;
@@ -485,9 +443,6 @@
   esac
   fbsd_tm_file="${fbsd_tm_file} freebsd-spec.h freebsd.h"
   ;;
-*-*-linux*libc1* | *-*-linux*aout*)
-  # Avoid the generic linux case.
-  ;;
 *-*-linux* | frv-*-*linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu)
   # Must come before *-*-gnu* (because of *-*-linux-gnu* systems).
   extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o"
@@ -620,15 +575,6 @@
 	then tmake_file=${cpu_type}/t-$rest
 	fi
 	;;
-alpha*-*-unicosmk*)
-	use_collect2=yes
-	tm_file="${tm_file} alpha/unicosmk.h"
-
-	# Don't include t-ieee for now because we don't support that yet
-	# tmake_file="alpha/t-ieee"
-	tmake_file="alpha/t-unicosmk"
-	use_fixproto=yes
-	;;
 alpha*-*-linux*)
 	tm_file="${tm_file} alpha/elf.h alpha/linux.h alpha/linux-elf.h"
 	target_cpu_default="MASK_GAS"
@@ -716,7 +662,7 @@
 	tm_file="elfos.h arm/elf.h arm/aout.h ${tm_file} vx-common.h vxworks.h arm/vxworks.h"
 	tmake_file="${tmake_file} arm/t-arm arm/t-vxworks"
 	;;
-arm*-*-freebsd*|strongarm*-*-freebsd*)
+arm*-*-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-arm arm/t-strongarm-elf"
 	;;
@@ -805,7 +751,7 @@
 	tmake_file="arm/t-arm arm/t-arm-elf t-rtems arm/t-rtems"
 	tmake_file="${tmake_file} arm/t-arm-softfp soft-fp/t-softfp"
 	;;
-arm*-*-elf | ep9312-*-elf)
+arm*-*-elf)
 	tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h"
 	tmake_file="arm/t-arm arm/t-arm-elf"
 	tmake_file="${tmake_file} arm/t-arm-softfp soft-fp/t-softfp"
@@ -822,11 +768,6 @@
 	extra_options="${extra_options} arm/pe.opt"
 	extra_objs="pe.o"
 	;;
-arm*-*-kaos*)
-	tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h kaos.h arm/kaos-arm.h"
-	tmake_file="arm/t-arm arm/t-arm-elf"
-	tmake_file="${tmake_file} arm/t-arm-softfp soft-fp/t-softfp"
-	;;
 avr-*-rtems*)
 	tm_file="avr/avr.h dbxelf.h avr/rtems.h rtems.h"
 	tmake_file="avr/t-avr t-rtems avr/t-rtems"
@@ -862,12 +803,6 @@
 	tmake_file=bfin/t-bfin
 	use_collect2=no
 	;;
-cris-*-aout)
-	tm_file="dbxelf.h ${tm_file} cris/aout.h"
-	gas=yes
-	tmake_file="cris/t-cris cris/t-aout"
-	extra_options="${extra_options} cris/aout.opt"
-	;;
 crisv32-*-elf | crisv32-*-none)
 	tm_file="dbxelf.h elfos.h ${tm_file}"
 	tmake_file="cris/t-cris"
@@ -929,7 +864,7 @@
 	tm_file="h8300/h8300.h dbxcoff.h h8300/coff.h"
 	use_fixproto=yes
 	;;
-hppa*64*-*-linux* | parisc*64*-*-linux*)
+hppa*64*-*-linux*)
 	target_cpu_default="MASK_PA_11|MASK_PA_20"
 	tm_file="pa/pa64-start.h ${tm_file} dbxelf.h elfos.h svr4.h linux.h \
 		 pa/pa-linux.h pa/pa64-regs.h pa/pa-64.h pa/pa64-linux.h"
@@ -937,7 +872,7 @@
 	gas=yes gnu_ld=yes
 	need_64bit_hwint=yes
 	;;
-hppa*-*-linux* | parisc*-*-linux*)
+hppa*-*-linux*)
 	target_cpu_default="MASK_PA_11|MASK_NO_SPACE_REGS"
 	tm_file="${tm_file} dbxelf.h elfos.h svr4.h linux.h pa/pa-linux.h \
 		 pa/pa32-regs.h pa/pa32-linux.h"
@@ -953,24 +888,6 @@
 #hppa*-*-openbsd*)
 #	target_cpu_default="MASK_PA_11"
 #	;;
-hppa1.1-*-pro*)
-	target_cpu_default="MASK_PORTABLE_RUNTIME|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-pro"
-	;;
-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-pa"
-	use_collect2=yes
-	;;
-hppa1.1-*-bsd*)
-	target_cpu_default="MASK_PA_11"
-	tm_file="${tm_file} pa/pa32-regs.h dbxelf.h pa/som.h"
-	tmake_file="pa/t-pa"
-	use_collect2=yes
-	;;
 hppa[12]*-*-hpux10*)
 	case ${target} in
 	hppa1.1-*-* | hppa2*-*-*)
@@ -1099,25 +1016,10 @@
 	tmake_file="i386/t-i386elf t-svr4"
 	use_fixproto=yes
 	;;
-i[34567]86-sequent-ptx4* | i[34567]86-sequent-sysv4*)
-	if test x$gas = xyes
-	then
-		tm_file="${tm_file} usegas.h"
-	fi
-	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ptx4.h i386/ptx4-i.h"
-	tmake_file=t-svr4
-	extra_parts="crtbegin.o crtend.o"
-	use_fixproto=yes
-	;;
 i[34567]86-*-aout*)
 	tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h i386/i386-aout.h"
 	use_fixproto=yes
 	;;
-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'
-	;;
 i[34567]86-*-freebsd*)
 	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${fbsd_tm_file} i386/freebsd.h"
 	;;
@@ -1248,23 +1150,9 @@
 	extra_parts="crtbegin.o crtend.o crti.o crtn.o"
 	tmake_file="i386/t-rtems-i386 i386/t-crtstuff t-rtems"
 	;;
-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"
-	if test x$gas = xyes
-	then
-		tm_file="usegas.h ${tm_file}"
-	fi
-	tmake_file=i386/t-sco5
-	extra_parts="crtbegin.o crtend.o"
-	extra_options="${extra_options} i386/sco5.opt"
-	use_fixproto=yes
-	;;
 i[34567]86-*-solaris2*)
 	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h i386/sysv4.h sol2.h"
 	case ${target} in
-	*-*-solaris2.[0-6] | *-*-solaris2.[0-6].*)
-		tm_file="${tm_file} sol2-6.h"
-		;;
 	*-*-solaris2.1[0-9]*)
 		tm_file="${tm_file} sol2-10.h"
 		;;
@@ -1284,12 +1172,8 @@
 	if test x$gas = xyes; then
 		tm_file="usegas.h ${tm_file}"
 	fi
+	tm_file="$tm_file tm-dwarf2.h"
 	case ${target} in
-	*-*-solaris2.[789] | *-*-solaris2.1[0-9]*)
-		tm_file="$tm_file tm-dwarf2.h"
-		;;
-	esac
-	case ${target} in
 	*-*-solaris2.1[0-9]*)
 		tm_file="${tm_file} i386/x86-64.h i386/sol2-10.h"
 		tm_defines="${tm_defines} TARGET_BI_ARCH=1"
@@ -1319,43 +1203,13 @@
 	esac
 	case ${enable_threads}:${have_pthread_h}:${have_thread_h} in
 	  "":yes:* | yes:yes:* )
-		case ${target} in
-		  *-*-solaris2.[0-6] | *-*-solaris2.[0-6].*)
-			thread_file=posix95
-			;;
-		  *)
-			thread_file=posix
-			;;
-		esac
+		thread_file=posix
 		;;
 	  "":*:yes | yes:*:yes )
 		thread_file=solaris
 		;;
 	esac
 	;;
-i[34567]86-*-sysv5*)           # Intel x86 on System V Release 5
-       tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h i386/sysv4.h i386/sysv5.h"
-       if test x$stabs = xyes
-       then
-               tm_file="${tm_file} dbx.h"
-       fi
-       tmake_file="i386/t-crtpic t-svr4"
-       extra_parts="crtbegin.o crtend.o"
-       if test x$enable_threads = xyes; then
-	       thread_file='posix'
-       fi
-	use_fixproto=yes
-       ;;
-i[34567]86-*-sysv4*)		# Intel 80386's running system V.4
-	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h i386/sysv4.h i386/sysv4-cpp.h"
-	if test x$stabs = xyes
-	then
-		tm_file="${tm_file} dbx.h"
-	fi
-	tmake_file="i386/t-crtpic t-svr4"
-	extra_parts="crtbegin.o crtend.o"
-	use_fixproto=yes
-	;;
 i[4567]86-wrs-vxworks|i[4567]86-wrs-vxworksae)
 	tm_file="${tm_file} i386/unix.h i386/att.h elfos.h svr4.h vx-common.h"
 	case ${target} in
@@ -1414,17 +1268,6 @@
 			;;
 	esac
 	;;
-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"
-	tmake_file="i386/t-cygwin i386/t-uwin"
-	extra_objs=winnt.o
-	extra_options="${extra_options} i386/cygming.opt"
-	target_gtfiles="\$(srcdir)/config/i386/winnt.c"
-	if test x$enable_threads = xyes; then
-		thread_file='win32'
-	fi
-	use_fixproto=yes
-	;;
 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="i386/t-interix"
@@ -1437,10 +1280,6 @@
 		tm_file="${tm_file} dbxcoff.h"
 	fi
 	;;
-i[34567]86-*-kaos*)
-	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h i386/i386elf.h kaos.h i386/kaos-i386.h"
-	tmake_file="i386/t-i386elf t-svr4"
-	;;
 ia64*-*-elf*)
 	tm_file="${tm_file} dbxelf.h elfos.h ia64/sysv4.h ia64/elf.h"
 	tmake_file="ia64/t-ia64"
@@ -1557,7 +1396,7 @@
 	tm_file="${tm_file} m68k/m68k-none.h m68k/m68kemb.h dbxcoff.h m68k/coff.h dbx.h"
 	use_fixproto=yes
 	;;
-m68020-*-elf* | m68k-*-elf* | fido-*-elf*)
+m68k-*-elf* | fido-*-elf*)
 	case ${target} in
 	fido-*-elf*)
 		# Check that $with_cpu makes sense.
@@ -1589,7 +1428,7 @@
 	esac
 	extra_parts="crtbegin.o crtend.o"
 	;;
-m68010-*-netbsdelf* | m68k*-*-netbsdelf*)
+m68k*-*-netbsdelf*)
 	default_m68k_cpu=68020
 	default_cf_cpu=5475
 	tm_file="${tm_file} dbxelf.h elfos.h netbsd.h netbsd-elf.h m68k/netbsd-elf.h"
@@ -1828,12 +1667,6 @@
 	tm_file="elfos.h ${tm_file} svr4.h mips/elf.h vx-common.h vxworks.h mips/vxworks.h"
 	tmake_file="${tmake_file} mips/t-vxworks"
 	;;
-mips-wrs-windiss)	# Instruction-level simulator for VxWorks.
-	xm_defines=POSIX
-	tm_file="elfos.h mips/mips.h svr4.h mips/elf.h windiss.h mips/windiss.h"
-	tmake_file="${tmake_file} mips/t-elf mips/t-libgcc-mips16"
-	thread_file=
-	;;
 mipstx39-*-elf* | mipstx39el-*-elf*)
 	tm_file="elfos.h ${tm_file} mips/r3900.h mips/elf.h"
 	tmake_file="mips/t-r3900 mips/t-libgcc-mips16"
@@ -1851,10 +1684,6 @@
 	use_collect2=no
 	use_fixproto=yes
 	;;
-mt-*-elf)
-        tm_file="dbxelf.h elfos.h svr4.h ${tm_file}"
-        tmake_file="${tmake_file} mt/t-mt"
-        ;;
 pdp11-*-bsd)
 	tm_file="${tm_file} pdp11/2bsd.h"
 	use_fixproto=yes
@@ -1883,12 +1712,6 @@
 	extra_options="${extra_options} rs6000/sysv4.opt rs6000/linux64.opt"
 	tmake_file="rs6000/t-fprules t-slibgcc-elf-ver t-gnu rs6000/t-linux64 rs6000/t-fprules-softfp soft-fp/t-softfp"
 	;;
-powerpc-*-beos*)
-	tm_file="${tm_file} rs6000/aix.h rs6000/beos.h rs6000/xcoff.h"
-	tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-beos"
-	extra_headers=
-	use_fixproto=yes
-	;;
 powerpc-*-darwin*)
 	extra_options="${extra_options} rs6000/darwin.opt"
 	extra_parts="crt2.o"
@@ -1921,17 +1744,6 @@
 	tmake_file="${tmake_file} rs6000/t-netbsd"
 	extra_options="${extra_options} rs6000/sysv4.opt"
 	;;
-powerpc-*-chorusos*)
-	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h chorus.h"
-	tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcos rs6000/t-ppccomm"
-	extra_options="${extra_options} rs6000/sysv4.opt"
-	case ${enable_threads} in
-	  yes | posix)
-	    thread_file='posix'
-	    ;;
-	esac
-	use_fixproto=yes
-	;;
 powerpc-*-eabispe*)
 	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h rs6000/eabispe.h"
 	extra_options="${extra_options} rs6000/sysv4.opt"
@@ -2035,13 +1847,6 @@
 	    ;;
 	esac
 	;;
-powerpc-wrs-windiss*)  # Instruction-level simulator for VxWorks.
-	tm_file="${tm_file} elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/windiss.h"
-	tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
-	extra_options="${extra_options} rs6000/sysv4.opt"
-	thread_file=""
-	use_fixproto=yes
-	;;
 powerpc-*-lynxos*)
 	xm_defines=POSIX
 	tm_file="${tm_file} dbxelf.h elfos.h rs6000/sysv4.h rs6000/lynx.h lynx.h"
@@ -2053,12 +1858,6 @@
 	gnu_ld=yes
 	gas=yes
 	;;
-powerpcle-*-sysv*)
-	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/sysv4le.h"
-	tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcos rs6000/t-ppccomm"
-	extra_options="${extra_options} rs6000/sysv4.opt"
-	use_fixproto=yes
-	;;
 powerpcle-*-elf*)
 	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/sysv4le.h"
 	tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
@@ -2075,16 +1874,6 @@
 	tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
 	extra_options="${extra_options} rs6000/sysv4.opt"
 	;;
-powerpc-*-kaos*)
-	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h kaos.h rs6000/kaos-ppc.h"
-	tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
-	extra_options="${extra_options} rs6000/sysv4.opt"
-	;;
-powerpcle-*-kaos*)
-	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/sysv4le.h kaos.h rs6000/kaos-ppc.h"
-	tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
-	extra_options="${extra_options} rs6000/sysv4.opt"
-	;;
 rs6000-ibm-aix4.[12]* | powerpc-ibm-aix4.[12]*)
 	tm_file="${tm_file} rs6000/aix.h rs6000/aix41.h rs6000/xcoff.h"
 	tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-newas"
@@ -2161,7 +1950,7 @@
         tmake_file=score/t-score-elf
         extra_objs="score7.o score3.o"
         ;;
-sh-*-elf* | sh[12346l]*-*-elf* | sh*-*-kaos* | \
+sh-*-elf* | sh[12346l]*-*-elf* | \
 sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
   sh-*-linux* | sh[346lbe]*-*-linux* | \
   sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \
@@ -2195,8 +1984,6 @@
 	case ${target} in
 	sh*-*-linux*)	tmake_file="${tmake_file} sh/t-linux"
 			tm_file="${tm_file} linux.h sh/linux.h" ;;
-	sh*-*-kaos*)	tm_file="${tm_file} sh/embed-elf.h kaos.h sh/kaos-sh.h"
-			;;
 	sh*-*-netbsd*)	tm_file="${tm_file} netbsd.h netbsd-elf.h sh/netbsd-elf.h" ;;
 	sh*-superh-elf)	if test x$with_libgloss != xno; then
 				with_libgloss=yes
@@ -2408,9 +2195,6 @@
 sparc-*-solaris2*)
 	tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h"
 	case ${target} in
-	*-*-solaris2.[0-6] | *-*-solaris2.[0-6].*)
-		tm_file="${tm_file} sol2-6.h"
-		;;
 	*-*-solaris2.1[0-9]*)
 		tm_file="${tm_file} sol2-10.h"
 		;;
@@ -2428,25 +2212,16 @@
 	else
 		tmake_file="$tmake_file t-slibgcc-sld"
 	fi
-	case ${target} in
-	*-*-solaris2.[0-6] | *-*-solaris2.[0-6].*)
-		if test x$gnu_ld = xno; then
-			tm_file="${tm_file} sparc/sol26-sld.h"
-		fi
-		;;
-	*-*-solaris2.[789] | *-*-solaris2.1[0-9]*)
-		tm_file="sparc/biarch64.h ${tm_file} sparc/sol2-bi.h"
-		if test x$gnu_ld = xyes; then
-			tm_file="${tm_file} sparc/sol2-gld-bi.h"
-		fi
-		if test x$gas = xyes; then
-			tm_file="${tm_file} sparc/sol2-gas-bi.h"
-		fi
-		tm_file="${tm_file} tm-dwarf2.h"
-		tmake_file="$tmake_file sparc/t-sol2-64"
-		test x$with_cpu != x || with_cpu=v9
-		;;
-	esac
+	tm_file="sparc/biarch64.h ${tm_file} sparc/sol2-bi.h"
+	if test x$gnu_ld = xyes; then
+		tm_file="${tm_file} sparc/sol2-gld-bi.h"
+	fi
+	if test x$gas = xyes; then
+		tm_file="${tm_file} sparc/sol2-gas-bi.h"
+	fi
+	tm_file="${tm_file} tm-dwarf2.h"
+	tmake_file="$tmake_file sparc/t-sol2-64"
+	test x$with_cpu != x || with_cpu=v9
 	c_target_objs="sol2-c.o"
 	cxx_target_objs="sol2-c.o"
 	extra_objs="sol2.o"
@@ -2454,26 +2229,13 @@
 	extra_parts="crt1.o crti.o crtn.o gcrt1.o gmon.o crtbegin.o crtend.o"
 	case ${enable_threads}:${have_pthread_h}:${have_thread_h} in
 	  "":yes:* | yes:yes:* )
-		case ${target} in
-		  *-*-solaris2.[0-6] | *-*-solaris2.[0-6].*)
-			thread_file=posix95
-			;;
-		  *)
-			thread_file=posix
-			;;
-		esac
+		thread_file=posix
 		;;
 	  "":*:yes | yes:*:yes )
 		thread_file=solaris
 		;;
 	esac
 	;;
-sparc-*-sysv4*)
-	tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/sysv4-only.h"
-	tmake_file=t-svr4
-	extra_parts="crtbegin.o crtend.o"
-	use_fixproto=yes
-	;;
 sparc-wrs-vxworks)
 	tm_file="${tm_file} elfos.h svr4.h sparc/sysv4.h vx-common.h vxworks.h sparc/vxworks.h"
 	tmake_file="${tmake_file} sparc/t-vxworks"
@@ -2514,31 +2276,6 @@
 	c_target_objs="${c_target_objs} spu-c.o"
 	cxx_target_objs="${cxx_target_objs} spu-c.o"
 	;;
-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"
-	tmake_file="arm/t-arm arm/t-strongarm-elf"
-	out_file=arm/arm.c
-	md_file=arm/arm.md
-	extra_modes=arm/arm-modes.def
-	use_fixproto=yes
-	;;
-strongarm-*-pe)
-	tm_file="arm/semi.h arm/aout.h arm/coff.h dbxcoff.h arm/strongarm-coff.h arm/arm.h arm/pe.h arm/strongarm-pe.h"
-	tmake_file="arm/t-arm arm/t-strongarm-pe"
-	out_file=arm/arm.c
-	md_file=arm/arm.md
-	extra_modes=arm/arm-modes.def
-	extra_options="${extra_options} arm/pe.opt"
-	extra_objs=pe.o
-	use_fixproto=yes
-	;;
-strongarm-*-kaos*)
-	tm_file="arm/strongarm-elf.h dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h kaos.h arm/kaos-strongarm.h"
-	tmake_file="arm/t-arm arm/t-strongarm-elf"
-	out_file=arm/arm.c
-	md_file=arm/arm.md
-	extra_modes=arm/arm-modes.def
-	;;
 v850e1-*-*)
 	target_cpu_default="TARGET_CPU_v850e1"
 	tm_file="dbxelf.h elfos.h svr4.h v850/v850.h"
@@ -2586,17 +2323,6 @@
 	cxx_target_objs="v850-c.o"
 	use_fixproto=yes
 	;;
-vax-*-bsd*)			# VAXen running BSD
-	tm_file="${tm_file} vax/bsd.h"
-	tmake_file=vax/t-memfuncs
-	use_collect2=yes
-	use_fixproto=yes
-	;;
-vax-*-sysv*)			# VAXen running system V
-	tm_file="${tm_file} vax/vaxv.h"
-	tmake_file=vax/t-memfuncs
-	use_fixproto=yes
-	;;
 vax-*-netbsdelf*)
 	tm_file="${tm_file} elfos.h netbsd.h netbsd-elf.h vax/elf.h vax/netbsd-elf.h"
 	;;
@@ -2610,27 +2336,6 @@
 	tm_file="vax/vax.h vax/openbsd1.h openbsd.h vax/openbsd.h"
 	use_collect2=yes
 	;;
-vax-*-ultrix*)			# VAXen running ultrix
-	tm_file="${tm_file} vax/ultrix.h"
-	tmake_file=vax/t-memfuncs
-	use_fixproto=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-arm arm/t-xscale-elf"
-	out_file=arm/arm.c
-	md_file=arm/arm.md
-	extra_modes=arm/arm-modes.def
-	use_fixproto=yes
-	;;
-xscale-*-coff)
-	tm_file="arm/semi.h arm/aout.h arm/coff.h dbxcoff.h arm/xscale-coff.h arm/arm.h"
-	tmake_file="arm/t-arm arm/t-xscale-coff"
-	out_file=arm/arm.c
-	md_file=arm/arm.md
-	extra_modes=arm/arm-modes.def
-	use_fixproto=yes
-	;;
 xstormy16-*-elf)
 	# For historical reasons, the target files omit the 'x'.
 	tm_file="dbxelf.h elfos.h svr4.h stormy16/stormy16.h"
@@ -2670,9 +2375,6 @@
 esac
 
 case ${target} in
-i[34567]86-*-linux*aout* | i[34567]86-*-linux*libc1)
-	tmake_file="${tmake_file} i386/t-gmm_malloc"
-	;;
 i[34567]86-*-linux* | x86_64-*-linux*)
 	tmake_file="${tmake_file} i386/t-pmm_malloc"
 	;;
@@ -2694,10 +2396,6 @@
 # This block sets nothing except for with_cpu.
 if test x$with_cpu = x ; then
   case ${target} in
-    ep9312-*-*)
-      # A Cirrus ARM variant.
-      with_cpu="ep9312"
-      ;;
     i386-*-*)
       with_cpu=i386
       ;;
@@ -2809,9 +2507,6 @@
     frv550-*-*linux*)
       with_cpu=fr550
       ;;
-    m680[012]0-*-*)
-      with_cpu=`echo ${target} | sed 's/-.*$//'`
-      ;;
     m68k*-*-*)
       case "$with_arch" in
 	"cf")
@@ -2831,19 +2526,10 @@
   esac
 fi
 
-# Similarly for --with-float
-if test x$with_float = x; then
-	case ${target} in
-	ep9312-*-*)
-		with_float=hard
-		;;
-	esac
-fi
-
 # Similarly for --with-schedule.
 if test x$with_schedule = x; then
 	case ${target} in
-	hppa1* | parisc1*)
+	hppa1*)
 		# Override default PA8000 scheduling model.
 		with_schedule=7100LC
 		;;
@@ -2974,7 +2660,7 @@
 		esac
 		;;
 
-	fido-*-* | m680[012]0-*-* | m68k*-*-*)
+	fido-*-* | m68k*-*-*)
 		supported_defaults="arch cpu"
 		case "$with_arch" in
 		"" | "m68k"| "cf")
@@ -3014,7 +2700,7 @@
 		esac
 		;;
 
-	hppa*-*-* | parisc*-*-*)
+	hppa*-*-*)
 		supported_defaults="arch schedule"
 
 		case "$with_arch" in
@@ -3118,25 +2804,6 @@
 		esac
 		;;
 
-	mt-*-*)
-		supported_defaults="arch"
-
-		case "$with_arch" in
-		"" \
-		| ms1-64-001 \
-		| ms1-16-002 \
-		| ms1-16-003 \
-		| ms2 \
-		| "")
-			# OK
-			;;
-		*)
-			echo "Unknown arch used in --with-arch=$with_arch" 1>&2
-			exit 1
-			;;
-		esac
-		;;
-
 	powerpc*-*-* | rs6000-*-*)
 		supported_defaults="cpu float tune"
 
@@ -3294,7 +2961,7 @@
 		fi
 		;;
 
-	hppa*-*-* | parisc*-*-*)
+	hppa*-*-*)
 		target_cpu_default2="MASK_BIG_SWITCH"
 		if test x$gas = xyes
 		then
@@ -3302,7 +2969,7 @@
 		fi
 		;;
 
-	fido*-*-* | m680[012]0-*-* | m68k*-*-*)
+	fido*-*-* | m68k*-*-*)
 		target_cpu_default2=$m68k_cpu_ident
 		if [ x"$m68k_arch_family" != x ]; then
 		        tmake_file="m68k/t-$m68k_arch_family $tmake_file"
Index: gcc/config/alpha/t-unicosmk (deleted)
===================================================================
Index: gcc/config/alpha/unicosmk.h (deleted)
===================================================================
Index: gcc/config/sparc/sysv4-only.h (deleted)
===================================================================
Index: gcc/config/sparc/sol26-sld.h (deleted)
===================================================================
Index: gcc/config/i386/sco5.h (deleted)
===================================================================
Index: gcc/config/i386/kaos-i386.h (deleted)
===================================================================
Index: gcc/config/i386/t-uwin (deleted)
===================================================================
Index: gcc/config/i386/t-beos (deleted)
===================================================================
Index: gcc/config/i386/sysv5.h (deleted)
===================================================================
Index: gcc/config/i386/uwin.asm (deleted)
===================================================================
Index: gcc/config/i386/sysv4-cpp.h (deleted)
===================================================================
Index: gcc/config/i386/uwin.h (deleted)
===================================================================
Index: gcc/config/i386/ptx4-i.h (deleted)
===================================================================
Index: gcc/config/i386/beos-elf.h (deleted)
===================================================================
Index: gcc/config/i386/sco5.opt (deleted)
===================================================================
Index: gcc/config/i386/t-sco5 (deleted)
===================================================================
Index: gcc/config/sh/kaos-sh.h (deleted)
===================================================================
Index: gcc/config/cris/aout.h (deleted)
===================================================================
Index: gcc/config/cris/t-aout (deleted)
===================================================================
Index: gcc/config/cris/aout.opt (deleted)
===================================================================
Index: gcc/config/mt/mt.md (deleted)
===================================================================
Index: gcc/config/mt/crti.asm (deleted)
===================================================================
Index: gcc/config/mt/mt.c (deleted)
===================================================================
Index: gcc/config/mt/mt.opt (deleted)
===================================================================
Index: gcc/config/mt/t-mt (deleted)
===================================================================
Index: gcc/config/mt/crtn.asm (deleted)
===================================================================
Index: gcc/config/mt/mt.h (deleted)
===================================================================
Index: gcc/config/mt/ABI.txt (deleted)
===================================================================
Index: gcc/config/mt/lib2extra-funcs.c (deleted)
===================================================================
Index: gcc/config/mt/mt-protos.h (deleted)
===================================================================
Index: gcc/config/chorus.h (deleted)
===================================================================
Index: gcc/config/windiss.h (deleted)
===================================================================
Index: gcc/config/rs6000/kaos-ppc.h (deleted)
===================================================================
Index: gcc/config/rs6000/beos.h (deleted)
===================================================================
Index: gcc/config/rs6000/t-beos (deleted)
===================================================================
Index: gcc/config/rs6000/sysv4.opt
===================================================================
--- gcc/config/rs6000/sysv4.opt	(revision 135721)
+++ gcc/config/rs6000/sysv4.opt	(working copy)
@@ -119,10 +119,6 @@
 Target RejectNegative
 Set the PPC_EMB bit in the ELF flags header
 
-mwindiss
-Target RejectNegative
-Use the WindISS simulator
-
 mshlib
 Target RejectNegative
 no description yet
Index: gcc/config/rs6000/windiss.h (deleted)
===================================================================
Index: gcc/config/rs6000/sysv4.h
===================================================================
--- gcc/config/rs6000/sysv4.h	(revision 135721)
+++ gcc/config/rs6000/sysv4.h	(working copy)
@@ -655,7 +655,6 @@
   myellowknife : %(link_start_yellowknife) ; \
   mmvme        : %(link_start_mvme)        ; \
   msim         : %(link_start_sim)         ; \
-  mwindiss     : %(link_start_windiss)     ; \
   mcall-freebsd: %(link_start_freebsd)     ; \
   mcall-linux  : %(link_start_linux)       ; \
   mcall-gnu    : %(link_start_gnu)         ; \
@@ -713,7 +712,6 @@
   myellowknife : %(link_os_yellowknife) ; \
   mmvme        : %(link_os_mvme)        ; \
   msim         : %(link_os_sim)         ; \
-  mwindiss     : %(link_os_windiss)     ; \
   mcall-freebsd: %(link_os_freebsd)     ; \
   mcall-linux  : %(link_os_linux)       ; \
   mcall-gnu    : %(link_os_gnu)         ; \
@@ -730,7 +728,6 @@
   myellowknife : %(cpp_os_yellowknife) ; \
   mmvme        : %(cpp_os_mvme)        ; \
   msim         : %(cpp_os_sim)         ; \
-  mwindiss     : %(cpp_os_windiss)     ; \
   mcall-freebsd: %(cpp_os_freebsd)     ; \
   mcall-linux  : %(cpp_os_linux)       ; \
   mcall-gnu    : %(cpp_os_gnu)         ; \
@@ -747,7 +744,6 @@
   myellowknife : %(startfile_yellowknife) ; \
   mmvme        : %(startfile_mvme)        ; \
   msim         : %(startfile_sim)         ; \
-  mwindiss     : %(startfile_windiss)     ; \
   mcall-freebsd: %(startfile_freebsd)     ; \
   mcall-linux  : %(startfile_linux)       ; \
   mcall-gnu    : %(startfile_gnu)         ; \
@@ -764,7 +760,6 @@
   myellowknife : %(lib_yellowknife) ; \
   mmvme        : %(lib_mvme)        ; \
   msim         : %(lib_sim)         ; \
-  mwindiss     : %(lib_windiss)     ; \
   mcall-freebsd: %(lib_freebsd)     ; \
   mcall-linux  : %(lib_linux)       ; \
   mcall-gnu    : %(lib_gnu)         ; \
@@ -781,7 +776,6 @@
   myellowknife : %(endfile_yellowknife) ; \
   mmvme        : %(endfile_mvme)        ; \
   msim         : %(endfile_sim)         ; \
-  mwindiss     :                      %(endfile_windiss)     ; \
   mcall-freebsd: %(endfile_freebsd)     ; \
   mcall-linux  : %(endfile_linux)       ; \
   mcall-gnu    : %(endfile_gnu)         ; \
@@ -992,25 +986,6 @@
 #define CPP_OS_OPENBSD_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_POSIX_THREADS}"
 #endif
 
-/* WindISS support.  */
-
-#define LIB_WINDISS_SPEC "--start-group -li -lcfp -lwindiss -lram -limpl -limpfp --end-group"
-
-#define CPP_OS_WINDISS_SPEC "\
--D__rtasim \
--D__EABI__ \
--D__ppc \
-%{!msoft-float: -D__hardfp} \
-"
-
-#define STARTFILE_WINDISS_SPEC "crt0.o%s crtbegin.o%s"
-
-#define ENDFILE_WINDISS_SPEC "crtend.o%s"
-
-#define LINK_START_WINDISS_SPEC ""
-
-#define LINK_OS_WINDISS_SPEC ""
-
 /* Define any extra SPECS that the compiler needs to generate.  */
 /* Override rs6000.h definition.  */
 #undef	SUBTARGET_EXTRA_SPECS
@@ -1025,7 +1000,6 @@
   { "lib_linux",		LIB_LINUX_SPEC },			\
   { "lib_netbsd",		LIB_NETBSD_SPEC },			\
   { "lib_openbsd",		LIB_OPENBSD_SPEC },			\
-  { "lib_windiss",		LIB_WINDISS_SPEC },			\
   { "lib_default",		LIB_DEFAULT_SPEC },			\
   { "startfile_ads",		STARTFILE_ADS_SPEC },			\
   { "startfile_yellowknife",	STARTFILE_YELLOWKNIFE_SPEC },		\
@@ -1036,7 +1010,6 @@
   { "startfile_linux",		STARTFILE_LINUX_SPEC },			\
   { "startfile_netbsd",		STARTFILE_NETBSD_SPEC },		\
   { "startfile_openbsd",	STARTFILE_OPENBSD_SPEC },		\
-  { "startfile_windiss",	STARTFILE_WINDISS_SPEC },		\
   { "startfile_default",	STARTFILE_DEFAULT_SPEC },		\
   { "endfile_ads",		ENDFILE_ADS_SPEC },			\
   { "endfile_yellowknife",	ENDFILE_YELLOWKNIFE_SPEC },		\
@@ -1047,7 +1020,6 @@
   { "endfile_linux",		ENDFILE_LINUX_SPEC },			\
   { "endfile_netbsd",		ENDFILE_NETBSD_SPEC },			\
   { "endfile_openbsd",		ENDFILE_OPENBSD_SPEC },			\
-  { "endfile_windiss",		ENDFILE_WINDISS_SPEC },			\
   { "endfile_default",		ENDFILE_DEFAULT_SPEC },			\
   { "link_path",		LINK_PATH_SPEC },			\
   { "link_shlib",		LINK_SHLIB_SPEC },			\
@@ -1062,7 +1034,6 @@
   { "link_start_linux",		LINK_START_LINUX_SPEC },		\
   { "link_start_netbsd",	LINK_START_NETBSD_SPEC },		\
   { "link_start_openbsd",	LINK_START_OPENBSD_SPEC },		\
-  { "link_start_windiss",	LINK_START_WINDISS_SPEC },		\
   { "link_start_default",	LINK_START_DEFAULT_SPEC },		\
   { "link_os",			LINK_OS_SPEC },				\
   { "link_os_ads",		LINK_OS_ADS_SPEC },			\
@@ -1074,7 +1045,6 @@
   { "link_os_gnu",		LINK_OS_GNU_SPEC },			\
   { "link_os_netbsd",		LINK_OS_NETBSD_SPEC },			\
   { "link_os_openbsd",		LINK_OS_OPENBSD_SPEC },			\
-  { "link_os_windiss",		LINK_OS_WINDISS_SPEC },			\
   { "link_os_default",		LINK_OS_DEFAULT_SPEC },			\
   { "cc1_endian_big",		CC1_ENDIAN_BIG_SPEC },			\
   { "cc1_endian_little",	CC1_ENDIAN_LITTLE_SPEC },		\
@@ -1089,7 +1059,6 @@
   { "cpp_os_linux",		CPP_OS_LINUX_SPEC },			\
   { "cpp_os_netbsd",		CPP_OS_NETBSD_SPEC },			\
   { "cpp_os_openbsd",		CPP_OS_OPENBSD_SPEC },			\
-  { "cpp_os_windiss",		CPP_OS_WINDISS_SPEC },			\
   { "cpp_os_default",		CPP_OS_DEFAULT_SPEC },			\
   { "fbsd_dynamic_linker",	FBSD_DYNAMIC_LINKER },			\
   SUBSUBTARGET_EXTRA_SPECS
Index: gcc/config/arm/strongarm-pe.h (deleted)
===================================================================
Index: gcc/config/arm/t-strongarm-pe (deleted)
===================================================================
Index: gcc/config/arm/xscale-elf.h (deleted)
===================================================================
Index: gcc/config/arm/strongarm-coff.h (deleted)
===================================================================
Index: gcc/config/arm/t-xscale-elf (deleted)
===================================================================
Index: gcc/config/arm/t-xscale-coff (deleted)
===================================================================
Index: gcc/config/arm/kaos-arm.h (deleted)
===================================================================
Index: gcc/config/arm/xscale-coff.h (deleted)
===================================================================
Index: gcc/config/arm/kaos-strongarm.h (deleted)
===================================================================
Index: gcc/config/arm/strongarm-elf.h (deleted)
===================================================================
Index: gcc/config/kaos.h (deleted)
===================================================================
Index: gcc/config/pa/pa-pro-end.h (deleted)
===================================================================
Index: gcc/config/pa/t-pro (deleted)
===================================================================
Index: gcc/config/pa/pa-osf.h (deleted)
===================================================================
Index: gcc/config/mips/windiss.h (deleted)
===================================================================
Index: gcc/config/ptx4.h (deleted)
===================================================================
Index: gcc/config/vax/bsd.h (deleted)
===================================================================
Index: gcc/config/vax/vaxv.h (deleted)
===================================================================
Index: gcc/config/vax/ultrix.h (deleted)
===================================================================
Index: gcc/config/vax/t-memfuncs (deleted)
===================================================================
Index: gcc/config/sol2-6.h (deleted)
===================================================================
Index: libstdc++-v3/configure.host
===================================================================
--- libstdc++-v3/configure.host	(revision 135721)
+++ libstdc++-v3/configure.host	(working copy)
@@ -91,7 +91,7 @@
   alpha*)
     try_cpu=alpha
     ;;
-  arm* | xscale | ep9312)
+  arm*)
     try_cpu=arm
     ;;
   crisv32)
@@ -106,9 +106,6 @@
   mips*)
     try_cpu=mips
     ;;
-  m680[246]0)
-    try_cpu=m68k
-    ;;
   powerpc* | rs6000)
     try_cpu=powerpc
     ;;
@@ -271,12 +268,6 @@
     echo "Please specify the full version of Solaris, ie. solaris2.9 " 1>&2
     exit 1
     ;;
-  solaris2.5 | solaris2.5.[0-9])
-    os_include_dir="os/solaris/solaris2.5"
-    ;;
-  solaris2.6)
-    os_include_dir="os/solaris/solaris2.6"
-    ;;
   solaris2.[789] | solaris2.1[0-9])
     os_include_dir="os/solaris/solaris2.7"
     ;;
@@ -286,9 +277,6 @@
   vxworks)
     os_include_dir="os/vxworks"
     ;;
-  windiss*)
-    os_include_dir="os/windiss"
-    ;;
   *)
     os_include_dir="os/generic"
     ;;
Index: libstdc++-v3/crossconfig.m4
===================================================================
--- libstdc++-v3/crossconfig.m4	(revision 135721)
+++ libstdc++-v3/crossconfig.m4	(working copy)
@@ -303,12 +303,6 @@
     ;;
   *-solaris*)
     case "$target" in
-    #  *-solaris2.5)
-    #    os_include_dir="os/solaris/solaris2.5"
-    #    ;;
-    #  *-solaris2.6)
-    #    os_include_dir="os/solaris/solaris2.6"
-    #    ;;
       *-solaris2.7 | *-solaris2.8 | *-solaris2.9 | *-solaris2.10)
          GLIBCXX_CHECK_LINKER_FEATURES
          AC_DEFINE(HAVE_GETPAGESIZE)
@@ -418,53 +412,6 @@
     AC_DEFINE(HAVE_TANF)
     AC_DEFINE(HAVE_TANHF)
     ;;
-  *-windiss*)
-    AC_DEFINE(HAVE_ACOSF)
-    AC_DEFINE(HAVE_ACOSL)
-    AC_DEFINE(HAVE_ASINF)
-    AC_DEFINE(HAVE_ASINL)
-    AC_DEFINE(HAVE_ATAN2F)
-    AC_DEFINE(HAVE_ATAN2L)
-    AC_DEFINE(HAVE_ATANF)
-    AC_DEFINE(HAVE_ATANL)
-    AC_DEFINE(HAVE_CEILF)
-    AC_DEFINE(HAVE_CEILL)
-    AC_DEFINE(HAVE_COPYSIGN)
-    AC_DEFINE(HAVE_COPYSIGNF)
-    AC_DEFINE(HAVE_COSF)
-    AC_DEFINE(HAVE_COSL)
-    AC_DEFINE(HAVE_COSHF)
-    AC_DEFINE(HAVE_COSHL)
-    AC_DEFINE(HAVE_EXPF)
-    AC_DEFINE(HAVE_EXPL)
-    AC_DEFINE(HAVE_FABSF)
-    AC_DEFINE(HAVE_FABSL)
-    AC_DEFINE(HAVE_FLOORF)
-    AC_DEFINE(HAVE_FLOORL)
-    AC_DEFINE(HAVE_FMODF)
-    AC_DEFINE(HAVE_FMODL)
-    AC_DEFINE(HAVE_FREXPF)
-    AC_DEFINE(HAVE_FREXPL)
-    AC_DEFINE(HAVE_LDEXPF)
-    AC_DEFINE(HAVE_LDEXPL)
-    AC_DEFINE(HAVE_LOG10F)
-    AC_DEFINE(HAVE_LOG10L)
-    AC_DEFINE(HAVE_LOGF)
-    AC_DEFINE(HAVE_MODFF)
-    AC_DEFINE(HAVE_MODFL)
-    AC_DEFINE(HAVE_POWF)
-    AC_DEFINE(HAVE_POWL)
-    AC_DEFINE(HAVE_SINF)
-    AC_DEFINE(HAVE_SINL)
-    AC_DEFINE(HAVE_SINHF)
-    AC_DEFINE(HAVE_SINHL)
-    AC_DEFINE(HAVE_SQRTF)
-    AC_DEFINE(HAVE_SQRTL)
-    AC_DEFINE(HAVE_TANF)
-    AC_DEFINE(HAVE_TANL)
-    AC_DEFINE(HAVE_TANHF)
-    AC_DEFINE(HAVE_TANHL)
-    ;;
   *)
     AC_MSG_ERROR([No support for this host/target combination.])
    ;;
Index: libstdc++-v3/config/os/windiss/ctype_noninline.h (deleted)
===================================================================
Index: libstdc++-v3/config/os/windiss/ctype_base.h (deleted)
===================================================================
Index: libstdc++-v3/config/os/windiss/os_defines.h (deleted)
===================================================================
Index: libstdc++-v3/config/os/windiss/ctype_inline.h (deleted)
===================================================================
Index: libstdc++-v3/config/os/solaris/solaris2.5/ctype_noninline.h (deleted)
===================================================================
Index: libstdc++-v3/config/os/solaris/solaris2.5/ctype_base.h (deleted)
===================================================================
Index: libstdc++-v3/config/os/solaris/solaris2.5/os_defines.h (deleted)
===================================================================
Index: libstdc++-v3/config/os/solaris/solaris2.5/ctype_inline.h (deleted)
===================================================================
Index: libstdc++-v3/config/os/solaris/solaris2.6/ctype_noninline.h (deleted)
===================================================================
Index: libstdc++-v3/config/os/solaris/solaris2.6/ctype_base.h (deleted)
===================================================================
Index: libstdc++-v3/config/os/solaris/solaris2.6/os_defines.h (deleted)
===================================================================
Index: libstdc++-v3/config/os/solaris/solaris2.6/ctype_inline.h (deleted)
===================================================================
Index: libffi/configure.ac
===================================================================
--- libffi/configure.ac	(revision 135721)
+++ libffi/configure.ac	(working copy)
@@ -63,7 +63,7 @@
 	TARGET=FRV; TARGETDIR=frv
 	;;
 
-  hppa*-*-linux* | parisc*-*-linux*)
+  hppa*-*-linux*)
 	TARGET=PA_LINUX; TARGETDIR=pa
 	;;
   hppa*64-*-hpux*)
@@ -105,12 +105,9 @@
 	TARGET=MIPS; TARGETDIR=mips
 	;;
 
-  powerpc*-*-linux* | powerpc-*-sysv*)
+  powerpc*-*-linux*)
 	TARGET=POWERPC; TARGETDIR=powerpc
 	;;
-  powerpc-*-beos*)
-	TARGET=POWERPC; TARGETDIR=powerpc
-	;;
   powerpc-*-darwin*)
 	TARGET=POWERPC_DARWIN; TARGETDIR=powerpc
 	;;
Index: libjava/configure.host
===================================================================
--- libjava/configure.host	(revision 135721)
+++ libjava/configure.host	(working copy)
@@ -72,7 +72,7 @@
 
 # This case statement supports per-CPU defaults.
 case "${host}" in
-  arm*-elf | strongarm*-elf | xscale*-elf)
+  arm*-elf)
 	with_libffi_default=no
 	PROCESS=Ecos
 	FILE=Posix
Index: libcpp/configure.ac
===================================================================
--- libcpp/configure.ac	(revision 135721)
+++ libcpp/configure.ac	(working copy)
@@ -118,7 +118,7 @@
 	arm*-*-symbianelf* | \
 	x86_64-*-* | \
 	ia64-*-* | \
-	hppa*64*-*-* | parisc*64*-*-* | \
+	hppa*64*-*-* | \
 	i[34567]86-*-darwin* | \
 	i[34567]86-*-solaris2.1[0-9]* | \
 	mips*-*-* | \
Index: gnattools/configure.ac
===================================================================
--- gnattools/configure.ac	(revision 135721)
+++ gnattools/configure.ac	(working copy)
@@ -80,8 +80,6 @@
   | powerpc*-wrs-vxworks \
   | sparc*-wrs-vx* \
   | *86-wrs-vxworks \
-  | xscale*-wrs-vx* \
-  | xscale*-wrs-coff \
   | mips*-wrs-vx*)
     TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-vxworks.adb"
     ;;
Index: MAINTAINERS
===================================================================
--- MAINTAINERS	(revision 135721)
+++ MAINTAINERS	(working copy)
@@ -68,8 +68,6 @@
 mmix port		Hans-Peter Nilsson	hp@bitrange.com
 mn10300 port		Jeff Law		law@redhat.com
 mn10300 port		Alexandre Oliva		aoliva@redhat.com
-mt port			Aldy Hernandez		aldyh@redhat.com
-mt port			Nathan Sidwell		nathan@codesourcery.com
 pdp11 port		Paul Koning		ni1d@arrl.net
 rs6000 port		Geoff Keating		geoffk@geoffk.org
 rs6000 port		David Edelsohn		dje@watson.ibm.com
@@ -106,7 +104,6 @@
 irix, osf		Rainer Orth		ro@TechFak.Uni-Bielefeld.DE
 netbsd			Jason Thorpe		thorpej@netbsd.org
 netbsd			Krister Walfridsson	cato@df.lth.se
-sco5, unixware, sco udk	Kean Johnston		jkj@sco.com
 sh-linux-gnu		Kaz Kojima		kkojima@gcc.gnu.org
 RTEMS Ports		Joel Sherrill		joel@oarcorp.com
 RTEMS Ports		Ralf Corsepius		ralf.corsepius@rtems.org
@@ -337,6 +334,7 @@
 Harsha Jagasia					harsha.jagasia@amd.com
 Fariborz Jahanian				fjahanian@apple.com
 Martin Jambor					mjambor@suse.cz
+Kean Johnston					jkj@sco.com
 Phillip Jordan					phillip.m.jordan@gmail.com
 Tim Josling					tej@melbpc.org.au
 Klaus Kaempf					kkaempf@progis.de
Index: fixincludes/mkfixinc.sh
===================================================================
--- fixincludes/mkfixinc.sh	(revision 135721)
+++ fixincludes/mkfixinc.sh	(working copy)
@@ -12,20 +12,13 @@
 # Check for special fix rules for particular targets
 case $machine in
     alpha*-dec-*vms* | \
-    arm-semi-aof | \
-    hppa1.1-*-osf* | \
-    hppa1.1-*-bsd* | \
-    i370-*-openedition | \
     i?86-moss-msdos* | \
-    i?86-*-moss* | \
     i?86-*-pe | \
     i?86-*-cygwin* | \
     i?86-*-mingw32* | \
     x86_64-*-mingw32* | \
-    i?86-*-uwin* | \
     i?86-*-interix* | \
     *-*-vxworks* | \
-    powerpc-*-eabiaix* | \
     powerpc-*-eabisim* | \
     powerpc-*-eabi*    | \
     powerpc-*-rtems*   | \
Index: fixincludes/tests/base/arpa/inet.h (deleted)
===================================================================
Index: fixincludes/tests/base/rpc/svc.h (deleted)
===================================================================
Index: fixincludes/tests/base/string.h
===================================================================
--- fixincludes/tests/base/string.h	(revision 135721)
+++ fixincludes/tests/base/string.h	(working copy)
@@ -7,7 +7,8 @@
     This had to be done to correct non-standard usages in the
     original, manufacturer supplied header file.  */
 
-#ifndef _STRING_INCLUDED
-  #define _STRING_INCLUDED
-  #include <strings.h>
-#endif /* _STRING_INCLUDED */
+
+
+#if defined( SVR4_DISABLE_OPT_CHECK )
+
+#endif  /* SVR4_DISABLE_OPT_CHECK */
Index: fixincludes/tests/base/stdlib.h
===================================================================
--- fixincludes/tests/base/stdlib.h	(revision 135721)
+++ fixincludes/tests/base/stdlib.h	(working copy)
@@ -50,23 +50,3 @@
 extern void *	bsearch(void*,size_t,size_t);
 
 #endif  /* SYSZ_STDLIB_FOR_SUN_CHECK */
-
-
-#if defined( ULTRIX_ATEXIT_PARAM_CHECK )
-int atexit( void (*__func)( void ) );
-
-#endif  /* ULTRIX_ATEXIT_PARAM_CHECK */
-
-
-#if defined( ULTRIX_STDLIB_CHECK )
-@(#)stdlib.h      6.1     (ULTRIX)
-char *		getenv( const char *__name );
-int		setenv( const char *__name, const char *__val, int __ovrwrt );
-void		unsetenv( const char *__name );
-int		putenv( char *__s );
-char	*getenv();
-int	setenv();
-void	unsetenv();
-int	putenv();
-
-#endif  /* ULTRIX_STDLIB_CHECK */
Index: fixincludes/tests/base/fs/rfs/rf_cache.h (deleted)
===================================================================
Index: fixincludes/tests/base/stdio.h
===================================================================
--- fixincludes/tests/base/stdio.h	(revision 135721)
+++ fixincludes/tests/base/stdio.h	(working copy)
@@ -100,15 +100,4 @@
 
 #endif  /* ULTRIX_CONST2_CHECK */
 
-
-#if defined( ULTRIX_CONST3_CHECK )
-extern FILE *	fdopen( int __filedes, const char *__type );
-
-#endif  /* ULTRIX_CONST3_CHECK */
-
-
-#if defined( UNICOSMK_RESTRICT_CHECK )
-void f (char * __restrict__ x);
-#endif  /* UNICOSMK_RESTRICT_CHECK */
-
 #endif  /* FIXINC_WRAP_STDIO_H_STDIO_STDARG_H */
Index: fixincludes/tests/base/pthread.h
===================================================================
--- fixincludes/tests/base/pthread.h	(revision 135721)
+++ fixincludes/tests/base/pthread.h	(working copy)
@@ -47,7 +47,7 @@
 #else
 # define PTHREAD_MUTEX_INITIALIZER {0, _PTHREAD_MVALID | _PTHREAD_MVF_STA, 0, 0, 0, 0, 0, 0 }
 # define PTHREAD_MUTEX_INITWITHNAME_NP(_n_,_a_)     {0, _PTHREAD_MVALID | _PTHREAD_MVF_STA, _n_, _a_, 0, 0, 0, 0 }
-# define PTHREAD_COND_INITWITHNAME_NP(_n_,_a_)     {{{0},0}, _PTHREAD_CVALID | _PTHREAD_CVF_STA, _n_, _a_, 0, 0 }
+# define PTHREAD_COND_INITWITHNAME_NP(_n_,_a_)     {0, _PTHREAD_CVALID | _PTHREAD_CVF_STA, _n_, _a_, 0, 0 }
 #endif
 
 #define PTHREAD_RWLOCK_INITIALIZER {_PTHREAD_RWVALID | _PTHREAD_RWVF_STA, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
@@ -107,22 +107,6 @@
 #endif  /* PTHREAD_INCOMPLETE_STRUCT_ARGUMENT_CHECK */
 
 
-#if defined( SOLARIS_MUTEX_INIT_1_CHECK )
-#ident "@(#)pthread.h  1.16    97/05/05 SMI"
-#if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG)
-#define PTHREAD_MUTEX_INITIALIZER	{{{0}, 0}, {{{0}}}, 0}
-#else
-#define PTHREAD_MUTEX_INITIALIZER	{{{0}, 0}, {{{0}}}, {0}}
-#endif
-#if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG)
-#define PTHREAD_COND_INITIALIZER	{{{0},0}, 0} /* */
-#else
-#define PTHREAD_COND_INITIALIZER	{{{0},0}, {0}} /* */
-#endif
-
-#endif  /* SOLARIS_MUTEX_INIT_1_CHECK */
-
-
 #if defined( SOLARIS_MUTEX_INIT_2_CHECK )
 #ident "@(#)pthread.h  1.26  98/04/12 SMI"
 #if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG)
Index: fixincludes/tests/base/math.h
===================================================================
--- fixincludes/tests/base/math.h	(revision 135721)
+++ fixincludes/tests/base/math.h	(working copy)
@@ -118,22 +118,6 @@
 #endif
 #endif  /* STRICT_ANSI_NOT_CTD_CHECK */
 
-
-#if defined( ULTRIX_ATOF_PARAM_CHECK )
-extern double atof(const char *__nptr);
-
-#endif  /* ULTRIX_ATOF_PARAM_CHECK */
-
-
-#if defined( WINDISS_MATH1_CHECK )
-#ifndef __GNUC__
-#endif  /* WINDISS_MATH1_CHECK */
-
-
-#if defined( WINDISS_MATH2_CHECK )
-#endif /* __GNUC__ */
-#endif  /* WINDISS_MATH2_CHECK */
-
 #endif  /* FIXINC_WRAP_MATH_H_EXCEPTION_STRUCTURE */
 #ifdef __cplusplus
 #undef exception
Index: fixincludes/tests/base/strings.h
===================================================================
--- fixincludes/tests/base/strings.h	(revision 135721)
+++ fixincludes/tests/base/strings.h	(working copy)
@@ -7,34 +7,8 @@
     This had to be done to correct non-standard usages in the
     original, manufacturer supplied header file.  */
 
-#ifndef FIXINC_WRAP_STRINGS_H_ULTRIX_STRINGS
-#define FIXINC_WRAP_STRINGS_H_ULTRIX_STRINGS 1
 
 
-
 #if defined( SUNOS_STRLEN_CHECK )
  __SIZE_TYPE__ strlen(); /* string length */
 #endif  /* SUNOS_STRLEN_CHECK */
-
-
-#if defined( ULTRIX_STRINGS_CHECK )
-@(#)strings.h   6.1     (ULTRIX)
-
-#endif  /* ULTRIX_STRINGS_CHECK */
-
-
-#if defined( ULTRIX_STRINGS2_CHECK )
-@(#)strings.h      6.1     (ULTRIX)
-	strncmp( const char *__s1, const char *__s2, size_t __n );
-
-extern int
-	strcasecmp( const char *__s1, const char *__s2),
-	strncasecmp( const char *__s1, const char *__s2, size_t __n );
-	strncmp();
-extern int
-	strcasecmp(),
-	strncasecmp();
-
-#endif  /* ULTRIX_STRINGS2_CHECK */
-
-#endif  /* FIXINC_WRAP_STRINGS_H_ULTRIX_STRINGS */
Index: fixincludes/tests/base/widec.h (deleted)
===================================================================
Index: fixincludes/tests/base/locale.h (deleted)
===================================================================
Index: fixincludes/tests/base/unistd.h
===================================================================
--- fixincludes/tests/base/unistd.h	(revision 135721)
+++ fixincludes/tests/base/unistd.h	(working copy)
@@ -12,22 +12,3 @@
 #if defined( ALPHA_SBRK_CHECK )
 extern void *sbrk(ptrdiff_t increment);
 #endif  /* ALPHA_SBRK_CHECK */
-
-
-#if defined( SOLARIS_UNISTD_CHECK )
-#ident "@(#)unistd.h   1.33    95/08/28 SMI"
-extern int getpagesize();
-extern pid_t getpgid(pid_t);
-extern int getpagesize();
-extern int getpgid();
-#endif  /* SOLARIS_UNISTD_CHECK */
-
-
-#if defined( ULTRIX_UNISTD_CHECK )
-@(#)unistd.h      6.1     (ULTRIX)
-	getgroups(),
-	getpagesize(),
-	fork(),
-	vfork(),
-
-#endif  /* ULTRIX_UNISTD_CHECK */
Index: fixincludes/tests/base/_G_config.h (deleted)
===================================================================
Index: fixincludes/tests/base/testing.h
===================================================================
--- fixincludes/tests/base/testing.h	(revision 135721)
+++ fixincludes/tests/base/testing.h	(working copy)
@@ -74,13 +74,6 @@
 #endif  /* IO_QUOTES_USE_CHECK */
 
 
-#if defined( LIBC1_IFDEFD_MEMX_CHECK )
-/* Copy N bytes of SRC to DEST.  */
-extern __ptr_t memcpy __P ((__ptr_t __dest, __const __ptr_t __src,
-                         size_t __n));
-#endif  /* LIBC1_IFDEFD_MEMX_CHECK */
-
-
 #if defined( MACHINE_ANSI_H_VA_LIST_CHECK )
  # define _BSD_VA_LIST_	__builtin_va_list
 #endif  /* MACHINE_ANSI_H_VA_LIST_CHECK */
@@ -127,8 +120,3 @@
 extern size_t
 	strlen(), strspn();
 #endif  /* SYSV68_STRING_CHECK */
-
-
-#if defined( WINDISS_VALIST_CHECK )
-#include <stdarg.h>
-#endif  /* WINDISS_VALIST_CHECK */
Index: fixincludes/tests/base/machine/cpu.h (deleted)
===================================================================
Index: fixincludes/tests/base/sys/regset.h (deleted)
===================================================================
Index: fixincludes/tests/base/sys/time.h
===================================================================
--- fixincludes/tests/base/sys/time.h	(revision 135721)
+++ fixincludes/tests/base/sys/time.h	(working copy)
@@ -17,30 +17,3 @@
 #if defined( LYNXOS_NO_WARNING_IN_SYS_TIME_H_CHECK )
 
 #endif  /* LYNXOS_NO_WARNING_IN_SYS_TIME_H_CHECK */
-
-
-#if defined( ULTRIX_SYS_TIME_CHECK )
-@(#)time.h      6.1     (ULTRIX)
-extern time_t		time( time_t *__tloc );
-
-extern int adjtime(struct timeval *, struct timeval *);
-extern int getitimer(int, struct itimerval *);
-extern int setitimer(int, struct itimerval *, struct itimerval *);
-extern int gettimeofday(struct timeval *, struct timezone *);
-extern int settimeofday(struct timeval *, struct timezone *);
-extern void profil(const void *, size_t, size_t, unsigned int);
-extern int stime(const time_t *);
-extern int utimes(const char *, const struct timeval[2]);
-extern int select(int, fd_set *, fd_set *, fd_set *, struct timeval *);
-extern double difftime();
-extern	int adjtime();
-extern	int getitimer();
-extern	int setitimer();
-extern	int gettimeofday();
-extern	int settimeofday();
-extern	void profil();
-extern	int stime();
-extern	int utimes();
-extern	int select();
-
-#endif  /* ULTRIX_SYS_TIME_CHECK */
Index: fixincludes/tests/base/sys/limits.h
===================================================================
--- fixincludes/tests/base/sys/limits.h	(revision 135721)
+++ fixincludes/tests/base/sys/limits.h	(working copy)
@@ -9,21 +9,9 @@
 
 
 
-#if defined( NESTED_MOTOROLA_CHECK )
-#undef PIPE_BUF /* max # bytes atomic in write to a */
-		/* PIPE */
-/*#define	HUGE_VAL	3.9e+9 */ /*error value returned by Math lib*/
-#endif  /* NESTED_MOTOROLA_CHECK */
-
-
 #if defined( NESTED_SYS_LIMITS_CHECK )
 /*
 #define CHILD_MAX 20  Max, Max, ... */ /*
 #define OPEN_MAX  20  Max, Max, ... */
 
 #endif  /* NESTED_SYS_LIMITS_CHECK */
-
-
-#if defined( ULTRIX_MATH_IFDEF_CHECK )
-#if     defined(__GFLOAT) 
-#endif  /* ULTRIX_MATH_IFDEF_CHECK */
Index: fixincludes/tests/base/sys/ioctl.h (deleted)
===================================================================
Index: fixincludes/tests/base/sys/stat.h
===================================================================
--- fixincludes/tests/base/sys/stat.h	(revision 135721)
+++ fixincludes/tests/base/sys/stat.h	(working copy)
@@ -33,48 +33,6 @@
 #endif  /* RS6000_FCHMOD_CHECK */
 
 
-#if defined( SCO_STATIC_FUNC_CHECK )
-#ifdef __STDC__
-#if __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-static int	stat(const char *__f, struct stat *__p) {
-	return __stat32(__f, __p);
-}
-#if __cplusplus
- }
-#endif /* __cplusplus */
-
-#  else /* !__STDC__ THIS FAILS ON BSD SYSTEMS */
-#if __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-static int	stat(__f, __p)
-	char *__f;
-	struct stat *__p;
-{
-	return __stat32(__f, __p);
-}
-#if __cplusplus
- }
-#endif /* __cplusplus */
-#endif
-#endif  /* SCO_STATIC_FUNC_CHECK */
-
-
-#if defined( ULTRIX_STAT_CHECK )
-@(#)stat.h      6.1     (ULTRIX)
-#define S_IFPORT S_IFIFO
-
-/* macro to test for symbolic link */
-#define S_ISLNK(mode) (((mode) & S_IFMT) == S_IFLNK)
-
-	fstat(),
-	lstat(),
-/* THE INSERTION LINE FAILS ON BSD SYSTEMS */
-#endif  /* ULTRIX_STAT_CHECK */
-
-
 #if defined( VXWORKS_NEEDS_VXWORKS_CHECK )
 #include </dev/null> /* ULONG */
 # define	__INCstath <sys/stat.h>
Index: fixincludes/tests/base/sys/utsname.h (deleted)
===================================================================
Index: fixincludes/tests/base/sys/file.h
===================================================================
--- fixincludes/tests/base/sys/file.h	(revision 135721)
+++ fixincludes/tests/base/sys/file.h	(working copy)
@@ -12,10 +12,3 @@
 #if defined( HP_SYSFILE_CHECK )
 extern void foo(struct file *, ...); /* HPUX_SOURCE - bad varargs */
 #endif  /* HP_SYSFILE_CHECK */
-
-
-#if defined( ULTRIX_IFDEF_CHECK )
-#if defined(KERNEL) && defined( mumbojumbo )
-int oops;
-#endif
-#endif  /* ULTRIX_IFDEF_CHECK */
Index: fixincludes/tests/base/sys/times.h (deleted)
===================================================================
Index: fixincludes/tests/base/sys/socket.h
===================================================================
--- fixincludes/tests/base/sys/socket.h	(revision 135721)
+++ fixincludes/tests/base/sys/socket.h	(working copy)
@@ -35,10 +35,3 @@
 typedef u_int32_t socklen_t;
 #endif /* _NO_XOPEN4 && _NO_XOPEN5 */
 #endif  /* IRIX_SOCKLEN_T_CHECK */
-
-
-#if defined( SOLARIS_SOCKET_CHECK )
-#ident   "@(#)socket.h   1.30    97/01/20 SMI"
-extern int recv(int, void *, int, int);
-extern int send(int, const void *, int, int);
-#endif  /* SOLARIS_SOCKET_CHECK */
Index: fixincludes/inclhack.def
===================================================================
--- fixincludes/inclhack.def	(revision 135721)
+++ fixincludes/inclhack.def	(working copy)
@@ -376,214 +376,6 @@
 
 
 /*
- *  Completely replace <sys/byteorder.h> with a file that implements gcc's
- *  optimized byteswapping.  (The original probably implemented some
- *  incompatible optimized byteswapping.)
- */
-fix = {
-    hackname = AAB_svr4_replace_byteorder;
-    mach     = "*-*-sysv4*";
-    mach     = "i[34567]86-*-sysv5*";
-    mach     = "i[34567]86-*-sco3.2v5*";
-    mach     = "i[34567]86-*-udk*";
-    mach     = "i[34567]86-*-solaris2.[0-4]";
-    mach     = "powerpcle-*-solaris2.[0-4]";
-    mach     = "sparc-*-solaris2.[0-4]";
-    mach     = "i[34567]86-sequent-ptx*";
-    files    = sys/byteorder.h;
-    replace  = <<-  _EndOfHeader_
-	#ifndef _SYS_BYTEORDER_H
-	#define _SYS_BYTEORDER_H
-
-	/* Functions to convert `short' and `long' quantities from host byte order
-	   to (internet) network byte order (i.e. big-endian).
-
-	   Written by Ron Guilmette (rfg@ncd.com).
-
-	   This isn't actually used by GCC.  It is installed by fixinc.svr4.
-
-	   For big-endian machines these functions are essentially no-ops.
-
-	   For little-endian machines, we define the functions using specialized
-	   asm sequences in cases where doing so yields better code (e.g. i386).  */
-
-	#if !defined (__GNUC__) && !defined (__GNUG__)
-	  #error You lose!  This file is only useful with GNU compilers.
-	#endif
-
-	#ifndef __BYTE_ORDER__
-	  /* Byte order defines.  These are as defined on UnixWare 1.1, but with
-	     double underscores added at the front and back.  */
-	  #define __LITTLE_ENDIAN__   1234
-	  #define __BIG_ENDIAN__      4321
-	  #define __PDP_ENDIAN__      3412
-	#endif
-
-	#ifdef __STDC__
-	  static __inline__ unsigned long htonl (unsigned long);
-	  static __inline__ unsigned short htons (unsigned int);
-	  static __inline__ unsigned long ntohl (unsigned long);
-	  static __inline__ unsigned short ntohs (unsigned int);
-	#endif /* defined (__STDC__) */
-
-	#if defined (__i386__)
-
-	  #ifndef __BYTE_ORDER__
-	    #define __BYTE_ORDER__ __LITTLE_ENDIAN__
-	  #endif
-
-	  /* Convert a host long to a network long.  */
-
-	  /* We must use a new-style function definition, so that this will also
-	     be valid for C++.  */
-	  static __inline__ unsigned long
-	  htonl (unsigned long __arg)
-	  {
-	    register unsigned long __result;
-
-	    __asm__ ("xchg%B0 %b0,%h0
-		  ror%L0 $16,%0
-		  xchg%B0 %b0,%h0" : "=q" (__result) : "0" (__arg));
-	    return __result;
-	  }
-
-	  /* Convert a host short to a network short.  */
-
-	  static __inline__ unsigned short
-	  htons (unsigned int __arg)
-	  {
-	    register unsigned short __result;
-
-	    __asm__ ("xchg%B0 %b0,%h0" : "=q" (__result) : "0" (__arg));
-	    return __result;
-	  }
-
-	#elif (defined (__ns32k__) || defined (__vax__) || defined (__arm__))
-
-	  #ifndef __BYTE_ORDER__
-	    #define __BYTE_ORDER__ __LITTLE_ENDIAN__
-	  #endif
-
-	  /* For other little-endian machines, using C code is just as efficient as
-	     using assembly code.  */
-
-	  /* Convert a host long to a network long.  */
-
-	  static __inline__ unsigned long
-	  htonl (unsigned long __arg)
-	  {
-	    register unsigned long __result;
-
-	    __result = (__arg >> 24) & 0x000000ff;
-	    __result |= (__arg >> 8) & 0x0000ff00;
-	    __result |= (__arg << 8) & 0x00ff0000;
-	    __result |= (__arg << 24) & 0xff000000;
-	    return __result;
-	  }
-
-	  /* Convert a host short to a network short.  */
-
-	  static __inline__ unsigned short
-	  htons (unsigned int __arg)
-	  {
-	    register unsigned short __result;
-
-	    __result = (__arg << 8) & 0xff00;
-	    __result |= (__arg >> 8) & 0x00ff;
-	    return __result;
-	  }
-
-	#else /* must be a big-endian machine */
-
-	  #ifndef __BYTE_ORDER__
-	    #define __BYTE_ORDER__ __BIG_ENDIAN__
-	  #endif
-
-	  /* Convert a host long to a network long.  */
-
-	  static __inline__ unsigned long
-	  htonl (unsigned long __arg)
-	  {
-	    return __arg;
-	  }
-
-	  /* Convert a host short to a network short.  */
-
-	  static __inline__ unsigned short
-	  htons (unsigned int __arg)
-	  {
-	    return __arg;
-	  }
-
-	#endif /* big-endian */
-
-	/* Convert a network long to a host long.  */
-
-	static __inline__ unsigned long
-	ntohl (unsigned long __arg)
-	{
-	  return htonl (__arg);
-	}
-
-	/* Convert a network short to a host short.  */
-
-	static __inline__ unsigned short
-	ntohs (unsigned int __arg)
-	{
-	  return htons (__arg);
-	}
-	#endif
-	_EndOfHeader_;
-};
-
-
-/*
- *  Cancel out ansi_compat.h on Ultrix.  Replace it with an empty file.
- */
-fix = {
-    hackname = AAB_ultrix_ansi_compat;
-    files    = ansi_compat.h;
-    select   = ULTRIX;
-    replace  = "/* This file intentionally left blank.  */\n";
-};
-
-
-/*
- *  The Ultrix 4.3 file limits.h is a symbolic link to sys/limits.h.
- *  Replace limits.h with a file that includes sys/limits.h.
- */
-fix = {
-    hackname = AAB_ultrix_limits;
-    files    = limits.h;
-    mach     = "*-*-ultrix4.3";
-    replace  = <<-  _EndOfHeader_
-	#ifndef _LIMITS_INCLUDED
-	  #define _LIMITS_INCLUDED
-	  #include <sys/limits.h>
-	#endif /* _LIMITS_INCLUDED */
-	_EndOfHeader_;
-};
-
-
-/*
- *  The ULTRIX 4.3 version of memory.h duplicates definitions
- *  present in strings.h.  Replace memory.h with a file that includes
- *  strings.h to prevent problems from multiple inclusion.
- */
-fix = {
-    hackname = AAB_ultrix_memory;
-    files    = memory.h;
-    mach     = "*-*-ultrix4.3";
-    replace  = <<-  _EndOfHeader_
-	#ifndef _MEMORY_INCLUDED
-	  #define _MEMORY_INCLUDED
-	  #include <strings.h>
-	#endif /* _MEMORY_INCLUDED */
-	_EndOfHeader_;
-};
-
-
-/*
  *  The Ultrix 4.3 file string.h is a symbolic link to strings.h.
  *  Replace string.h link with a file that includes strings.h to prevent
  *  problems from multiple inclusion.
@@ -2423,56 +2215,6 @@
 };
 
 
-/*
- *  Fix libc1 _G_va_list definition, used in declarations of several
- *  more-or-less standard functions, for example vasprintf.
- */
-fix = {
-    hackname = libc1_G_va_list;
-    files    = _G_config.h;
-    mach     = '*-*-linux*libc1';
-    select   = 'typedef void \* _G_va_list;';
-    c_fix     = format;
-    c_fix_arg = "typedef __builtin_va_list _G_va_list;";
-    test_text = 'typedef void * _G_va_list;';
-};
-
-
-/*
- *  GNU libc1 string.h does not prototype memcpy and memcmp for gcc
- *  versions > 1.  This fix will open up the declaration for all
- *  versions of GCC and for g++.
- */
-fix = {
-    hackname  = libc1_ifdefd_memx;
-
-    /* The string.h result is overwritten by AAB_ultrix_string when doing
-       "make check" and will fail.  Therefore, we add the following kludgery
-       to insert the test_text into the special testing header.  :-}  */
-    files     = testing.h;
-    files     = string.h;
-
-    c_fix     = format;
-    select    = "' is a built-in function for gcc 2\\.x\\. \\*/";
-    bypass    = __cplusplus;
-    c_fix_arg = "%1";
-    c_fix_arg =
-       '/\* `mem...\' is a built-in function for gcc 2\.x\. \*/' "\n"
-       '#if defined\(__STDC__\) && __GNUC__ < 2'                 "\n"
-       "(/\\* .* \\*/\n"
-       "extern [a-z_]+ mem.*(\n[^#].*)*;)\n"
-       "#endif";
-
-    test_text =
-    "/* \\`memcpy' is a built-in function for gcc 2.x. */\n"
-    "#if defined(__STDC__) && __GNUC__ < 2\n"
-    "/* Copy N bytes of SRC to DEST.  */\n"
-    "extern __ptr_t memcpy __P ((__ptr_t __dest, __const __ptr_t __src,\n"
-    "                         size_t __n));\n"
-    "#endif";
-};
-
-
 /* The /usr/include/sys/ucontext.h on ia64-*linux-gnu systems defines
  * an _SC_GR0_OFFSET macro using an idiom that isn't a compile time
  * constant on recent versions of g++.
@@ -2655,28 +2397,6 @@
 
 
 /*
- * Fix nested comments in Motorola's <limits.h> and <sys/limits.h>
- */
-fix = {
-    hackname = nested_motorola;
-    mach     = "m68k-motorola-sysv*";
-    files    = sys/limits.h;
-    files    = limits.h;
-    select   = "max # bytes atomic in write|error value returned by Math lib";
-
-    sed = "s@^\\(#undef[ \t][ \t]*PIPE_BUF[ \t]*"
-                   "/\\* max # bytes atomic in write to a\\)$@\\1 */@";
-    sed = "s@\\(/\\*#define\tHUGE_VAL\t3.[0-9e+]* \\)"
-          "\\(/\\*error value returned by Math lib\\*/\\)$@\\1*/ \\2@";
-
-    test_text =
-    "#undef PIPE_BUF /* max # bytes atomic in write to a\n"
-    "\t\t/* PIPE */\n"
-    "/*#define\tHUGE_VAL\t3.9e+9 /*error value returned by Math lib*/";
-};
-
-
-/*
  * Fixing nested comments in ISC <sys/limits.h>
  */
 fix = {
@@ -2920,30 +2640,6 @@
 };
 
 /*
- * On DYNIX/ptx, sys/mc_param.h has an embedded asm for the cpuid instruction
- * on the P5. This is not used by anything else so we ifdef it out.
- * Current GCC doesn't seem to complain about the asm, though.
- */
-#ifdef PTX
-fix = {
-    hackname  = ptx_sys_mc_param_h;
-    files     = sys/mc_param.h;
-    sed       = "/__asm/,/}/{"
-                  "/__asm/i\\\n"
-                  "#if !defined (__GNUC__) && !defined (__GNUG__)\n"
-                  "/}/a\\\n"
-                  "#endif\n"
-                "}";
-    test_text = "__asm\n"
-                "int _CPUID()\n"
-                "{\n"
-                "   non-GNU assembly here\n"
-                "}";
-};
-#endif
-
-
-/*
  *  Fix return type of fread and fwrite on sysV68
  */
 fix = {
@@ -3065,89 +2761,6 @@
 
 
 /*
- *  On SCO OpenServer prior to 5.0.7UP1, <sys/regset.h> and <ieeefp.h>
- *  have a clash on struct _fpstate and struct fpstate.
- */
-fix = {
-    hackname = sco_regset;
-    files    = sys/regset.h;
-    mach     = "*-*-sco3.2v5*";
-    select   = "(struct[ \t]+.*)fpstate";
-    c_fix     = format;
-    c_fix_arg = "%1rsfpstate";
-
-    test_text =
-    "union u_fps {\n"
-    "    struct\tfpstate\n"
-    "    {\n"
-    "       int whatever;\n"
-    "    }\n"
-    "};\n"
-    "union _u_fps {\n"
-    "    struct _fpstate\n"
-    "    {\n"
-    "       int whatever;\n"
-    "    }\n"
-    "};\n";
-};
-
-
-/*
- *  The static functions lstat() and fchmod() in <sys/stat.h>
- *  cause G++ grief since they're not wrapped in "if __cplusplus".
- *
- *  On SCO OpenServer 5.0.0 through (at least) 5.0.5 <sys/stat.h> contains
- *  tiny static wrappers that aren't C++ safe.
- */
-fix = {
-    hackname = sco_static_func;
-    files    = sys/stat.h;
-    mach     = "i?86-*-sco3.2*";
-    select   = "^static int";
-
-    sed      = "/^static int/i\\\n"
-               "#if __cplusplus\\\n"
-               "extern \"C\" {\\\n"
-               "#endif /* __cplusplus */";
-
-    sed      = "/^}$/a\\\n"
-               "#if __cplusplus\\\n"
-               " }\\\n"
-               "#endif /* __cplusplus */";
-
-    test_text =
-    "#ifdef __STDC__\n"
-    "static int\tstat(const char *__f, struct stat *__p) {\n"
-    "\treturn __stat32(__f, __p);\n"
-    "}\n\n#  else /* !__STDC__ THIS FAILS ON BSD SYSTEMS */\n"
-
-    "static int\tstat(__f, __p)\n"
-    "\tchar *__f;\n"
-    "\tstruct stat *__p;\n"
-    "{\n"
-    "\treturn __stat32(__f, __p);\n"
-    "}\n"
-    "#endif";
-};
-
-
-/*
- *  Fix prototype declaration of utime in sys/times.h.
- *  In 3.2v4.0 the const is missing.
- */
-fix = {
-    hackname  = sco_utime;
-    files     = sys/times.h;
-    mach      = "i?86-*-sco3.2v4*";
-
-    select    = '\(const char \*, struct utimbuf \*\);';
-    c_fix     = format;
-    c_fix_arg = '(const char *, const struct utimbuf *);';
-
-    test_text = "extern int utime(const char *, struct utimbuf *);";
-};
-
-/*
  * Sun Solaris 10 defines several C99 math macros in terms of
  * builtins specific to the Studio compiler, in particular not
  * compatible with the GNU compiler.
@@ -3289,26 +2902,6 @@
 };
 
 /*
- *  Sun Solaris 2.5.1, 2.6 defines PTHREAD_{MUTEX|COND}_INITIALIZER
- *  incorrectly, so we replace them with versions that correspond to
- *  the definition.  We also explicitly name this fix "1" and the next
- *  fix "2" because this one does not deal with the last field.  This
- *  fix needs to run before the next.
- */
-fix = {
-    hackname = solaris_mutex_init_1;
-    select = '@\(#\)pthread.h' "[ \t]+1.1[0-9][ \t]+9[567]/[0-9/]+ SMI";
-    files = pthread.h;
-    sed   = "/define[ \t]*PTHREAD_MUTEX_INI/s/{0, 0,/{{{0}, 0}, {{{0}}},/\n"
-            "/define[ \t]*PTHREAD_COND_INI/s/{0,/{{{0},0},/";
-    test_text =
-    '#ident "@(#)pthread.h  1.16    97/05/05 SMI"'"\n"
-    "#define PTHREAD_MUTEX_INITIALIZER\t{0, 0, 0}\n"
-    "#define PTHREAD_COND_INITIALIZER\t{0, 0} /* */\n";
-};
-
-
-/*
  * Sun Solaris defines PTHREAD_MUTEX_INITIALIZER with a trailing
  * "0" for the last field of the pthread_mutex_t structure, which is
  * of type upad64_t, which itself is typedef'd to int64_t, but with
@@ -3427,26 +3020,6 @@
 
 
 /*
- * Solaris 2.5.1 and 2.6 use an outdated prototype for send & recv
- * in sys/socket.h.  This is corrected in Solaris 7 and up.
- */
-fix = {
-    hackname = solaris_socket;
-    files = sys/socket.h;
-    select = '@\(#\)socket.h' "[ \t]+1.[123][0-9][ \t]+9[567]/[0-9/]+ SMI";
-    c_fix = format;
-    c_fix_arg = "extern int %1(int, %2void *, int, int);";
-    c_fix_arg = '^extern int (recv|send)\(int,'
-                ' (const )*char '
-                '\*, int, int\);';
-
-    test_text = '#ident   "@(#)socket.h   1.30    97/01/20 SMI"'"\n"
-                "extern int recv(int, char *, int, int);\n"
-                "extern int send(int, const char *, int, int);";
-};
-
-
-/*
  * Solaris 2.8 has what appears to be some gross workaround for 
  * some old version of their c++ compiler.  G++ doesn't want it
  * either, but doesn't want to be tied to SunPRO version numbers.
@@ -3466,43 +3039,6 @@
 
 
 /*
- * Sun Solaris 2.5.1 doesn't define 'getpagesize' in <unistd.h>, as is done
- * on Solaris 2.6 and up.
- */
-fix = {
-    hackname  = solaris_unistd;
-    files = unistd.h;
-    select = '@\(#\)unistd.h' "[ \t]+1.3[0-9][ \t]+9[567]/[0-9/]+ SMI";
-    bypass = "getpagesize";
-    c_fix = format;
-    c_fix_arg = "extern int getpagesize();\n%0";
-    c_fix_arg = '^extern (pid_t|int) getpgid\(.*\);';
-    test_text = '#ident "@(#)unistd.h   1.33    95/08/28 SMI"'"\n"
-                "extern pid_t getpgid(pid_t);\n"
-                "extern int getpgid();";
-};
-
-
-/*
- * <widec.h> until Solaris 2.5.1 defines macros for a couple of <wchar.h>
- * functions, breaking their prototypes if that file is included afterwards.
- * Include <wchar.h> early to avoid this issue, as is done on Solaris 2.6
- * and up.
- */
-fix = {
-    hackname  = solaris_widec;
-    files     = widec.h;
-    mach      = '*-*-solaris2.[0-5]';
-    mach      = '*-*-solaris2.[0-5].*';
-    bypass    = "include.*wchar\\.h";
-    select    = "#include <euc.h>";
-    c_fix     = format;
-    c_fix_arg = "%0\n#include <wchar.h>";
-    test_text = "#include <euc.h>";
-};
-
-
-/*
  *  a missing semi-colon at the end of the statsswtch structure definition.
  */
 fix = {
@@ -4012,46 +3548,6 @@
 
 
 /*
- *  Wrap some files on System V r4 and DYNIX/ptx systems with
- *  #ifdef _KERNEL, presumably to prevent kernel headers from
- *  leaking into userspace.  This may not be necessary at all,
- *  but it was in the old scripts, so it seems safest to keep it for now.
- */
-fix = {
-    /* Can't name this with _kernel, or the test case will hit the bypass! */
-    hackname = svr4_krnl;
-    /* Since I'm rather unsure about the validity of this, limit it
-     * to the specific systems it was operating on before.  It should
-     * also be bypassed for i?86-*-sysv4.3uw2, by that rule, but I didn't
-     * see an easy way to do that.  Hopefully it will be harmless
-     * in any case. -- Nathanael */
-    mach     = '*-*-sysv4*';
-    mach     = 'i?86-sequent-ptx*';
-    files    = fs/rfs/rf_cache.h;
-    files    = sys/erec.h;
-    files    = sys/err.h;
-    files    = sys/char.h;
-    files    = sys/getpages.h;
-    files    = sys/map.h;
-    files    = sys/cmn_err.h;
-    files    = sys/kdebugger.h;
-
-    /* This bypass will match _KERNEL, __KERNEL, __KERNEL__, etc.
-     * It will also match SVR4_KERNEL_CHECK, which means that the
-     * testsuite case will always be bypassed.  Which is fine with me. */
-    bypass   = '_KERNEL';
-
-    c_fix     = wrap;
-    c_fix_arg = "#ifdef _KERNEL\n";
-    c_fix_arg = "#endif /* _KERNEL */\n";
-
-    /* There's no reasonable test for this given that we don't know exactly
-     * what problem inspired it in the first place. */
-    test_text = "";
-};
-
-
-/*
  *  Delete any #defines of `__i386' which may be present in <ieeefp.h>.  They
  *  tend to conflict with the compiler's own definition of this symbol.  (We
  *  will use the compiler's definition.)
@@ -4402,36 +3898,6 @@
 
 
 /*
- *  function parameter to atexit is missing "void" on VAX Ultrix 4.3.
- */
-fix = {
-    hackname = ultrix_atexit_param;
-    files    = stdlib.h;
-    select   = 'atexit\(.*\(\)';
-
-    c_fix     = format;
-    c_fix_arg = "atexit( void (*__func)( void )";
-
-    test_text = "int atexit( void (*__func)() );\n";
-};
-
-
-/*
- *  parameter to atof not const on DECstation Ultrix V4.0 and NEWS-OS 4.2R.
- */
-fix = {
-    hackname = ultrix_atof_param;
-    files    = math.h;
-    select   = "atof\\([ \t]*char";
-
-    c_fix     = format;
-    c_fix_arg = "atof(const char";
-
-    test_text = "extern double atof( char *__nptr);\n";
-};
-
-
-/*
  *  parameters not const on DECstation Ultrix V4.0 and OSF/1.
  */
 fix = {
@@ -4476,322 +3942,6 @@
 
 
 /*
- *  parameters not const on Ultrix V4.3.
- */
-fix = {
-    hackname  = ultrix_const3;
-    files     = stdio.h;
-    select    = 'fdopen\( .*, char \*';
-
-    c_fix     = format;
-    c_fix_arg = "%1 const %3 *__";
-    c_fix_arg = "([ \t*](fdopen)\\(.*)"
-                "[ \t]+(char|void) \\*__";
-
-    test_text =
-    "extern FILE *	fdopen( int __filedes, char *__type );\n";
-};
-
-
-/*
- * Ultrix V4.[35] puts the declaration of uname before the definition
- * of struct utsname, so the prototype (added by fixproto) causes havoc.
- */
-fix = {
-    hackname = ultrix_fix_fixproto;
-    files    = sys/utsname.h;
-    select   = ULTRIX;
-
-    c_fix     = format;
-    c_fix_arg = "struct utsname;\n%0";
-    c_fix_arg = "^[ \t]*extern[ \t]*int[ \t]*uname\\(\\);";
-
-    test_text =
-    "/* ULTRIX's uname */\nextern\tint\tuname();";
-};
-
-
-/*
- *  Check for bad #ifdef line (in Ultrix 4.1)
- */
-fix = {
-    hackname = ultrix_ifdef;
-    select   = "^#ifdef KERNEL[ \t]+&&";
-    files    = sys/file.h;
-
-    c_fix     = format;
-    c_fix_arg = "#if defined(KERNEL) &&";
-
-    test_text =
-    "#ifdef KERNEL\t&& defined( mumbojumbo )\nint oops;\n#endif";
-};
-
-
-/*
- *  Add once-only latch to Ultrix V4.3 locale.h.
- */
-fix = {
-    hackname = ultrix_locale;
-    files  = locale.h;
-    select = "@\\(#\\)locale\\.h.*6\\.1.*\\(ULTRIX\\)";
-    c_fix  = wrap;
-    test_text =
-    "@(#)locale.h   6.1     (ULTRIX)\n";
-};
-
-
-/*
- * Strip "|| CC$gfloat" from Ultrix math headers.
- */
-fix = {
-    hackname  = ultrix_math_ifdef;
-    files     = sys/limits.h;
-    files     = float.h;
-    files     = math.h;
-    select    = "^(#if.*)\\|\\|[ \t]+CC\\$[a-z]+";
-    c_fix     = format;
-    c_fix_arg = "%1";
-
-    test_text = '#if     defined(__GFLOAT) || CC\$gfloat';
-};
-
-
-/*
- *  Avoid nested comments on Ultrix 4.3.
- */
-fix = {
-    hackname = ultrix_nested_ioctl;
-    files    = sys/ioctl.h;
-    select   = "^/\\* #define SIOCSCREEN";
-    sed      = "/^\\/\\* #define SIOCSCREEN/s@/\\* screend@*//* screend@";
-    test_text =
-    "/* #define SIOCSCREENON _IOWR('i', 49, int)"
-    "/* screend, net/gw_screen.h */\n";
-};
-
-
-fix = {
-    hackname = ultrix_nested_svc;
-    files    = rpc/svc.h;
-    select   = "^ \\*[ \t]*int protocol;  */\\*";
-    sed      = "s@^\\( \\*\tint protocol;  \\)/\\*@\\1*/ /*@";
-    test_text =
-    " *\tint protocol;  /* like TCP or UDP\n";
-};
-
-
-/*
- *  Add missing prototype for lstat and define for S_ISLNK
- *  in Ultrix V4.3 sys/stat.h.
- */
-fix = {
-    hackname = ultrix_stat;
-    files  = sys/stat.h;
-    select = "@\\(#\\)stat\\.h.*6\\.1.*\\(ULTRIX\\)";
-    sed    = "/^#define[ \t]S_IFPORT[ \t]*S_IFIFO$/a\\\n"
-		"\\\n"
-		"/* macro to test for symbolic link */\\\n"
-		"#define S_ISLNK(mode) (((mode) & S_IFMT) == S_IFLNK)\\\n"
-		"\n";
-    sed    = "/^[ \t]*fstat(),$/a\\\n"
-		"\tlstat(),\n";
-    test_text =
-    "@(#)stat.h      6.1     (ULTRIX)\n"
-    "#define S_IFPORT S_IFIFO\n"
-    "\tfstat(),\n/* THE INSERTION LINE FAILS ON BSD SYSTEMS */";
-};
-
-
-/*
- *  Check for superfluous `static' (in Ultrix 4.2)
- *  On Ultrix 4.3, includes of other files (r3_cpu.h,r4_cpu.h) is broken.
- */
-fix = {
-    hackname = ultrix_static;
-    files  = machine/cpu.h;
-    select = '#include "r[34]_cpu';
-    sed    = "s/^static struct tlb_pid_state/struct tlb_pid_state/";
-    sed    = 's/^#include "r3_cpu\.h"$/#include <machine\/r3_cpu\.h>/';
-    sed    = 's/^#include "r4_cpu\.h"$/#include <machine\/r4_cpu\.h>/';
-    test_text =
-    "static struct tlb_pid_state {\n"
-    "#include \"r3_cpu.h\"\n";
-};
-
-
-/*
- *  Add missing declarations to Ultrix V4.3 stdlib.h.
- */
-fix = {
-    hackname = ultrix_stdlib;
-    files  = stdlib.h;
-    select = "@\\(#\\)stdlib\\.h.*6\\.1.*\\(ULTRIX\\)";
-
-    sed    = "/^char.*getenv( const char .* );.*$/a\\\n"
-    "int\t\tsetenv( const char *__name, const char *__val, int __ovrwrt );\\\n"
-    "void\t\tunsetenv( const char *__name );\\\n"
-    "int\t\tputenv( char *__s );\n";
-
-    sed    = "/^char.*getenv();.*$/a\\\n"
-    "int\tsetenv();\\\n"
-    "void\tunsetenv();\\\n"
-    "int\tputenv();\n";
-
-    test_text =
-    "@(#)stdlib.h      6.1     (ULTRIX)\n"
-    "char *		getenv( const char *__name );\n"
-    "char	*getenv();\n";
-};
-
-
-/*
- *  Add once-only latch to Ultrix V4.3 strings.h.
- */
-fix = {
-    hackname = ultrix_strings;
-    files  = strings.h;
-    select = "@\\(#\\)strings\\.h.*6\\.1.*\\(ULTRIX\\)";
-    c_fix  = wrap;
-    test_text =
-    "@(#)strings.h   6.1     (ULTRIX)\n";
-};
-
-
-/*
- *  Add missing declarations to Ultrix V4.3 strings.h.
- */
-fix = {
-    hackname = ultrix_strings2;
-    files  = strings.h;
-    select = "@\\(#\\)strings\\.h.*6\\.1.*\\(ULTRIX\\)";
-
-    sed    = "/^.*strncmp( const .* );.*/a\\\n"
-    "\\\n"
-    "extern int\\\n"
-    "\tstrcasecmp( const char *__s1, const char *__s2),\\\n"
-    "\tstrncasecmp( const char *__s1, const char *__s2, size_t __n );\n";
-
-    sed    = "/^.*strncmp();.*/a\\\n"
-    "extern int\\\n"
-    "\tstrcasecmp(),\\\n"
-    "\tstrncasecmp();\n";
-
-    test_text =
-    "@(#)strings.h      6.1     (ULTRIX)\n"
-    "\tstrncmp( const char *__s1, const char *__s2, size_t __n );\n"
-    "\tstrncmp();\n";
-};
-
-
-/*
- *  Add missing declarations to Ultrix V4.3 sys/time.h.
- */
-fix = {
-    hackname = ultrix_sys_time;
-    files  = sys/time.h;
-    select = "@\\(#\\)time\\.h.*6\\.1.*\\(ULTRIX\\)";
-
-    sed    = "/^extern.*time_t.*time( time_t .* );.*$/a\\\n"
-    "\\\n"
-    "extern int adjtime(struct timeval *, struct timeval *);\\\n"
-    "extern int getitimer(int, struct itimerval *);\\\n"
-    "extern int setitimer(int, struct itimerval *, struct itimerval *);\\\n"
-    "extern int gettimeofday(struct timeval *, struct timezone *);\\\n"
-    "extern int settimeofday(struct timeval *, struct timezone *);\\\n"
-    "extern void profil(const void *, size_t, size_t, unsigned int);\\\n"
-    "extern int stime(const time_t *);\\\n"
-    "extern int utimes(const char *, const struct timeval[2]);\\\n"
-    "extern int select(int, fd_set *, fd_set *, fd_set *, struct timeval *);\n";
-
-    sed    = "/^extern.*double.*difftime();.*$/a\\\n"
-    "extern\tint adjtime();\\\n"
-    "extern\tint getitimer();\\\n"
-    "extern\tint setitimer();\\\n"
-    "extern\tint gettimeofday();\\\n"
-    "extern\tint settimeofday();\\\n"
-    "extern\tvoid profil();\\\n"
-    "extern\tint stime();\\\n"
-    "extern\tint utimes();\\\n"
-    "extern\tint select();\n";
-
-    test_text =
-    "@(#)time.h      6.1     (ULTRIX)\n"
-    "extern time_t		time( time_t *__tloc );\n"
-    "extern double difftime();\n";
-};
-
-
-/*
- *  Add missing declarations to Ultrix V4.3 unistd.h.
- */
-fix = {
-    hackname = ultrix_unistd;
-    files  = unistd.h;
-    select = "@\\(#\\)unistd\\.h.*6\\.1.*\\(ULTRIX\\)";
-
-    sed    = "/^[ \t]*getgroups(),.*$/a\\\n"
-    "\tgetpagesize(),\n";
-
-    sed    = "/^[ \t]*fork(),.*$/a\\\n"
-    "\tvfork(),\n";
-
-    test_text =
-    "@(#)unistd.h      6.1     (ULTRIX)\n"
-    "\tgetgroups(),\n"
-    "\tfork(),\n";
-};
-
-
-/*
- * On Cray Unicos/Mk some standard headers use the C99 keyword "restrict"
- * which must be replaced by __restrict__ for GCC.
- */
-fix = {
-    hackname = unicosmk_restrict;
-    files    = stdio.h;
-    files    = stdlib.h;
-    files    = wchar.h;
-    mach     = "*-*-unicosmk*";
-    select   = "(\\*[ \t]*)restrict([ \t]+)";
-
-    c_fix     = format;
-    c_fix_arg = "%1__restrict__%2";
-
-    test_text = "void f (char * restrict x);";
-};
-
-/*
- * If arpa/inet.h prototypes are incompatible with the ones we just
- * installed in <sys/byteorder.h>, just remove the protos.
- * Because of this close association, this patch must be applied only
- * on those systems where the replacement byteorder header is installed.
- */
-fix = {
-    hackname = uw7_byteorder_fix;
-    files    = arpa/inet.h;
-    select   = "in_port_t";
-    test     = "-f sys/byteorder.h";
-#ifndef SVR5
-	mach = "*-*-sysv4*";
-	mach = "i?86-*-sysv5*";
-	mach = "i?86-*-udk*";
-	mach = "i?86-*-solaris2.[0-4]";
-	mach = "powerpcle-*-solaris2.[0-4]";
-	mach = "sparc-*-solaris2.[0-4]";
-#endif /* SVR5 */
-
-    c_fix     = format;
-    c_fix_arg = "";
-    c_fix_arg = "^extern.*[ \t](htons|ntohs).*\\(in_port_t\\).*;";
-
-    test_text = "extern in_port_t\thtons __P((in_port_t));\n"
-                "extern in_port_t\tntohs __P((in_port_t));"
-                "`[ ! -d $DESTDIR/sys ] && mkdir $DESTDIR/sys\n"
-                "echo '/* DUMMY */' >> sys/byteorder.h`";
-};
-
-
-/*
  *  Fix definitions of macros used by va-i960.h in VxWorks header file.
  */
 fix = {
@@ -4937,42 +4087,7 @@
 };
 
 
-/* 
- * WindISS math.h headers include bogus extern declarations of 
- * numerous math functions that conflict with libstdc++-v3.
- */
-fix = {
-    hackname  = windiss_math1;
-    files     = math.h;
-    mach      = "*-*-windiss";
-    sed       = "s|inline long double cosl.*|#ifndef __GNUC__|";
-
-    test_text = "inline long double cosl(long double);";
-};
-
-fix = {
-    hackname  = windiss_math2;
-    files     = math.h;
-    mach      = "*-*-windiss";
-    sed       = "s|/\\* long double declarations \\*/|"
-                  "#endif /* __GNUC__ */|";
-
-    test_text = "/* long double declarations */";
-};
-
 /*
- * WindISS headers include "diab/va_list.h" instead of "stdarg.h"
- */
-fix = {
-    select    = '(#include.*)diab/va_list.h';
-    hackname  = windiss_valist;
-    sed       = "s|diab/va_list.h|stdarg.h|";
-    mach      = "*-*-windiss";
-
-    test_text = "#include <diab/va_list.h>";
-};
-
-/*
  *  There are several name conflicts with C++ reserved words in X11 header
  *  files.  These are fixed in some versions, so don't do the fixes if
  *  we find __cplusplus in the file.  These were found on the RS/6000.

-- 
Joseph S. Myers
joseph@codesourcery.com


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]