obsolete target tidy

Delete a few files only used for obsolete targets, and tidy config,
xfails and other pieces of support specific to those targets.  And
since I was editing target triplets in test files, fix the nm
alpha-linuxecoff fails.

17 files changed, 11 insertions, 939 deletions

diff --git a/bfd/Makefile.am b/bfd/Makefile.am
index e1692e7..75d21db 100644
--- a/bfd/Makefile.am
+++ b/bfd/Makefile.am
@@ -633,7 +633,6 @@ BFD64_BACKENDS_CFILES = \
 	vms-alpha.c
 
 OPTIONAL_BACKENDS = \
-	aix386-core.lo \
 	cisco-core.lo \
 	hpux-core.lo \
 	irix-core.lo \
@@ -641,11 +640,9 @@ OPTIONAL_BACKENDS = \
 	netbsd-core.lo \
 	osf-core.lo \
 	rs6000-core.lo \
-	sco5-core.lo \
 	trad-core.lo
 
 OPTIONAL_BACKENDS_CFILES = \
-	aix386-core.c \
 	cisco-core.c \
 	hpux-core.c \
 	irix-core.c \
@@ -653,7 +650,6 @@ OPTIONAL_BACKENDS_CFILES = \
 	netbsd-core.c \
 	osf-core.c \
 	rs6000-core.c \
-	sco5-core.c \
 	trad-core.c
 
 # Reconfigure if config.bfd or configure.host changes.
diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index 80aed65..0b0bb1a 100644
--- a/bfd/Makefile.in
+++ b/bfd/Makefile.in
@@ -1103,7 +1103,6 @@ BFD64_BACKENDS_CFILES = \
 	vms-alpha.c
 
 OPTIONAL_BACKENDS = \
-	aix386-core.lo \
 	cisco-core.lo \
 	hpux-core.lo \
 	irix-core.lo \
@@ -1111,11 +1110,9 @@ OPTIONAL_BACKENDS = \
 	netbsd-core.lo \
 	osf-core.lo \
 	rs6000-core.lo \
-	sco5-core.lo \
 	trad-core.lo
 
 OPTIONAL_BACKENDS_CFILES = \
-	aix386-core.c \
 	cisco-core.c \
 	hpux-core.c \
 	irix-core.c \
@@ -1123,7 +1120,6 @@ OPTIONAL_BACKENDS_CFILES = \
 	netbsd-core.c \
 	osf-core.c \
 	rs6000-core.c \
-	sco5-core.c \
 	trad-core.c
 
 
@@ -1305,7 +1301,7 @@ SRCPROT = $(srcdir)/archive.c $(srcdir)/archures.c \
 SRCIPROT = $(srcdir)/cache.c $(srcdir)/libbfd.c \
 	$(srcdir)/bfdio.c $(srcdir)/bfdwin.c \
 	$(srcdir)/reloc.c $(srcdir)/cpu-h8300.c \
-	$(srcdir)/cpu-i960.c $(srcdir)/archures.c \
+	$(srcdir)/archures.c \
 	$(srcdir)/init.c
 
 TEXIDIR = $(srcdir)/../texinfo/fsf
@@ -1451,7 +1447,6 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aix386-core.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aix5ppc-core.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aout-cris.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aout-ns32k.Plo@am__quote@
@@ -1733,7 +1728,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reloc.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reloc16.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rs6000-core.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sco5-core.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/section.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simple.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/som.Plo@am__quote@
diff --git a/bfd/aix386-core.c b/bfd/aix386-core.c
deleted file mode 100644
index 977a6bd..0000000
--- a/bfd/aix386-core.c
+++ /dev/null
@@ -1,282 +0,0 @@
-/* BFD back-end for AIX on PS/2 core files.
-   This was based on trad-core.c, which was written by John Gilmore of
-	Cygnus Support.
-   Copyright (C) 1988-2022 Free Software Foundation, Inc.
-   Written by Minh Tran-Le <TRANLE@INTELLICORP.COM>.
-   Converted to back end form by Ian Lance Taylor <ian@cygnus.com>.
-
-   This file is part of BFD, the Binary File Descriptor library.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
-   MA 02110-1301, USA.  */
-
-#include "sysdep.h"
-#include "bfd.h"
-#include "libbfd.h"
-#include "coff/i386.h"
-#include "coff/internal.h"
-#include "libcoff.h"
-
-#include <signal.h>
-
-#if defined (_AIX) && defined (_I386)
-#define NOCHECKS		/* This is for coredump.h.  */
-#define _h_USER			/* Avoid including user.h from coredump.h.  */
-#include <uinfo.h>
-#include <sys/i386/coredump.h>
-#endif /* _AIX && _I386 */
-
-/* Maybe this could work on some other i386 but I have not tried it
- * mtranle@paris - Tue Sep 24 12:49:35 1991
- */
-
-#ifndef COR_MAGIC
-# define COR_MAGIC "core"
-#endif
-
-/* Need this cast because ptr is really void *.  */
-#define core_hdr(bfd) \
-    (((bfd->tdata.trad_core_data))->hdr)
-#define core_section(bfd,n) \
-    (((bfd)->tdata.trad_core_data)->sections[n])
-#define core_regsec(bfd) \
-    (((bfd)->tdata.trad_core_data)->reg_section)
-#define core_reg2sec(bfd) \
-    (((bfd)->tdata.trad_core_data)->reg2_section)
-
-/* These are stored in the bfd's tdata.  */
-struct trad_core_struct
-{
-  struct corehdr *hdr;		/* core file header */
-  asection *reg_section;
-  asection *reg2_section;
-  asection *sections[MAX_CORE_SEGS];
-};
-
-static bfd_cleanup
-aix386_core_file_p (bfd *abfd)
-{
-  int i, n;
-  unsigned char longbuf[4];	/* Raw bytes of various header fields */
-  bfd_size_type core_size = sizeof (struct corehdr);
-  size_t amt;
-  struct corehdr *core;
-  struct mergem
-  {
-    struct trad_core_struct coredata;
-    struct corehdr internal_core;
-  } *mergem;
-  flagword flags;
-
-  amt = sizeof (longbuf);
-  if (bfd_bread (longbuf, amt, abfd) != amt)
-    {
-      if (bfd_get_error () != bfd_error_system_call)
-	bfd_set_error (bfd_error_wrong_format);
-      return 0;
-    }
-
-  if (strncmp (longbuf, COR_MAGIC, 4))
-    return 0;
-
-  if (bfd_seek (abfd, (file_ptr) 0, 0) != 0)
-    return 0;
-
-  amt = sizeof (struct mergem);
-  mergem = (struct mergem *) bfd_zalloc (abfd, amt);
-  if (mergem == NULL)
-    return 0;
-
-  core = &mergem->internal_core;
-
-  if ((bfd_bread (core, core_size, abfd)) != core_size)
-    {
-      if (bfd_get_error () != bfd_error_system_call)
-	bfd_set_error (bfd_error_wrong_format);
-    loser:
-      bfd_release (abfd, (char *) mergem);
-      abfd->tdata.any = NULL;
-      bfd_section_list_clear (abfd);
-      return 0;
-    }
-
-  set_tdata (abfd, &mergem->coredata);
-  core_hdr (abfd) = core;
-
-  /* Create the sections.  */
-  flags = SEC_HAS_CONTENTS;
-  core_regsec (abfd) = bfd_make_section_anyway_with_flags (abfd, ".reg",
-							   flags);
-  if (core_regsec (abfd) == NULL)
-    goto loser;
-
-  core_regsec (abfd)->size = sizeof (core->cd_regs);
-  core_regsec (abfd)->vma = (bfd_vma) -1;
-
-  /* We'll access the regs afresh in the core file, like any section.  */
-  core_regsec (abfd)->filepos =
-    (file_ptr) offsetof (struct corehdr, cd_regs[0]);
-
-  flags = SEC_HAS_CONTENTS;
-  core_reg2sec (abfd) = bfd_make_section_anyway_with_flags (abfd, ".reg2",
-							    flags);
-  if (core_reg2sec (abfd) == NULL)
-    /* bfd_release frees everything allocated after it's arg.  */
-    goto loser;
-
-  core_reg2sec (abfd)->size = sizeof (core->cd_fpregs);
-  core_reg2sec (abfd)->vma = (bfd_vma) -1;
-  core_reg2sec (abfd)->filepos =
-    (file_ptr) offsetof (struct corehdr, cd_fpregs);
-
-  for (i = 0, n = 0; (i < MAX_CORE_SEGS) && (core->cd_segs[i].cs_type); i++)
-    {
-      const char *sname;
-      flagword flags;
-
-      if (core->cd_segs[i].cs_offset == 0)
-	continue;
-
-      switch (core->cd_segs[i].cs_type)
-	{
-	case COR_TYPE_DATA:
-	  sname = ".data";
-	  flags = SEC_ALLOC + SEC_LOAD + SEC_HAS_CONTENTS;
-	  break;
-	case COR_TYPE_STACK:
-	  sname = ".stack";
-	  flags = SEC_ALLOC + SEC_LOAD + SEC_HAS_CONTENTS;
-	  break;
-	case COR_TYPE_LIBDATA:
-	  sname = ".libdata";
-	  flags = SEC_ALLOC + SEC_HAS_CONTENTS;
-	  break;
-	case COR_TYPE_WRITE:
-	  sname = ".writeable";
-	  flags = SEC_ALLOC + SEC_HAS_CONTENTS;
-	  break;
-	case COR_TYPE_MSC:
-	  sname = ".misc";
-	  flags = SEC_ALLOC + SEC_HAS_CONTENTS;
-	  break;
-	default:
-	  sname = ".unknown";
-	  flags = SEC_ALLOC + SEC_HAS_CONTENTS;
-	  break;
-	}
-      core_section (abfd, n) = bfd_make_section_anyway_with_flags (abfd,
-								   sname,
-								   flags);
-      if (core_section (abfd, n) == NULL)
-	goto loser;
-
-      core_section (abfd, n)->size = core->cd_segs[i].cs_len;
-      core_section (abfd, n)->vma       = core->cd_segs[i].cs_address;
-      core_section (abfd, n)->filepos   = core->cd_segs[i].cs_offset;
-      core_section (abfd, n)->alignment_power = 2;
-      n++;
-    }
-
-  return _bfd_no_cleanup;
-}
-
-static char *
-aix386_core_file_failing_command (bfd *abfd)
-{
-  return core_hdr (abfd)->cd_comm;
-}
-
-static int
-aix386_core_file_failing_signal (bfd *abfd)
-{
-  return core_hdr (abfd)->cd_cursig;
-}
-
-#define aix386_core_file_matches_executable_p generic_core_file_matches_executable_p
-
-#define aix386_core_file_pid _bfd_nocore_core_file_pid
-
-/* If somebody calls any byte-swapping routines, shoot them.  */
-
-static void
-swap_abort (void)
-{
-  /* This way doesn't require any declaration for ANSI to fuck up.  */
-  abort ();
-}
-
-#define	NO_GET ((bfd_vma (*) (const void *)) swap_abort)
-#define	NO_PUT ((void (*) (bfd_vma, void *)) swap_abort)
-#define	NO_GETS ((bfd_signed_vma (*) (const void *)) swap_abort)
-#define	NO_GET64 ((uint64_t (*) (const void *)) swap_abort)
-#define	NO_PUT64 ((void (*) (uint64_t, void *)) swap_abort)
-#define	NO_GETS64 ((int64_t (*) (const void *)) swap_abort)
-
-const bfd_target core_aix386_vec =
-{
-  "aix386-core",
-  bfd_target_unknown_flavour,
-  BFD_ENDIAN_BIG,		/* target byte order */
-  BFD_ENDIAN_BIG,		/* target headers byte order */
-  (HAS_RELOC | EXEC_P |		/* object flags */
-   HAS_LINENO | HAS_DEBUG |
-   HAS_SYMS | HAS_LOCALS | WP_TEXT),
-
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
-  0,				/* leading underscore */
-  ' ',				/* ar_pad_char */
-  16,				/* ar_max_namelen */
-  0,				/* match priority.  */
-  TARGET_KEEP_UNUSED_SECTION_SYMBOLS, /* keep unused section symbols.  */
-  NO_GET64, NO_GETS64, NO_PUT64,
-  NO_GET, NO_GETS, NO_PUT,
-  NO_GET, NO_GETS, NO_PUT,	/* data */
-  NO_GET64, NO_GETS64, NO_PUT64,
-  NO_GET, NO_GETS, NO_PUT,
-  NO_GET, NO_GETS, NO_PUT,	/* hdrs */
-
-  {				/* bfd_check_format */
-    _bfd_dummy_target,
-    _bfd_dummy_target,
-    _bfd_dummy_target,
-    aix386_core_file_p
-  },
-  {				/* bfd_create_object */
-    _bfd_bool_bfd_false_error,
-    _bfd_bool_bfd_false_error,
-    _bfd_bool_bfd_false_error,
-    _bfd_bool_bfd_false_error
-  },
-  {				/* bfd_write_contents */
-    _bfd_bool_bfd_false_error,
-    _bfd_bool_bfd_false_error,
-    _bfd_bool_bfd_false_error,
-    _bfd_bool_bfd_false_error
-  },
-
-  BFD_JUMP_TABLE_GENERIC (_bfd_generic),
-  BFD_JUMP_TABLE_COPY (_bfd_generic),
-  BFD_JUMP_TABLE_CORE (aix386),
-  BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
-  BFD_JUMP_TABLE_SYMBOLS (_bfd_nosymbols),
-  BFD_JUMP_TABLE_RELOCS (_bfd_norelocs),
-  BFD_JUMP_TABLE_WRITE (_bfd_generic),
-  BFD_JUMP_TABLE_LINK (_bfd_nolink),
-  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-  NULL,
-
-  NULL
-};
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index eddfb31..aeb8d5d 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -6790,8 +6790,6 @@ struct bfd
       struct tekhex_data_struct *tekhex_data;
       struct elf_obj_tdata *elf_obj_data;
       struct mmo_data_struct *mmo_data;
-      struct sun_core_struct *sun_core_data;
-      struct sco5_core_struct *sco5_core_data;
       struct trad_core_struct *trad_core_data;
       struct som_data_struct *som_data;
       struct hpux_core_struct *hpux_core_data;
@@ -6800,7 +6798,6 @@ struct bfd
       struct lynx_core_struct *lynx_core_data;
       struct osf_core_struct *osf_core_data;
       struct cisco_core_struct *cisco_core_data;
-      struct versados_data_struct *versados_data;
       struct netbsd_core_struct *netbsd_core_data;
       struct mach_o_data_struct *mach_o_data;
       struct mach_o_fat_data_struct *mach_o_fat_data;
@@ -7328,10 +7325,7 @@ enum bfd_flavour
   bfd_target_verilog_flavour,
   bfd_target_ihex_flavour,
   bfd_target_som_flavour,
-  bfd_target_os9k_flavour,
-  bfd_target_versados_flavour,
   bfd_target_msdos_flavour,
-  bfd_target_ovax_flavour,
   bfd_target_evax_flavour,
   bfd_target_mmo_flavour,
   bfd_target_mach_o_flavour,
diff --git a/bfd/bfd.c b/bfd/bfd.c
index 0f07bef..9cbb674 100644
--- a/bfd/bfd.c
+++ b/bfd/bfd.c
@@ -346,8 +346,6 @@ CODE_FRAGMENT
 .      struct tekhex_data_struct *tekhex_data;
 .      struct elf_obj_tdata *elf_obj_data;
 .      struct mmo_data_struct *mmo_data;
-.      struct sun_core_struct *sun_core_data;
-.      struct sco5_core_struct *sco5_core_data;
 .      struct trad_core_struct *trad_core_data;
 .      struct som_data_struct *som_data;
 .      struct hpux_core_struct *hpux_core_data;
@@ -356,7 +354,6 @@ CODE_FRAGMENT
 .      struct lynx_core_struct *lynx_core_data;
 .      struct osf_core_struct *osf_core_data;
 .      struct cisco_core_struct *cisco_core_data;
-.      struct versados_data_struct *versados_data;
 .      struct netbsd_core_struct *netbsd_core_data;
 .      struct mach_o_data_struct *mach_o_data;
 .      struct mach_o_fat_data_struct *mach_o_fat_data;
diff --git a/bfd/config.bfd b/bfd/config.bfd
index 1b0111f..3672b6a 100644
--- a/bfd/config.bfd
+++ b/bfd/config.bfd
@@ -135,9 +135,7 @@ case $targ in
  m68*-*-vxworks* | \
  m68*-apollo-* | \
  m68*-apple-aux* | \
- m68*-bull-sysv* | \
  m68*-ericsson-* | \
- m68*-motorola-sysv* | \
  m68*-netx-* | \
  m88*-*-* | \
  maxq-*-coff | \
@@ -1181,16 +1179,11 @@ case "${targ}" in
   powerpc-*-macos*)
     targ_defvec=powerpc_xcoff_vec
     ;;
-  powerpc-*-lynxos*)
-    targ_defvec=powerpc_elf32_vec
-    targ_selvecs="rs6000_xcoff_vec"
-    targ_cflags=-DSMALL_ARCHIVE
-    ;;
   powerpc-*-nto*)
     targ_defvec=powerpc_elf32_vec
     targ_selvecs="rs6000_xcoff_vec powerpc_elf32_le_vec powerpc_boot_vec"
     ;;
-  powerpc-*-vxworks* | powerpc-*-windiss*)
+  powerpc-*-vxworks*)
     targ_defvec=powerpc_elf32_vxworks_vec
     targ_selvecs="rs6000_xcoff_vec powerpc_elf32_vec powerpc_elf32_le_vec powerpc_boot_vec"
     targ64_selvecs="powerpc_elf64_vec powerpc_elf64_le_vec"
diff --git a/bfd/configure b/bfd/configure
index f997a25..5af8af2 100755
--- a/bfd/configure
+++ b/bfd/configure
@@ -14035,7 +14035,6 @@ if test "${target}" = "${host}"; then
   arm*-*-netbsd* | arm-*-openbsd*)
 	COREFILE=netbsd-core.lo
 	;;
-  arm-*-riscix)		COREFILE=trad-core.lo ;;
   hppa*-*-hpux*)	COREFILE=hpux-core.lo ;;
   hppa*-*-hiux*)	COREFILE=hpux-core.lo ;;
   hppa*-*-mpeix*)	COREFILE=hpux-core.lo ;;
@@ -14045,19 +14044,10 @@ if test "${target}" = "${host}"; then
 	COREFILE=netbsd-core.lo
 	;;
 
-  i[3-7]86-sequent-bsd*)
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/symmetry.h"'
-	;;
-  i[3-7]86-sequent-sysv4*) ;;
-  i[3-7]86-sequent-sysv*)
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/symmetry.h"'
-	;;
   i[3-7]86-*-bsdi)
 	COREFILE=
 	;;
-  i[3-7]86-*-bsd* | i[3-7]86-*-freebsd[123] | i[3-7]86-*-freebsd[123]\.* | i[3-7]86-*-freebsd4\.[01234] | i[3-7]86-*-freebsd4\.[01234]\.* | i[3-7]86-*-freebsd*aout*)
+  i[3-7]86-*-bsd* | i[3-7]86-*-freebsd[123] | i[3-7]86-*-freebsd[123]\.* | i[3-7]86-*-freebsd4\.[01234] | i[3-7]86-*-freebsd4\.[01234]\.*)
 	COREFILE=trad-core.lo
 	TRAD_HEADER='"hosts/i386bsd.h"'
 	;;
@@ -14072,13 +14062,6 @@ if test "${target}" = "${host}"; then
 	COREFILE=trad-core.lo
 	TRAD_HEADER='"hosts/esix.h"'
 	;;
-  i[3-7]86-*-sco3.2v5*)
-	COREFILE=sco5-core.lo
-	;;
-  i[3-7]86-*-sco* | i[3-7]86-*-isc*)
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/i386sco.h"'
-	;;
   i[3-7]86-*-mach3*)
 	COREFILE=trad-core.lo
 	TRAD_HEADER='"hosts/i386mach3.h"'
@@ -14091,14 +14074,12 @@ if test "${target}" = "${host}"; then
 	  CORE_HEADER='"hosts/x86-64linux.h"'
 	esac
 	;;
-  i[3-7]86-*-isc*)	COREFILE=trad-core.lo ;;
-  i[3-7]86-*-aix*)	COREFILE=aix386-core.lo ;;
   mips*-*-netbsd* | mips*-*-openbsd*)
 	COREFILE=netbsd-core.lo
 	;;
-  mips-sgi-irix4*)	COREFILE=irix-core.lo ;;
-  mips-sgi-irix5*)	COREFILE=irix-core.lo ;;
-  mips-sgi-irix6*)	COREFILE=irix-core.lo ;;
+  mips-*-irix*)
+	COREFILE=irix-core.lo
+	;;
   m68*-*-linux-*)
 	COREFILE=trad-core.lo
 	TRAD_HEADER='"hosts/m68klinux.h"'
@@ -14170,14 +14151,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   vax-*-netbsd* | vax-*-openbsd*)
 	COREFILE=netbsd-core.lo
 	;;
-  vax-*-ultrix2*)
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/vaxult2.h"'
-	;;
-  vax-*-ultrix*)
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/vaxult2.h"'
-	;;
   vax-*-linux-*)
 	COREFILE=trad-core.lo
 	TRAD_HEADER='"hosts/vaxlinux.h"'
@@ -14195,7 +14168,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   esac
 
   case "$COREFILE" in
-  aix386-core.lo)	COREFLAG=-DAIX386_CORE ;;
   hppabsd-core.lo)	COREFLAG=-DHPPABSD_CORE ;;
   hpux-core.lo)		COREFLAG=-DHPUX_CORE ;;
   irix-core.lo)		COREFLAG=-DIRIX_CORE ;;
@@ -14204,7 +14176,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   osf-core.lo)		COREFLAG=-DOSF_CORE ;;
   ptrace-core.lo)	COREFLAG=-DPTRACE_CORE ;;
   rs6000-core.lo)	COREFLAG="$COREFLAG -DAIX_CORE" ;;
-  sco5-core.lo)		COREFLAG="$COREFLAG -DSCO5_CORE" ;;
   trad-core.lo)		COREFLAG="$COREFLAG -DTRAD_CORE" ;;
   esac
 
diff --git a/bfd/configure.ac b/bfd/configure.ac
index 015fd01..82a3d1f 100644
--- a/bfd/configure.ac
+++ b/bfd/configure.ac
@@ -812,7 +812,6 @@ if test "${target}" = "${host}"; then
   arm*-*-netbsd* | arm-*-openbsd*)
 	COREFILE=netbsd-core.lo
 	;;
-  arm-*-riscix)		COREFILE=trad-core.lo ;;
   hppa*-*-hpux*)	COREFILE=hpux-core.lo ;;
   hppa*-*-hiux*)	COREFILE=hpux-core.lo ;;
   hppa*-*-mpeix*)	COREFILE=hpux-core.lo ;;
@@ -823,25 +822,12 @@ if test "${target}" = "${host}"; then
 	;;
 
 changequote(,)dnl
-  i[3-7]86-sequent-bsd*)
-changequote([,])dnl
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/symmetry.h"'
-	;;
-changequote(,)dnl
-  i[3-7]86-sequent-sysv4*) ;;
-  i[3-7]86-sequent-sysv*)
-changequote([,])dnl
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/symmetry.h"'
-	;;
-changequote(,)dnl
   i[3-7]86-*-bsdi)
 changequote([,])dnl
 	COREFILE=
 	;;
 changequote(,)dnl
-  i[3-7]86-*-bsd* | i[3-7]86-*-freebsd[123] | i[3-7]86-*-freebsd[123]\.* | i[3-7]86-*-freebsd4\.[01234] | i[3-7]86-*-freebsd4\.[01234]\.* | i[3-7]86-*-freebsd*aout*)
+  i[3-7]86-*-bsd* | i[3-7]86-*-freebsd[123] | i[3-7]86-*-freebsd[123]\.* | i[3-7]86-*-freebsd4\.[01234] | i[3-7]86-*-freebsd4\.[01234]\.*)
 changequote([,])dnl
 	COREFILE=trad-core.lo
 	TRAD_HEADER='"hosts/i386bsd.h"'
@@ -864,17 +850,6 @@ changequote([,])dnl
 	TRAD_HEADER='"hosts/esix.h"'
 	;;
 changequote(,)dnl
-  i[3-7]86-*-sco3.2v5*)
-changequote([,])dnl
-	COREFILE=sco5-core.lo
-	;;
-changequote(,)dnl
-  i[3-7]86-*-sco* | i[3-7]86-*-isc*)
-changequote([,])dnl
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/i386sco.h"'
-	;;
-changequote(,)dnl
   i[3-7]86-*-mach3*)
 changequote([,])dnl
 	COREFILE=trad-core.lo
@@ -890,16 +865,12 @@ changequote([,])dnl
 	  CORE_HEADER='"hosts/x86-64linux.h"'
 	esac
 	;;
-changequote(,)dnl
-  i[3-7]86-*-isc*)	COREFILE=trad-core.lo ;;
-  i[3-7]86-*-aix*)	COREFILE=aix386-core.lo ;;
-changequote([,])dnl
   mips*-*-netbsd* | mips*-*-openbsd*)
 	COREFILE=netbsd-core.lo
 	;;
-  mips-sgi-irix4*)	COREFILE=irix-core.lo ;;
-  mips-sgi-irix5*)	COREFILE=irix-core.lo ;;
-  mips-sgi-irix6*)	COREFILE=irix-core.lo ;;
+  mips-*-irix*)
+	COREFILE=irix-core.lo
+	;;
   m68*-*-linux-*)
 	COREFILE=trad-core.lo
 	TRAD_HEADER='"hosts/m68klinux.h"'
@@ -955,14 +926,6 @@ changequote([,])dnl
   vax-*-netbsd* | vax-*-openbsd*)
 	COREFILE=netbsd-core.lo
 	;;
-  vax-*-ultrix2*)
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/vaxult2.h"'
-	;;
-  vax-*-ultrix*)
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/vaxult2.h"'
-	;;
   vax-*-linux-*)
 	COREFILE=trad-core.lo
 	TRAD_HEADER='"hosts/vaxlinux.h"'
@@ -980,7 +943,6 @@ changequote([,])dnl
   esac
 
   case "$COREFILE" in
-  aix386-core.lo)	COREFLAG=-DAIX386_CORE ;;
   hppabsd-core.lo)	COREFLAG=-DHPPABSD_CORE ;;
   hpux-core.lo)		COREFLAG=-DHPUX_CORE ;;
   irix-core.lo)		COREFLAG=-DIRIX_CORE ;;
@@ -989,7 +951,6 @@ changequote([,])dnl
   osf-core.lo)		COREFLAG=-DOSF_CORE ;;
   ptrace-core.lo)	COREFLAG=-DPTRACE_CORE ;;
   rs6000-core.lo)	COREFLAG="$COREFLAG -DAIX_CORE" ;;
-  sco5-core.lo)		COREFLAG="$COREFLAG -DSCO5_CORE" ;;
   trad-core.lo)		COREFLAG="$COREFLAG -DTRAD_CORE" ;;
   esac
 
diff --git a/bfd/doc/bfdint.texi b/bfd/doc/bfdint.texi
index 538ceb6..cb251b1 100644
--- a/bfd/doc/bfdint.texi
+++ b/bfd/doc/bfdint.texi
@@ -346,10 +346,6 @@ Intel hex format.
 SOM (used on HP/UX).
 @item bfd_target_verilog_flavour
 Verilog memory hex dump format.
-@item bfd_target_os9k_flavour
-os9000.
-@item bfd_target_versados_flavour
-VERSAdos.
 @item bfd_target_msdos_flavour
 MS-DOS.
 @item bfd_target_evax_flavour
diff --git a/bfd/doc/local.mk b/bfd/doc/local.mk
index 33030ee..cf2b479 100644
--- a/bfd/doc/local.mk
+++ b/bfd/doc/local.mk
@@ -69,7 +69,7 @@ SRCPROT = $(srcdir)/archive.c $(srcdir)/archures.c \
 SRCIPROT = $(srcdir)/cache.c $(srcdir)/libbfd.c \
 	$(srcdir)/bfdio.c $(srcdir)/bfdwin.c \
 	$(srcdir)/reloc.c $(srcdir)/cpu-h8300.c \
-	$(srcdir)/cpu-i960.c $(srcdir)/archures.c \
+	$(srcdir)/archures.c \
 	$(srcdir)/init.c
 
 TEXIDIR = $(srcdir)/../texinfo/fsf
diff --git a/bfd/hosts/i386sco.h b/bfd/hosts/i386sco.h
deleted file mode 100644
index fec6953..0000000
--- a/bfd/hosts/i386sco.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright (C) 2007-2022 Free Software Foundation, Inc.
-
-   This file is part of BFD, the Binary File Descriptor library.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
-   MA 02110-1301, USA.  */
-
-/* Core file stuff.  At least some, perhaps all, of the following
-   defines work on many more systems than just SCO.  */
-
-#define NBPG NBPC
-#define UPAGES USIZE
-#define HOST_DATA_START_ADDR u.u_exdata.ux_datorg
-#define HOST_STACK_START_ADDR u.u_sub
-#define TRAD_UNIX_CORE_FILE_FAILING_SIGNAL(abfd) \
-  ((core_upage(abfd)->u_sysabort != 0) \
-   ? core_upage(abfd)->u_sysabort \
-   : -1)
-
-/* According to the manpage, a version 2 SCO corefile can contain
-   various additional sections (it is cleverly arranged so the u area,
-   data, and stack are first where we can find them).  So without
-   writing lots of code to parse all their headers and stuff, we can't
-   know whether a corefile is bigger than it should be.  */
-
-#define TRAD_CORE_ALLOW_ANY_EXTRA_SIZE 1
diff --git a/bfd/hosts/symmetry.h b/bfd/hosts/symmetry.h
deleted file mode 100644
index 9904924..0000000
--- a/bfd/hosts/symmetry.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright (C) 2007-2022 Free Software Foundation, Inc.
-
-   This file is part of BFD, the Binary File Descriptor library.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
-   MA 02110-1301, USA.  */
-
-/* Symmetry running either dynix 3.1 (bsd) or ptx (sysv).  */
-
-#define NBPG 4096
-#define UPAGES 1
-
-#ifdef _SEQUENT_
-/* ptx */
-#define HOST_TEXT_START_ADDR 0
-#define HOST_STACK_END_ADDR 0x3fffe000
-#define TRAD_CORE_USER_OFFSET ((UPAGES * NBPG) - sizeof (struct user))
-#else
-/* dynix */
-#define HOST_TEXT_START_ADDR 0x1000
-#define HOST_DATA_START_ADDR (NBPG * u.u_tsize)
-#define HOST_STACK_END_ADDR 0x3ffff000
-#define TRAD_UNIX_CORE_FILE_FAILING_SIGNAL(core_bfd) \
-  ((core_bfd)->tdata.trad_core_data->u.u_arg[0])
-#endif
-
-#define TRAD_CORE_DSIZE_INCLUDES_TSIZE
diff --git a/bfd/hosts/vaxult.h b/bfd/hosts/vaxult.h
deleted file mode 100644
index dbe757d..0000000
--- a/bfd/hosts/vaxult.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright (C) 2007-2022 Free Software Foundation, Inc.
-
-   This file is part of BFD, the Binary File Descriptor library.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
-   MA 02110-1301, USA.  */
-
-#include <machine/param.h>
-#include <machine/vmparam.h>
-#define	HOST_PAGE_SIZE		(NBPG*CLSIZE)
-#define	HOST_MACHINE_ARCH	bfd_arch_vax
-
-#define	HOST_TEXT_START_ADDR	USRTEXT
-#define	HOST_STACK_END_ADDR	USRSTACK
-#undef	HOST_BIG_ENDIAN_P
diff --git a/bfd/hosts/vaxult2.h b/bfd/hosts/vaxult2.h
deleted file mode 100644
index dbe757d..0000000
--- a/bfd/hosts/vaxult2.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright (C) 2007-2022 Free Software Foundation, Inc.
-
-   This file is part of BFD, the Binary File Descriptor library.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
-   MA 02110-1301, USA.  */
-
-#include <machine/param.h>
-#include <machine/vmparam.h>
-#define	HOST_PAGE_SIZE		(NBPG*CLSIZE)
-#define	HOST_MACHINE_ARCH	bfd_arch_vax
-
-#define	HOST_TEXT_START_ADDR	USRTEXT
-#define	HOST_STACK_END_ADDR	USRSTACK
-#undef	HOST_BIG_ENDIAN_P
diff --git a/bfd/po/SRC-POTFILES.in b/bfd/po/SRC-POTFILES.in
index 08e2901..26d5a2c 100644
--- a/bfd/po/SRC-POTFILES.in
+++ b/bfd/po/SRC-POTFILES.in
@@ -1,4 +1,3 @@
-aix386-core.c
 aix5ppc-core.c
 aout-cris.c
 aout-ns32k.c
@@ -340,7 +339,6 @@ ppcboot.c
 reloc.c
 reloc16.c
 rs6000-core.c
-sco5-core.c
 section.c
 simple.c
 som.c
diff --git a/bfd/sco5-core.c b/bfd/sco5-core.c
deleted file mode 100644
index 7807ac8..0000000
--- a/bfd/sco5-core.c
+++ /dev/null
@@ -1,401 +0,0 @@
-/* BFD back end for SCO5 core files (U-area and raw sections)
-   Copyright (C) 1998-2022 Free Software Foundation, Inc.
-   Written by Jouke Numan <jnuman@hiscom.nl>
-
-   This file is part of BFD, the Binary File Descriptor library.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
-   MA 02110-1301, USA.  */
-
-#include "sysdep.h"
-#include "bfd.h"
-#include "libbfd.h"
-#include "libaout.h"		/* BFD a.out internal data structures */
-
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/dir.h>
-#include <signal.h>
-
-#include <sys/user.h>		/* After a.out.h  */
-#ifdef SCO5_CORE
-#include <sys/paccess.h>
-#include <sys/region.h>
-#endif
-
-struct sco5_core_struct
-{
-  struct user u;
-};
-
-/* forward declarations */
-
-#define sco5_core_file_matches_executable_p generic_core_file_matches_executable_p
-#define sco5_core_file_pid _bfd_nocore_core_file_pid
-
-static asection *
-make_bfd_asection (bfd *abfd,
-		   const char *name,
-		   flagword flags,
-		   bfd_size_type size,
-		   bfd_vma vma,
-		   file_ptr filepos)
-{
-  asection *asect;
-
-  asect = bfd_make_section_anyway_with_flags (abfd, name, flags);
-  if (!asect)
-    return NULL;
-  asect->size = size;
-  asect->vma = vma;
-  asect->filepos = filepos;
-  asect->alignment_power = 2;
-
-  return asect;
-}
-
-static struct user *
-read_uarea (bfd *abfd, int filepos)
-{
-  struct sco5_core_struct *rawptr;
-  size_t amt = sizeof (struct sco5_core_struct);
-
-  rawptr = (struct sco5_core_struct *) bfd_zmalloc (amt);
-  if (rawptr == NULL)
-    return NULL;
-
-  abfd->tdata.sco5_core_data = rawptr;
-
-  if (bfd_seek (abfd, (file_ptr) filepos, SEEK_SET) != 0
-      || bfd_bread ((void *) &rawptr->u, (bfd_size_type) sizeof rawptr->u,
-		   abfd) != sizeof rawptr->u)
-    {
-      bfd_set_error (bfd_error_wrong_format);
-      return NULL;
-    }
-
-  /* Sanity check perhaps??? */
-  if (rawptr->u.u_dsize > 0x1000000)    /* Remember, it's in pages...  */
-    {
-      bfd_set_error (bfd_error_wrong_format);
-      return NULL;
-    }
-  if (rawptr->u.u_ssize > 0x1000000)
-    {
-      bfd_set_error (bfd_error_wrong_format);
-      return NULL;
-    }
-  return &rawptr->u;
-}
-
-bfd_cleanup
-sco5_core_file_p (bfd *abfd)
-{
-  int coffset_siz, val, nsecs, cheadoffs;
-  int coresize;
-  struct user *u;
-  struct coreoffsets coffsets;
-  struct coresecthead chead;
-  char *secname;
-  flagword flags;
-
-  /* Read coreoffsets region at end of core (see core(FP)).  */
-
-  {
-    struct stat statbuf;
-
-    if (bfd_stat (abfd, &statbuf) < 0)
-      return NULL;
-
-    coresize = statbuf.st_size;
-  }
-  /* Last long in core is sizeof struct coreoffsets, read it */
-  if ((bfd_seek (abfd, (file_ptr) (coresize - sizeof coffset_siz),
-		 SEEK_SET) != 0)
-      || bfd_bread ((void *) &coffset_siz, (bfd_size_type) sizeof coffset_siz,
-		   abfd) != sizeof coffset_siz)
-    {
-      bfd_set_error (bfd_error_wrong_format);
-      return NULL;
-    }
-
-  /* Use it to seek start of coreoffsets region, read it and determine
-     validity */
-  if ((bfd_seek (abfd, (file_ptr) (coresize - coffset_siz), SEEK_SET) != 0)
-      || (bfd_bread ((void *) &coffsets, (bfd_size_type) sizeof coffsets, abfd)
-	  != sizeof coffsets)
-      || ((coffsets.u_info != 1) && (coffsets.u_info != C_VERSION)))
-    {
-      bfd_set_error (bfd_error_wrong_format);
-      return NULL;
-    }
-
-  if (coffsets.u_info == 1)
-    {
-      /* Old version, no section heads, read info from user struct */
-
-      u = read_uarea (abfd, coffsets.u_user);
-      if (! u)
-	goto fail;
-
-      if (!make_bfd_asection (abfd, ".reg", SEC_HAS_CONTENTS,
-			      (bfd_size_type) coffsets.u_usize,
-			      0 - (bfd_vma) u->u_ar0,
-			      (file_ptr) coffsets.u_user))
-	goto fail;
-
-      if (!make_bfd_asection (abfd, ".data",
-			      SEC_ALLOC + SEC_LOAD + SEC_HAS_CONTENTS,
-			      ((bfd_size_type) u->u_exdata.ux_dsize
-			       + u->u_exdata.ux_bsize),
-			      (bfd_vma) u->u_exdata.ux_datorg,
-			      (file_ptr) coffsets.u_data))
-	goto fail;
-
-      if (!make_bfd_asection (abfd, ".stack",
-			      SEC_ALLOC + SEC_LOAD + SEC_HAS_CONTENTS,
-			      (bfd_size_type) u->u_ssize * NBPC,
-			      (bfd_vma) u->u_sub,
-			      (file_ptr) coffsets.u_stack))
-	goto fail;
-
-      return _bfd_no_cleanup;		/* Done for version 1 */
-    }
-
-  /* Immediately before coreoffsets region is a long with offset in core
-     to first coresecthead (CORES_OFFSETS), the long before this is the
-     number of section heads in the list. Read both longs and read the
-     coresecthead and check its validity */
-
-  if ((bfd_seek (abfd,
-		 (file_ptr) (coresize - coffset_siz - 2 * sizeof coffset_siz),
-		 SEEK_SET) != 0)
-      || (bfd_bread ((void *) &nsecs, (bfd_size_type) sizeof nsecs, abfd)
-	  != sizeof nsecs)
-      || (bfd_bread ((void *) &cheadoffs, (bfd_size_type) sizeof cheadoffs,
-		    abfd) != sizeof cheadoffs)
-      || (bfd_seek (abfd, (file_ptr) cheadoffs, SEEK_SET) != 0)
-      || (bfd_bread ((void *) &chead, (bfd_size_type) sizeof chead, abfd)
-	  != sizeof chead)
-      || (chead.cs_stype != CORES_OFFSETS)
-      || (chead.cs_x.csx_magic != COREMAGIC_NUMBER))
-    {
-      bfd_set_error (bfd_error_wrong_format);
-      goto fail;
-    }
-
-  /* OK, we believe you.  You're a core file (sure, sure).  */
-
-  /* Now loop over all regions and map them */
-  nsecs--;				/* We've seen CORES_OFFSETS already */
-  for (; nsecs; nsecs--)
-    {
-      if ((bfd_seek (abfd, (file_ptr) chead.cs_hseek, SEEK_SET) != 0)
-	  || (bfd_bread ((void *) &chead, (bfd_size_type) sizeof chead, abfd)
-	      != sizeof chead))
-	{
-	  bfd_set_error (bfd_error_wrong_format);
-	  goto fail;
-	}
-
-      switch (chead.cs_stype)
-	{
-	case CORES_MAGIC:			/* Core header, check magic */
-	  if (chead.cs_x.csx_magic != COREMAGIC_NUMBER)
-	    {
-	      bfd_set_error (bfd_error_wrong_format);
-	      goto fail;
-	    }
-	  secname = NULL;
-	  nsecs++;				/* MAGIC not in section cnt!*/
-	  break;
-	case CORES_UAREA:			/* U-area, read in tdata */
-	  u = read_uarea (abfd, chead.cs_sseek);
-	  if (! u)
-	    goto fail;
-
-	  /* This is tricky.  As the "register section", we give them
-	     the entire upage and stack.  u.u_ar0 points to where
-	     "register 0" is stored.  There are two tricks with this,
-	     though.  One is that the rest of the registers might be
-	     at positive or negative (or both) displacements from
-	     *u_ar0.  The other is that u_ar0 is sometimes an absolute
-	     address in kernel memory, and on other systems it is an
-	     offset from the beginning of the `struct user'.
-
-	     As a practical matter, we don't know where the registers
-	     actually are, so we have to pass the whole area to GDB.
-	     We encode the value of u_ar0 by setting the .regs section
-	     up so that its virtual memory address 0 is at the place
-	     pointed to by u_ar0 (by setting the vma of the start of
-	     the section to -u_ar0).  GDB uses this info to locate the
-	     regs, using minor trickery to get around the
-	     offset-or-absolute-addr problem.  */
-
-	  chead.cs_vaddr = 0 - (bfd_vma) u->u_ar0;
-
-	  secname = ".reg";
-	  flags = SEC_HAS_CONTENTS;
-
-	  break;
-	case CORES_PREGION:			/* A program region, map it */
-	  switch (chead.cs_x.csx_preg.csxp_rtyp)
-	    {
-	    case PT_DATA:
-	      secname = ".data";	/* Data region.		 */
-	      break;
-	    case PT_STACK:
-	      secname = ".stack";	/* Stack region.	 */
-	      break;
-	    case PT_SHMEM:
-	      secname = ".shmem";	/* Shared memory	 */
-	      break;
-	    case PT_LIBDAT:
-	      secname = ".libdat";	/* Shared library data	 */
-	      break;
-	    case PT_V86:
-	      secname = ".virt86";	/* Virtual 8086 mode	 */
-	      break;
-	    case PT_SHFIL:
-	      secname = ".mmfile";	/* Memory mapped file	 */
-	      break;
-	    case PT_XDATA0:
-	      secname = ".Xdat0";	/* XENIX data region, virtual 0 */
-	      break;
-	    default:
-	      secname = "";
-	    }
-	  flags = SEC_ALLOC + SEC_LOAD + SEC_HAS_CONTENTS;
-	  break;
-	case CORES_PROC:			/* struct proc */
-	case CORES_ITIMER:			/* interval timers */
-	case CORES_SCOUTSNAME:			/* struct scoutsname */
-	  secname = NULL;	/* Ignore these */
-	  break;
-	default:
-	  _bfd_error_handler ("Unhandled SCO core file section type %d\n",
-			      chead.cs_stype);
-	  continue;
-	}
-
-      if (secname
-	  && !make_bfd_asection (abfd, secname, flags,
-				 (bfd_size_type) chead.cs_vsize,
-				 (bfd_vma) chead.cs_vaddr,
-				 (file_ptr) chead.cs_sseek))
-	goto fail;
-
-    }
-
-  return _bfd_no_cleanup;
-
- fail:
-  if (abfd->tdata.any)
-    {
-      bfd_release (abfd, abfd->tdata.any);
-      abfd->tdata.any = NULL;
-    }
-  bfd_section_list_clear (abfd);
-  return NULL;
-}
-
-char *
-sco5_core_file_failing_command (bfd *abfd)
-{
-  char *com = abfd->tdata.sco5_core_data->u.u_comm;
-  if (*com)
-    return com;
-  else
-    return NULL;
-}
-
-int
-sco5_core_file_failing_signal (bfd *ignore_abfd)
-{
-  return ((ignore_abfd->tdata.sco5_core_data->u.u_sysabort != 0)
-	  ? ignore_abfd->tdata.sco5_core_data->u.u_sysabort
-	  : -1);
-}
-
-/* If somebody calls any byte-swapping routines, shoot them.  */
-static void
-swap_abort (void)
-{
-  abort (); /* This way doesn't require any declaration for ANSI to fuck up */
-}
-
-#define	NO_GET ((bfd_vma (*) (const void *)) swap_abort)
-#define	NO_PUT ((void (*) (bfd_vma, void *)) swap_abort)
-#define	NO_GETS ((bfd_signed_vma (*) (const void *)) swap_abort)
-#define	NO_GET64 ((uint64_t (*) (const void *)) swap_abort)
-#define	NO_PUT64 ((void (*) (uint64_t, void *)) swap_abort)
-#define	NO_GETS64 ((int64_t (*) (const void *)) swap_abort)
-
-const bfd_target core_sco5_vec =
-  {
-    "sco5-core",
-    bfd_target_unknown_flavour,
-    BFD_ENDIAN_LITTLE,	       /* target byte order */
-    BFD_ENDIAN_LITTLE,	       /* target headers byte order */
-    (HAS_RELOC | EXEC_P |	/* object flags */
-     HAS_LINENO | HAS_DEBUG |
-     HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
-    (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
-    0,				/* symbol prefix */
-    ' ',			/* ar_pad_char */
-    16,				/* ar_max_namelen */
-    0,				/* match priority.  */
-    TARGET_KEEP_UNUSED_SECTION_SYMBOLS, /* keep unused section symbols.  */
-    NO_GET64, NO_GETS64, NO_PUT64,	/* 64 bit data */
-    NO_GET, NO_GETS, NO_PUT,		/* 32 bit data */
-    NO_GET, NO_GETS, NO_PUT,		/* 16 bit data */
-    NO_GET64, NO_GETS64, NO_PUT64,	/* 64 bit hdrs */
-    NO_GET, NO_GETS, NO_PUT,		/* 32 bit hdrs */
-    NO_GET, NO_GETS, NO_PUT,		/* 16 bit hdrs */
-
-    {				/* bfd_check_format */
-      _bfd_dummy_target,		/* unknown format */
-      _bfd_dummy_target,		/* object file */
-      _bfd_dummy_target,		/* archive */
-      sco5_core_file_p			/* a core file */
-    },
-    {				/* bfd_set_format */
-      _bfd_bool_bfd_false_error,
-      _bfd_bool_bfd_false_error,
-      _bfd_bool_bfd_false_error,
-      _bfd_bool_bfd_false_error
-    },
-    {				/* bfd_write_contents */
-      _bfd_bool_bfd_false_error,
-      _bfd_bool_bfd_false_error,
-      _bfd_bool_bfd_false_error,
-      _bfd_bool_bfd_false_error
-    },
-
-    BFD_JUMP_TABLE_GENERIC (_bfd_generic),
-    BFD_JUMP_TABLE_COPY (_bfd_generic),
-    BFD_JUMP_TABLE_CORE (sco5),
-    BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
-    BFD_JUMP_TABLE_SYMBOLS (_bfd_nosymbols),
-    BFD_JUMP_TABLE_RELOCS (_bfd_norelocs),
-    BFD_JUMP_TABLE_WRITE (_bfd_generic),
-    BFD_JUMP_TABLE_LINK (_bfd_nolink),
-    BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-    NULL,
-
-    NULL			/* backend_data */
-  };
diff --git a/bfd/targets.c b/bfd/targets.c
index 41294ea..44fb5a3 100644
--- a/bfd/targets.c
+++ b/bfd/targets.c
@@ -162,10 +162,7 @@ DESCRIPTION
 .  bfd_target_verilog_flavour,
 .  bfd_target_ihex_flavour,
 .  bfd_target_som_flavour,
-.  bfd_target_os9k_flavour,
-.  bfd_target_versados_flavour,
 .  bfd_target_msdos_flavour,
-.  bfd_target_ovax_flavour,
 .  bfd_target_evax_flavour,
 .  bfd_target_mmo_flavour,
 .  bfd_target_mach_o_flavour,
@@ -960,7 +957,6 @@ extern const bfd_target binary_vec;
 extern const bfd_target ihex_vec;
 
 /* All of the xvecs for core files.  */
-extern const bfd_target core_aix386_vec;
 extern const bfd_target core_cisco_be_vec;
 extern const bfd_target core_cisco_le_vec;
 extern const bfd_target core_hppabsd_vec;
@@ -969,7 +965,6 @@ extern const bfd_target core_irix_vec;
 extern const bfd_target core_netbsd_vec;
 extern const bfd_target core_osf_vec;
 extern const bfd_target core_ptrace_vec;
-extern const bfd_target core_sco5_vec;
 extern const bfd_target core_trad_vec;
 
 static const bfd_target * const _bfd_target_vector[] =
@@ -1394,9 +1389,6 @@ static const bfd_target * const _bfd_target_vector[] =
 
 /* Add any required traditional-core-file-handler.  */
 
-#ifdef AIX386_CORE
-	&core_aix386_vec,
-#endif
 #if 0
 	/* We don't include cisco_core_*_vec.  Although it has a magic number,
 	   the magic number isn't at the beginning of the file, and thus
@@ -1422,9 +1414,6 @@ static const bfd_target * const _bfd_target_vector[] =
 #ifdef PTRACE_CORE
 	&core_ptrace_vec,
 #endif
-#ifdef SCO5_CORE
-	&core_sco5_vec,
-#endif
 #ifdef TRAD_CORE
 	&core_trad_vec,
 #endif
@@ -1863,10 +1852,7 @@ bfd_flavour_name (enum bfd_flavour flavour)
     case bfd_target_verilog_flavour: return "Verilog";
     case bfd_target_ihex_flavour: return "Ihex";
     case bfd_target_som_flavour: return "SOM";
-    case bfd_target_os9k_flavour: return "OS9K";
-    case bfd_target_versados_flavour: return "Versados";
     case bfd_target_msdos_flavour: return "MSDOS";
-    case bfd_target_ovax_flavour: return "Ovax";
     case bfd_target_evax_flavour: return "Evax";
     case bfd_target_mmo_flavour: return "mmo";
     case bfd_target_mach_o_flavour: return "MACH_O";