Remove h8500 support

include/
	* coff/h8500.h: Delete.
	* coff/internal.h: Remove h8500 support.
bfd/
	* Makefile.am: Remove h8500 support.
	* archures.c: Likewise.
	* coffcode.h: Likewise.
	* config.bfd: Likewise.
	* configure.ac: Likewise.
	* targets.c: Likewise.
	* coff-h8500.c: Delete.
	* cpu-h8500.c: Delete.
	* Makefile.in: Regenerate.
	* bfd-in2.h: Regenerate.
	* configure: Regenerate.
	* po/SRC-POTFILES.in: Regenerate.
opcodes/
	* Makefile.am: Remove h8500 support.
	* configure.ac: Likewise.
	* disassemble.c: Likewise.
	* disassemble.h: Likewise.
	* h8500-dis.c: Delete.
	* h8500-opc.h: Delete.
	* Makefile.in: Regenerate.
	* configure: Regenerate.
	* po/POTFILES.in: Regenerate.
binutils/
	* testsuite/binutils-all/objcopy.exp: Remove h8500 support.
	* testsuite/lib/binutils-common.exp: Likewise.
gas/
	* config/obj-coff.h: Remove h8500 support.
ld/
	* Makefile.am: Remove h8500 support.
	* configure.tgt: Likewise.
	* emulparams/h8500.sh: Delete.
	* emulparams/h8500b.sh: Delete.
	* emulparams/h8500c.sh: Delete.
	* emulparams/h8500m.sh: Delete.
	* emulparams/h8500s.sh: Delete.
	* scripttempl/h8500.sc: Delete.
	* scripttempl/h8500b.sc: Delete.
	* scripttempl/h8500c.sc: Delete.
	* scripttempl/h8500m.sc: Delete.
	* scripttempl/h8500s.sc: Delete.
	* Makefile.in: Regenerate.
	* po/BLD-POTFILES.in: Regenerate.

13 files changed, 16 insertions, 396 deletions

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 6bcdd2b..160779a 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,20 @@
 2018-04-16  Alan Modra  <amodra@gmail.com>
 
+	* Makefile.am: Remove h8500 support.
+	* archures.c: Likewise.
+	* coffcode.h: Likewise.
+	* config.bfd: Likewise.
+	* configure.ac: Likewise.
+	* targets.c: Likewise.
+	* coff-h8500.c: Delete.
+	* cpu-h8500.c: Delete.
+	* Makefile.in: Regenerate.
+	* bfd-in2.h: Regenerate.
+	* configure: Regenerate.
+	* po/SRC-POTFILES.in: Regenerate.
+
+2018-04-16  Alan Modra  <amodra@gmail.com>
+
 	* Makefile.am: Remove h8300-coff support.
 	* coffcode.h: Likewise.
 	* config.bfd: Likewise.
diff --git a/bfd/Makefile.am b/bfd/Makefile.am
index f1f7c74..2b06d0a 100644
--- a/bfd/Makefile.am
+++ b/bfd/Makefile.am
@@ -107,7 +107,6 @@ ALL_MACHINES = \
 	cpu-frv.lo \
 	cpu-ft32.lo \
 	cpu-h8300.lo \
-	cpu-h8500.lo \
 	cpu-hppa.lo \
 	cpu-i370.lo \
 	cpu-i386.lo \
@@ -195,7 +194,6 @@ ALL_MACHINES_CFILES = \
 	cpu-frv.c \
 	cpu-ft32.c \
 	cpu-h8300.c \
-	cpu-h8500.c \
 	cpu-hppa.c \
 	cpu-i370.c \
 	cpu-i386.c \
@@ -281,7 +279,6 @@ BFD32_BACKENDS = \
 	coff-arm.lo \
 	coff-aux.lo \
 	coff-go32.lo \
-	coff-h8500.lo \
 	coff-i386.lo \
 	coff-m68k.lo \
 	coff-m88k.lo \
@@ -464,7 +461,6 @@ BFD32_BACKENDS_CFILES = \
 	coff-arm.c \
 	coff-aux.c \
 	coff-go32.c \
-	coff-h8500.c \
 	coff-i386.c \
 	coff-m68k.c \
 	coff-m88k.c \
diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index af602fc..657d62a 100644
--- a/bfd/Makefile.in
+++ b/bfd/Makefile.in
@@ -440,7 +440,6 @@ ALL_MACHINES = \
 	cpu-frv.lo \
 	cpu-ft32.lo \
 	cpu-h8300.lo \
-	cpu-h8500.lo \
 	cpu-hppa.lo \
 	cpu-i370.lo \
 	cpu-i386.lo \
@@ -528,7 +527,6 @@ ALL_MACHINES_CFILES = \
 	cpu-frv.c \
 	cpu-ft32.c \
 	cpu-h8300.c \
-	cpu-h8500.c \
 	cpu-hppa.c \
 	cpu-i370.c \
 	cpu-i386.c \
@@ -615,7 +613,6 @@ BFD32_BACKENDS = \
 	coff-arm.lo \
 	coff-aux.lo \
 	coff-go32.lo \
-	coff-h8500.lo \
 	coff-i386.lo \
 	coff-m68k.lo \
 	coff-m88k.lo \
@@ -798,7 +795,6 @@ BFD32_BACKENDS_CFILES = \
 	coff-arm.c \
 	coff-aux.c \
 	coff-go32.c \
-	coff-h8500.c \
 	coff-i386.c \
 	coff-m68k.c \
 	coff-m88k.c \
@@ -1312,7 +1308,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-aux.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-bfd.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-go32.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-h8500.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-i386.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-m68k.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-m88k.Plo@am__quote@
@@ -1355,7 +1350,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-frv.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-ft32.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-h8300.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-h8500.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-hppa.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-i370.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-i386.Plo@am__quote@
diff --git a/bfd/archures.c b/bfd/archures.c
index bf46332..d333379 100644
--- a/bfd/archures.c
+++ b/bfd/archures.c
@@ -287,7 +287,6 @@ DESCRIPTION
 .  bfd_arch_z8k,       {* Zilog Z8000.  *}
 .#define bfd_mach_z8001		1
 .#define bfd_mach_z8002		2
-.  bfd_arch_h8500,     {* Renesas H8/500 (formerly Hitachi H8/500).  *}
 .  bfd_arch_sh,	       {* Renesas / SuperH SH (formerly Hitachi SH).  *}
 .#define bfd_mach_sh				1
 .#define bfd_mach_sh2				0x20
@@ -578,7 +577,6 @@ extern const bfd_arch_info_type bfd_epiphany_arch;
 extern const bfd_arch_info_type bfd_fr30_arch;
 extern const bfd_arch_info_type bfd_frv_arch;
 extern const bfd_arch_info_type bfd_h8300_arch;
-extern const bfd_arch_info_type bfd_h8500_arch;
 extern const bfd_arch_info_type bfd_hppa_arch;
 extern const bfd_arch_info_type bfd_i370_arch;
 extern const bfd_arch_info_type bfd_i386_arch;
@@ -671,7 +669,6 @@ static const bfd_arch_info_type * const bfd_archures_list[] =
     &bfd_fr30_arch,
     &bfd_frv_arch,
     &bfd_h8300_arch,
-    &bfd_h8500_arch,
     &bfd_hppa_arch,
     &bfd_i370_arch,
     &bfd_i386_arch,
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index fd69eb8..e291e55 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -2162,7 +2162,6 @@ enum bfd_architecture
   bfd_arch_z8k,       /* Zilog Z8000.  */
 #define bfd_mach_z8001         1
 #define bfd_mach_z8002         2
-  bfd_arch_h8500,     /* Renesas H8/500 (formerly Hitachi H8/500).  */
   bfd_arch_sh,        /* Renesas / SuperH SH (formerly Hitachi SH).  */
 #define bfd_mach_sh                            1
 #define bfd_mach_sh2                           0x20
diff --git a/bfd/coff-h8500.c b/bfd/coff-h8500.c
deleted file mode 100644
index a73fd46..0000000
--- a/bfd/coff-h8500.c
+++ /dev/null
@@ -1,298 +0,0 @@
-/* BFD back-end for Renesas H8/500 COFF binaries.
-   Copyright (C) 1993-2018 Free Software Foundation, Inc.
-   Contributed by Cygnus Support.
-   Written by Steve Chamberlain, <sac@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 "bfdlink.h"
-#include "coff/h8500.h"
-#include "coff/internal.h"
-#include "libcoff.h"
-
-
-#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (1)
-
-static reloc_howto_type r_imm8 =
-HOWTO (R_H8500_IMM8, 0, 1, 8, FALSE, 0,
-       complain_overflow_bitfield, 0, "r_imm8", TRUE, 0x000000ff, 0x000000ff, FALSE);
-
-static reloc_howto_type r_imm16 =
-HOWTO (R_H8500_IMM16, 0, 1, 16, FALSE, 0,
-       complain_overflow_bitfield, 0, "r_imm16", TRUE, 0x0000ffff, 0x0000ffff, FALSE);
-
-static reloc_howto_type r_imm24 =
-HOWTO (R_H8500_IMM24, 0, 1, 24, FALSE, 0,
-       complain_overflow_bitfield, 0, "r_imm24", TRUE, 0x00ffffff, 0x00ffffff, FALSE);
-
-static reloc_howto_type r_imm32 =
-HOWTO (R_H8500_IMM32, 0, 1, 32, FALSE, 0,
-       complain_overflow_bitfield, 0, "r_imm32", TRUE, 0xffffffff, 0xffffffff, FALSE);
-
-static reloc_howto_type r_high8 =
-HOWTO (R_H8500_HIGH8, 0, 1, 8, FALSE, 0,
-       complain_overflow_dont, 0, "r_high8", TRUE, 0x000000ff, 0x000000ff, FALSE);
-
-static reloc_howto_type r_low16 =
-HOWTO (R_H8500_LOW16, 0, 1, 16, FALSE, 0,
-       complain_overflow_dont, 0, "r_low16", TRUE, 0x0000ffff, 0x0000ffff, FALSE);
-
-static reloc_howto_type r_pcrel8 =
-HOWTO (R_H8500_PCREL8, 0, 1, 8, TRUE, 0, complain_overflow_signed, 0, "r_pcrel8", TRUE, 0, 0, TRUE);
-
-static reloc_howto_type r_pcrel16 =
-HOWTO (R_H8500_PCREL16, 0, 1, 16, TRUE, 0, complain_overflow_signed, 0, "r_pcrel16", TRUE, 0, 0, TRUE);
-
-static reloc_howto_type r_high16 =
-HOWTO (R_H8500_HIGH16, 0, 1, 8, FALSE, 0,
-       complain_overflow_dont, 0, "r_high16", TRUE, 0x000ffff, 0x0000ffff, FALSE);
-
-/* Turn a howto into a reloc number.  */
-
-static int
-coff_h8500_select_reloc (reloc_howto_type *howto)
-{
-  return howto->type;
-}
-
-#define SELECT_RELOC(x,howto) x.r_type = coff_h8500_select_reloc(howto)
-
-#define BADMAG(x) H8500BADMAG(x)
-#define H8500 1			/* Customize coffcode.h */
-
-#define __A_MAGIC_SET__
-
-/* Code to swap in the reloc.  */
-#define SWAP_IN_RELOC_OFFSET	H_GET_32
-#define SWAP_OUT_RELOC_OFFSET	H_PUT_32
-#define SWAP_OUT_RELOC_EXTRA(abfd, src, dst) \
-  dst->r_stuff[0] = 'S'; \
-  dst->r_stuff[1] = 'C';
-
-/* Code to turn a r_type into a howto ptr, uses the above howto table.  */
-
-static void
-rtype2howto (arelent * internal, struct internal_reloc *dst)
-{
-  switch (dst->r_type)
-    {
-    default:
-      internal->howto = NULL;
-      break;
-    case R_H8500_IMM8:
-      internal->howto = &r_imm8;
-      break;
-    case R_H8500_IMM16:
-      internal->howto = &r_imm16;
-      break;
-    case R_H8500_IMM24:
-      internal->howto = &r_imm24;
-      break;
-    case R_H8500_IMM32:
-      internal->howto = &r_imm32;
-      break;
-    case R_H8500_PCREL8:
-      internal->howto = &r_pcrel8;
-      break;
-    case R_H8500_PCREL16:
-      internal->howto = &r_pcrel16;
-      break;
-    case R_H8500_HIGH8:
-      internal->howto = &r_high8;
-      break;
-    case R_H8500_HIGH16:
-      internal->howto = &r_high16;
-      break;
-    case R_H8500_LOW16:
-      internal->howto = &r_low16;
-      break;
-    }
-}
-
-#define RTYPE2HOWTO(internal, relocentry) rtype2howto(internal,relocentry)
-
-/* Perform any necessary magic to the addend in a reloc entry.  */
-
-#define CALC_ADDEND(abfd, symbol, ext_reloc, cache_ptr) \
- cache_ptr->addend =  ext_reloc.r_offset;
-
-#define RELOC_PROCESSING(relent,reloc,symbols,abfd,section) \
- reloc_processing(relent, reloc, symbols, abfd, section)
-
-static void
-reloc_processing (arelent * relent,
-		  struct internal_reloc *reloc,
-		  asymbol ** symbols,
-		  bfd * abfd,
-		  asection * section)
-{
-  relent->address = reloc->r_vaddr;
-  rtype2howto (relent, reloc);
-
-  if (reloc->r_symndx > 0)
-    relent->sym_ptr_ptr = symbols + obj_convert (abfd)[reloc->r_symndx];
-  else
-    relent->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
-
-  relent->addend = reloc->r_offset;
-  relent->address -= section->vma;
-}
-
-static void
-extra_case (bfd *in_abfd,
-	    struct bfd_link_info *link_info,
-	    struct bfd_link_order *link_order,
-	    arelent *reloc,
-	    bfd_byte *data,
-	    unsigned int *src_ptr,
-	    unsigned int *dst_ptr)
-{
-  bfd_byte *d = data+*dst_ptr;
-  asection *input_section = link_order->u.indirect.section;
-
-  switch (reloc->howto->type)
-    {
-    case R_H8500_IMM8:
-      bfd_put_8 (in_abfd,
-		 bfd_coff_reloc16_get_value (reloc, link_info, input_section),
-		 d);
-      (*dst_ptr) += 1;
-      (*src_ptr) += 1;
-      break;
-
-    case R_H8500_HIGH8:
-      bfd_put_8 (in_abfd,
-		 (bfd_coff_reloc16_get_value (reloc, link_info, input_section)
-		  >> 16),
-		 d);
-      (*dst_ptr) += 1;
-      (*src_ptr) += 1;
-      break;
-
-    case R_H8500_IMM16:
-      bfd_put_16 (in_abfd,
-		  bfd_coff_reloc16_get_value (reloc, link_info, input_section),
-		  d);
-      (*dst_ptr) += 2;
-      (*src_ptr) += 2;
-      break;
-
-    case R_H8500_LOW16:
-      bfd_put_16 (in_abfd,
-		  bfd_coff_reloc16_get_value (reloc, link_info, input_section),
-		  d);
-
-      (*dst_ptr) += 2;
-      (*src_ptr) += 2;
-      break;
-
-    case R_H8500_HIGH16:
-      bfd_put_16 (in_abfd,
-		  (bfd_coff_reloc16_get_value (reloc, link_info, input_section)
-		   >> 16),
-		  d);
-
-      (*dst_ptr) += 2;
-      (*src_ptr) += 2;
-      break;
-
-    case R_H8500_IMM24:
-      {
-	int v = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
-	int o = bfd_get_32 (in_abfd, data+ *dst_ptr -1);
-	v = (v & 0x00ffffff) | (o & 0xff00000);
-	bfd_put_32 (in_abfd, (bfd_vma) v, data  + *dst_ptr -1);
-	(*dst_ptr) += 3;
-	(*src_ptr) += 3;
-      }
-      break;
-    case R_H8500_IMM32:
-      {
-	int v = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
-	bfd_put_32 (in_abfd, (bfd_vma) v, data  + *dst_ptr);
-	(*dst_ptr) += 4;
-	(*src_ptr) += 4;
-      }
-      break;
-
-    case R_H8500_PCREL8:
-      {
-	bfd_vma dst = bfd_coff_reloc16_get_value (reloc, link_info,
-						  input_section);
-	bfd_vma dot = (*dst_ptr
-		       + input_section->output_offset
-		       + input_section->output_section->vma);
-	int gap = dst - dot - 1; /* -1 since were in the odd byte of the
-				    word and the pc's been incremented.  */
-
-	if (gap > 128 || gap < -128)
-	  (*link_info->callbacks->reloc_overflow)
-	    (link_info, NULL, bfd_asymbol_name (*reloc->sym_ptr_ptr),
-	     reloc->howto->name, reloc->addend, input_section->owner,
-	     input_section, reloc->address);
-
-	bfd_put_8 (in_abfd, gap, data + *dst_ptr);
-	(*dst_ptr)++;
-	(*src_ptr)++;
-	break;
-      }
-    case R_H8500_PCREL16:
-      {
-	bfd_vma dst = bfd_coff_reloc16_get_value (reloc, link_info,
-						  input_section);
-	bfd_vma dot = (*dst_ptr
-		       + input_section->output_offset
-		       + input_section->output_section->vma);
-	int gap = dst - dot - 1; /* -1 since were in the odd byte of the
-				    word and the pc's been incremented.  */
-
-	if (gap > 32767 || gap < -32768)
-	  (*link_info->callbacks->reloc_overflow)
-	    (link_info, NULL, bfd_asymbol_name (*reloc->sym_ptr_ptr),
-	     reloc->howto->name, reloc->addend, input_section->owner,
-	     input_section, reloc->address);
-
-	bfd_put_16 (in_abfd, (bfd_vma) gap, data + *dst_ptr);
-	(*dst_ptr) += 2;
-	(*src_ptr) += 2;
-	break;
-      }
-
-    default:
-      abort ();
-    }
-}
-
-#define coff_reloc16_extra_cases extra_case
-
-#ifndef bfd_pe_print_pdata
-#define bfd_pe_print_pdata	NULL
-#endif
-
-#include "coffcode.h"
-
-#undef  coff_bfd_get_relocated_section_contents
-#undef coff_bfd_relax_section
-#define coff_bfd_get_relocated_section_contents \
-  bfd_coff_reloc16_get_relocated_section_contents
-#define coff_bfd_relax_section bfd_coff_reloc16_relax_section
-
-CREATE_BIG_COFF_TARGET_VEC (h8500_coff_vec, "coff-h8500", 0, 0, '_', NULL, COFF_SWAP_TABLE)
diff --git a/bfd/coffcode.h b/bfd/coffcode.h
index 9c66e4b..311e8cd 100644
--- a/bfd/coffcode.h
+++ b/bfd/coffcode.h
@@ -2301,12 +2301,6 @@ coff_set_arch_mach_hook (bfd *abfd, void * filehdr)
       break;
 #endif
 
-#ifdef H8500MAGIC
-    case H8500MAGIC:
-      arch = bfd_arch_h8500;
-      break;
-#endif
-
 #ifdef SPARCMAGIC
     case SPARCMAGIC:
 #ifdef LYNXCOFFMAGIC
@@ -2872,13 +2866,6 @@ coff_set_flags (bfd * abfd,
       return TRUE;
 #endif
 
-#ifdef H8500MAGIC
-    case bfd_arch_h8500:
-      *magicp = H8500MAGIC;
-      return TRUE;
-      break;
-#endif
-
 #ifdef WE32KMAGIC
     case bfd_arch_we32k:
       *magicp = WE32KMAGIC;
diff --git a/bfd/config.bfd b/bfd/config.bfd
index 7165d15..434b377 100644
--- a/bfd/config.bfd
+++ b/bfd/config.bfd
@@ -60,7 +60,6 @@ case $targ in
  arm-epoc-pe* | \
  arm*-*-aout | \
  arm*-*-coff | \
- h8500*-*-coff | \
  i[3-7]86-*-sco3.2v5*coff | \
  i[3-7]86-*-sysv4* | i[3-7]86-*-unixware* | \
  i[3-7]86-*-sco3.2v5* | \
@@ -132,6 +131,7 @@ case $targ in
  a29k-* | \
  arm-*-oabi | \
  h8300*-*-coff | \
+ h8500*-*-coff | \
  hppa*-*-rtems* | \
  i860-*-* | \
  i960-*-* | \
@@ -565,11 +565,6 @@ case "${targ}" in
     targ_defvec=h8300_elf32_linux_vec
     ;;
 
-  h8500-*-*)
-    targ_defvec=h8500_coff_vec
-    targ_underscore=yes
-    ;;
-
 #ifdef BFD64
   hppa*64*-*-linux-*)
     targ_defvec=hppa_elf64_linux_vec
diff --git a/bfd/configure b/bfd/configure
index 298846c..66a2425 100755
--- a/bfd/configure
+++ b/bfd/configure
@@ -14394,7 +14394,6 @@ do
     frv_elf32_fdpic_vec)	 tb="$tb elf32-frv.lo elf32.lo $elf" ;;
     h8300_elf32_vec)		 tb="$tb elf32-h8300.lo elf32.lo $elf" ;;
     h8300_elf32_linux_vec)	 tb="$tb elf32-h8300.lo elf32.lo $elf" ;;
-    h8500_coff_vec)		 tb="$tb coff-h8500.lo reloc16.lo $coffgen" ;;
     hppa_elf32_vec)		 tb="$tb elf32-hppa.lo elf32.lo $elf" ;;
     hppa_elf32_linux_vec)	 tb="$tb elf32-hppa.lo elf32.lo $elf" ;;
     hppa_elf32_nbsd_vec)	 tb="$tb elf32-hppa.lo elf32.lo $elf" ;;
diff --git a/bfd/configure.ac b/bfd/configure.ac
index aedb3ae..a6c6387 100644
--- a/bfd/configure.ac
+++ b/bfd/configure.ac
@@ -471,7 +471,6 @@ do
     frv_elf32_fdpic_vec)	 tb="$tb elf32-frv.lo elf32.lo $elf" ;;
     h8300_elf32_vec)		 tb="$tb elf32-h8300.lo elf32.lo $elf" ;;
     h8300_elf32_linux_vec)	 tb="$tb elf32-h8300.lo elf32.lo $elf" ;;
-    h8500_coff_vec)		 tb="$tb coff-h8500.lo reloc16.lo $coffgen" ;;
     hppa_elf32_vec)		 tb="$tb elf32-hppa.lo elf32.lo $elf" ;;
     hppa_elf32_linux_vec)	 tb="$tb elf32-hppa.lo elf32.lo $elf" ;;
     hppa_elf32_nbsd_vec)	 tb="$tb elf32-hppa.lo elf32.lo $elf" ;;
diff --git a/bfd/cpu-h8500.c b/bfd/cpu-h8500.c
deleted file mode 100644
index 06dc9b9..0000000
--- a/bfd/cpu-h8500.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* BFD library support routines for the H8/500 architecture.
-   Copyright (C) 1993-2018 Free Software Foundation, Inc.
-   Hacked by Steve Chamberlain of Cygnus Support.
-
-   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"
-
-static bfd_boolean scan_mach
-  (const struct bfd_arch_info *, const char *);
-
-static bfd_boolean
-scan_mach (const struct bfd_arch_info *info ATTRIBUTE_UNUSED,
-	   const char *string)
-{
-  if (strcmp (string,"h8/500") == 0)
-    return TRUE;
-  if (strcmp (string,"H8/500") == 0)
-    return TRUE;
-  if (strcmp (string,"h8500") == 0)
-    return TRUE;
-  if (strcmp (string,"H8500") == 0)
-    return TRUE;
-  return FALSE;
-}
-
-const bfd_arch_info_type bfd_h8500_arch =
-{
-  16,				/* 16 bits in a word */
-  24,				/* 24 bits in an address */
-  8,				/* 8 bits in a byte */
-  bfd_arch_h8500,
-  0,				/* only 1 machine */
-  "h8500",			/* arch_name  */
-  "h8500",			/* printable name */
-  1,
-  TRUE,				/* the default machine */
-  bfd_default_compatible,
-  scan_mach,
-  bfd_arch_default_fill,
-  0,
-};
diff --git a/bfd/po/SRC-POTFILES.in b/bfd/po/SRC-POTFILES.in
index 3842c05..c79a477 100644
--- a/bfd/po/SRC-POTFILES.in
+++ b/bfd/po/SRC-POTFILES.in
@@ -29,7 +29,6 @@ coff-arm.c
 coff-aux.c
 coff-bfd.c
 coff-go32.c
-coff-h8500.c
 coff-i386.c
 coff-m68k.c
 coff-m88k.c
@@ -74,7 +73,6 @@ cpu-fr30.c
 cpu-frv.c
 cpu-ft32.c
 cpu-h8300.c
-cpu-h8500.c
 cpu-hppa.c
 cpu-i370.c
 cpu-i386.c
diff --git a/bfd/targets.c b/bfd/targets.c
index 93285b6..de50da6 100644
--- a/bfd/targets.c
+++ b/bfd/targets.c
@@ -649,7 +649,6 @@ extern const bfd_target frv_elf32_vec;
 extern const bfd_target frv_elf32_fdpic_vec;
 extern const bfd_target h8300_elf32_vec;
 extern const bfd_target h8300_elf32_linux_vec;
-extern const bfd_target h8500_coff_vec;
 extern const bfd_target hppa_elf32_vec;
 extern const bfd_target hppa_elf32_linux_vec;
 extern const bfd_target hppa_elf32_nbsd_vec;
@@ -1058,7 +1057,6 @@ static const bfd_target * const _bfd_target_vector[] =
 
 	&h8300_elf32_vec,
 	&h8300_elf32_linux_vec,
-	&h8500_coff_vec,
 
 	&hppa_elf32_vec,
 	&hppa_elf32_linux_vec,