Remove h8300-coff support

include/
	* coff/h8300.h: Delete.
bfd/
	* Makefile.am: Remove h8300-coff support.
	* coffcode.h: Likewise.
	* config.bfd: Likewise.
	* configure.ac: Likewise.
	* reloc16.c: Likewise.
	* targets.c: Likewise.
	* coff-h8300.c: Delete.
	* Makefile.in: Regenerate.
	* configure: Regenerate.
	* po/SRC-POTFILES.in: Regenerate.
binutils/
	* testsuite/binutils-all/objcopy.exp: Remove h8300-coff support.
gas/
	* config/obj-coff.h: Remove h8300-coff support.
	* config/tc-h8300.c: Likewise.
	* config/tc-h8300.h: Likewise.
	* testsuite/gas/h8300/h8300.exp: Likewise.
	* testsuite/gas/h8300/branch-coff.s: Delete.
	* testsuite/gas/h8300/branchh-coff.s: Delete.
	* testsuite/gas/h8300/branchs-coff.s: Delete.
	* testsuite/gas/h8300/ffxx1-coff.d: Delete.
	* testsuite/gas/h8300/ffxx1-coff.s: Delete.
	* testsuite/gas/h8300/h8300-coff.exp: Delete.
ld/
	* Makefile.am: Remove h8300-coff support.
	* configure.tgt: Likewise.
	* testsuite/ld-h8300/h8300.exp: Likewise.
	* emulparams/h8300.sh: Delete.
	* emulparams/h8300h.sh: Delete.
	* emulparams/h8300hn.sh: Delete.
	* emulparams/h8300s.sh: Delete.
	* emulparams/h8300sn.sh: Delete.
	* emulparams/h8300sx.sh: Delete.
	* emulparams/h8300sxn.sh: Delete.
	* scripttempl/h8300.sc: Delete.
	* scripttempl/h8300h.sc: Delete.
	* scripttempl/h8300hn.sc: Delete.
	* scripttempl/h8300s.sc: Delete.
	* scripttempl/h8300sn.sc: Delete.
	* scripttempl/h8300sx.sc: Delete.
	* scripttempl/h8300sxn.sc: Delete.
	* testsuite/ld-h8300/relax-3-coff.d: Delete.
	* testsuite/ld-h8300/relax-4-coff.d: Delete.
	* testsuite/ld-h8300/relax-5-coff.d: Delete.
	* testsuite/ld-h8300/relax-6-coff.d: Delete.
	* Makefile.in: Regenerate.
	* po/BLD-POTFILES.in: Regenerate.

24 files changed, 33 insertions, 1038 deletions

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 7b75643..a1b3ba2 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,5 +1,31 @@
 2018-04-16  Alan Modra  <amodra@gmail.com>
 
+	* Makefile.am: Remove h8300-coff support.
+	* configure.tgt: Likewise.
+	* testsuite/ld-h8300/h8300.exp: Likewise.
+	* emulparams/h8300.sh: Delete.
+	* emulparams/h8300h.sh: Delete.
+	* emulparams/h8300hn.sh: Delete.
+	* emulparams/h8300s.sh: Delete.
+	* emulparams/h8300sn.sh: Delete.
+	* emulparams/h8300sx.sh: Delete.
+	* emulparams/h8300sxn.sh: Delete.
+	* scripttempl/h8300.sc: Delete.
+	* scripttempl/h8300h.sc: Delete.
+	* scripttempl/h8300hn.sc: Delete.
+	* scripttempl/h8300s.sc: Delete.
+	* scripttempl/h8300sn.sc: Delete.
+	* scripttempl/h8300sx.sc: Delete.
+	* scripttempl/h8300sxn.sc: Delete.
+	* testsuite/ld-h8300/relax-3-coff.d: Delete.
+	* testsuite/ld-h8300/relax-4-coff.d: Delete.
+	* testsuite/ld-h8300/relax-5-coff.d: Delete.
+	* testsuite/ld-h8300/relax-6-coff.d: Delete.
+	* Makefile.in: Regenerate.
+	* po/BLD-POTFILES.in: Regenerate.
+
+2018-04-16  Alan Modra  <amodra@gmail.com>
+
 	* ld.texinfo: Remove IEEE 695 support.
 	* mri.c: Likewise.
 
diff --git a/ld/Makefile.am b/ld/Makefile.am
index 8a3834a..b4aa709 100644
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -294,23 +294,16 @@ ALL_EMULATION_SOURCES = \
 	eelf_i386_vxworks.c \
 	eelf_iamcu.c \
 	eelf_s390.c \
-	eh8300.c \
 	eh8300elf.c \
 	eh8300elf_linux.c \
-	eh8300h.c \
 	eh8300helf.c \
 	eh8300helf_linux.c \
-	eh8300hn.c \
 	eh8300hnelf.c \
-	eh8300s.c \
 	eh8300self.c \
 	eh8300self_linux.c \
-	eh8300sn.c \
 	eh8300snelf.c \
-	eh8300sx.c \
 	eh8300sxelf.c \
 	eh8300sxelf_linux.c \
-	eh8300sxn.c \
 	eh8300sxnelf.c \
 	eh8500.c \
 	eh8500b.c \
@@ -1359,18 +1352,12 @@ eelf_iamcu.c: $(srcdir)/emulparams/elf_iamcu.sh \
 eelf_s390.c: $(srcdir)/emulparams/elf_s390.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 
-eh8300.c: $(srcdir)/emulparams/h8300.sh \
-  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8300.sc ${GEN_DEPENDS}
-
 eh8300elf.c: $(srcdir)/emulparams/h8300elf.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 
 eh8300elf_linux.c: $(srcdir)/emulparams/h8300elf_linux.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 
-eh8300h.c: $(srcdir)/emulparams/h8300h.sh \
-  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8300h.sc ${GEN_DEPENDS}
-
 eh8300helf.c: $(srcdir)/emulparams/h8300helf.sh \
   $(srcdir)/emulparams/h8300elf.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
@@ -1379,16 +1366,10 @@ eh8300helf_linux.c: $(srcdir)/emulparams/h8300helf_linux.sh \
   $(srcdir)/emulparams/h8300elf_linux.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 
-eh8300hn.c: $(srcdir)/emulparams/h8300hn.sh \
-  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8300hn.sc ${GEN_DEPENDS}
-
 eh8300hnelf.c: $(srcdir)/emulparams/h8300hnelf.sh \
   $(srcdir)/emulparams/h8300elf.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 
-eh8300s.c: $(srcdir)/emulparams/h8300s.sh \
-  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8300s.sc ${GEN_DEPENDS}
-
 eh8300self.c: $(srcdir)/emulparams/h8300self.sh \
   $(srcdir)/emulparams/h8300elf.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
@@ -1397,16 +1378,10 @@ eh8300self_linux.c: $(srcdir)/emulparams/h8300self_linux.sh \
   $(srcdir)/emulparams/h8300elf.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 
-eh8300sn.c: $(srcdir)/emulparams/h8300sn.sh \
-  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8300sn.sc ${GEN_DEPENDS}
-
 eh8300snelf.c: $(srcdir)/emulparams/h8300snelf.sh \
   $(srcdir)/emulparams/h8300elf.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 
-eh8300sx.c: $(srcdir)/emulparams/h8300sx.sh \
-  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8300sx.sc ${GEN_DEPENDS}
-
 eh8300sxelf.c: $(srcdir)/emulparams/h8300sxelf.sh \
   $(srcdir)/emulparams/h8300elf.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
@@ -1415,9 +1390,6 @@ eh8300sxelf_linux.c: $(srcdir)/emulparams/h8300sxelf_linux.sh \
   $(srcdir)/emulparams/h8300elf.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 
-eh8300sxn.c: $(srcdir)/emulparams/h8300sxn.sh \
-  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8300sxn.sc ${GEN_DEPENDS}
-
 eh8300sxnelf.c: $(srcdir)/emulparams/h8300sxnelf.sh \
   $(srcdir)/emulparams/h8300elf.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
diff --git a/ld/Makefile.in b/ld/Makefile.in
index ccdb378..8148ad0 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -663,23 +663,16 @@ ALL_EMULATION_SOURCES = \
 	eelf_i386_vxworks.c \
 	eelf_iamcu.c \
 	eelf_s390.c \
-	eh8300.c \
 	eh8300elf.c \
 	eh8300elf_linux.c \
-	eh8300h.c \
 	eh8300helf.c \
 	eh8300helf_linux.c \
-	eh8300hn.c \
 	eh8300hnelf.c \
-	eh8300s.c \
 	eh8300self.c \
 	eh8300self_linux.c \
-	eh8300sn.c \
 	eh8300snelf.c \
-	eh8300sx.c \
 	eh8300sxelf.c \
 	eh8300sxelf_linux.c \
-	eh8300sxn.c \
 	eh8300sxnelf.c \
 	eh8500.c \
 	eh8500b.c \
@@ -1320,23 +1313,16 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_fbsd.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_nacl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_sol2.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eh8300.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eh8300elf.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eh8300elf_linux.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eh8300h.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eh8300helf.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eh8300helf_linux.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eh8300hn.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eh8300hnelf.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eh8300s.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eh8300self.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eh8300self_linux.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eh8300sn.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eh8300snelf.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eh8300sx.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eh8300sxelf.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eh8300sxelf_linux.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eh8300sxn.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eh8300sxnelf.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eh8500.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eh8500b.Po@am__quote@
@@ -2913,18 +2899,12 @@ eelf_iamcu.c: $(srcdir)/emulparams/elf_iamcu.sh \
 eelf_s390.c: $(srcdir)/emulparams/elf_s390.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 
-eh8300.c: $(srcdir)/emulparams/h8300.sh \
-  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8300.sc ${GEN_DEPENDS}
-
 eh8300elf.c: $(srcdir)/emulparams/h8300elf.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 
 eh8300elf_linux.c: $(srcdir)/emulparams/h8300elf_linux.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 
-eh8300h.c: $(srcdir)/emulparams/h8300h.sh \
-  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8300h.sc ${GEN_DEPENDS}
-
 eh8300helf.c: $(srcdir)/emulparams/h8300helf.sh \
   $(srcdir)/emulparams/h8300elf.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
@@ -2933,16 +2913,10 @@ eh8300helf_linux.c: $(srcdir)/emulparams/h8300helf_linux.sh \
   $(srcdir)/emulparams/h8300elf_linux.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 
-eh8300hn.c: $(srcdir)/emulparams/h8300hn.sh \
-  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8300hn.sc ${GEN_DEPENDS}
-
 eh8300hnelf.c: $(srcdir)/emulparams/h8300hnelf.sh \
   $(srcdir)/emulparams/h8300elf.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 
-eh8300s.c: $(srcdir)/emulparams/h8300s.sh \
-  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8300s.sc ${GEN_DEPENDS}
-
 eh8300self.c: $(srcdir)/emulparams/h8300self.sh \
   $(srcdir)/emulparams/h8300elf.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
@@ -2951,16 +2925,10 @@ eh8300self_linux.c: $(srcdir)/emulparams/h8300self_linux.sh \
   $(srcdir)/emulparams/h8300elf.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 
-eh8300sn.c: $(srcdir)/emulparams/h8300sn.sh \
-  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8300sn.sc ${GEN_DEPENDS}
-
 eh8300snelf.c: $(srcdir)/emulparams/h8300snelf.sh \
   $(srcdir)/emulparams/h8300elf.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 
-eh8300sx.c: $(srcdir)/emulparams/h8300sx.sh \
-  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8300sx.sc ${GEN_DEPENDS}
-
 eh8300sxelf.c: $(srcdir)/emulparams/h8300sxelf.sh \
   $(srcdir)/emulparams/h8300elf.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
@@ -2969,9 +2937,6 @@ eh8300sxelf_linux.c: $(srcdir)/emulparams/h8300sxelf_linux.sh \
   $(srcdir)/emulparams/h8300elf.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 
-eh8300sxn.c: $(srcdir)/emulparams/h8300sxn.sh \
-  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8300sxn.sc ${GEN_DEPENDS}
-
 eh8300sxnelf.c: $(srcdir)/emulparams/h8300sxnelf.sh \
   $(srcdir)/emulparams/h8300elf.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
diff --git a/ld/configure.tgt b/ld/configure.tgt
index 0ebfb39..9cf4e78 100644
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -218,8 +218,6 @@ moxie-*-moxiebox*)	targ_emul=moxiebox
 			;;
 moxie-*-*)		targ_emul=elf32moxie
 			;;
-h8300-*-hms* | h8300-*-coff*)
-			targ_emul=h8300; targ_extra_emuls="h8300h h8300s h8300hn h8300sn h8300sx h8300sxn" ;;
 h8300-*-elf* | h8300-*-rtems*)
 			targ_emul=h8300elf;
 			targ_extra_emuls="h8300helf h8300self h8300hnelf h8300snelf h8300sxelf h8300sxnelf" ;;
diff --git a/ld/emulparams/h8300.sh b/ld/emulparams/h8300.sh
deleted file mode 100644
index 7042535..0000000
--- a/ld/emulparams/h8300.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-SCRIPT_NAME=h8300
-OUTPUT_FORMAT="coff-h8300"
-TEXT_START_ADDR=0x8000
-TARGET_PAGE_SIZE=128
-ARCH=h8300
-TINY_READONLY_SECTION=".tinyrodata :
-  {
-	*(.tinyrodata)
-  } =0"
-TINY_DATA_SECTION=".tinydata	0xff8000 :
-  {
-	*(.tinydata)
-	${RELOCATING+ _tinydata = .; }
-  }"
-TINY_BSS_SECTION=".tinybss	: AT (_tinydata)
-  {
-	*(.tinybss)
-  }"
diff --git a/ld/emulparams/h8300h.sh b/ld/emulparams/h8300h.sh
deleted file mode 100644
index 3ab794e..0000000
--- a/ld/emulparams/h8300h.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-SCRIPT_NAME=h8300h
-OUTPUT_FORMAT="coff-h8300"
-TEXT_START_ADDR=0x8000
-TARGET_PAGE_SIZE=128
-ARCH=h8300
diff --git a/ld/emulparams/h8300hn.sh b/ld/emulparams/h8300hn.sh
deleted file mode 100644
index d349082..0000000
--- a/ld/emulparams/h8300hn.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-SCRIPT_NAME=h8300hn
-OUTPUT_FORMAT="coff-h8300"
-TEXT_START_ADDR=0x8000
-TARGET_PAGE_SIZE=128
-ARCH=h8300
diff --git a/ld/emulparams/h8300s.sh b/ld/emulparams/h8300s.sh
deleted file mode 100644
index e27b4f5..0000000
--- a/ld/emulparams/h8300s.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-SCRIPT_NAME=h8300s
-OUTPUT_FORMAT="coff-h8300"
-TEXT_START_ADDR=0x8000
-TARGET_PAGE_SIZE=128
-ARCH=h8300
diff --git a/ld/emulparams/h8300sn.sh b/ld/emulparams/h8300sn.sh
deleted file mode 100644
index 16364ef..0000000
--- a/ld/emulparams/h8300sn.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-SCRIPT_NAME=h8300sn
-OUTPUT_FORMAT="coff-h8300"
-TEXT_START_ADDR=0x8000
-TARGET_PAGE_SIZE=128
-ARCH=h8300
diff --git a/ld/emulparams/h8300sx.sh b/ld/emulparams/h8300sx.sh
deleted file mode 100644
index b46b6f9..0000000
--- a/ld/emulparams/h8300sx.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-SCRIPT_NAME=h8300sx
-OUTPUT_FORMAT="coff-h8300"
-TEXT_START_ADDR=0x8000
-TARGET_PAGE_SIZE=128
-ARCH=h8300
diff --git a/ld/emulparams/h8300sxn.sh b/ld/emulparams/h8300sxn.sh
deleted file mode 100644
index 7cad974..0000000
--- a/ld/emulparams/h8300sxn.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-SCRIPT_NAME=h8300sxn
-OUTPUT_FORMAT="coff-h8300"
-TEXT_START_ADDR=0x8000
-TARGET_PAGE_SIZE=128
-ARCH=h8300
diff --git a/ld/po/BLD-POTFILES.in b/ld/po/BLD-POTFILES.in
index 41ab032..30d340f 100644
--- a/ld/po/BLD-POTFILES.in
+++ b/ld/po/BLD-POTFILES.in
@@ -208,23 +208,16 @@ eelf_x86_64_cloudabi.c
 eelf_x86_64_fbsd.c
 eelf_x86_64_nacl.c
 eelf_x86_64_sol2.c
-eh8300.c
 eh8300elf.c
 eh8300elf_linux.c
-eh8300h.c
 eh8300helf.c
 eh8300helf_linux.c
-eh8300hn.c
 eh8300hnelf.c
-eh8300s.c
 eh8300self.c
 eh8300self_linux.c
-eh8300sn.c
 eh8300snelf.c
-eh8300sx.c
 eh8300sxelf.c
 eh8300sxelf_linux.c
-eh8300sxn.c
 eh8300sxnelf.c
 eh8500.c
 eh8500b.c
diff --git a/ld/scripttempl/h8300.sc b/ld/scripttempl/h8300.sc
deleted file mode 100644
index 9443ff8..0000000
--- a/ld/scripttempl/h8300.sc
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
-#
-# Copying and distribution of this file, with or without modification,
-# are permitted in any medium without royalty provided the copyright
-# notice and this notice are preserved.
-
-TORS=".tors :
-	{
-	  ___ctors = . ;
-	  *(.ctors)
-	  ___ctors_end = . ;
-	  ___dtors = . ;
-	  *(.dtors)
-	  ___dtors_end = . ;
-	} > ram"
-
-cat <<EOF
-/* Copyright (C) 2014-2018 Free Software Foundation, Inc.
-
-   Copying and distribution of this script, with or without modification,
-   are permitted in any medium without royalty provided the copyright
-   notice and this notice are preserved.  */
-
-OUTPUT_FORMAT("${OUTPUT_FORMAT}")
-OUTPUT_ARCH(${ARCH})
-${RELOCATING+ENTRY ("_start")}
-
-MEMORY
-{
-	/* 0xc4 is a magic entry.  We should have the linker just
-	   skip over it one day...  */
-	vectors : o = 0x0000, l = 0xc4
-	magicvectors : o = 0xc4, l = 0x3c
-	ram    : o = 0x0100, l = 0xfdfc
-	/* The stack starts at the top of main ram.  */
-	topram : o = 0xfefc, l = 0x4
-	/* At the very top of the address space is the 8-bit area.  */
-	eight : o = 0xff00, l = 0x100
-}
-
-SECTIONS
-{
-.vectors :
-	{
-	  /* Use something like this to place a specific
-	     function's address into the vector table.
-
-	     SHORT (ABSOLUTE (_foobar)).  */
-
-	  *(.vectors)
-	} ${RELOCATING+ > vectors}
-
-.init :
-	{
-	  *(.init)
-	} ${RELOCATING+ > ram}
-
-.text :
-	{
-	  *(.rodata)
-	  *(.text)
-	  *(.text.*)
-	  *(.strings)
-	  ${RELOCATING+ _etext = . ; }
-	} ${RELOCATING+ > ram}
-
-${CONSTRUCTING+${TORS}}
-
-.data :
-	{
-	  *(.data)
-	  *(.data.*)
-	  *(.tiny)
-	  ${RELOCATING+ _edata = . ; }
-	} ${RELOCATING+ > ram}
-
-.bss :
-	{
-	  ${RELOCATING+ _bss_start = . ;}
-	  *(.bss)
-	  *(COMMON)
-	  ${RELOCATING+ _end = . ;  }
-	} ${RELOCATING+ >ram}
-
-.stack :
-	{
-	  ${RELOCATING+ _stack = . ; }
-	  *(.stack)
-	} ${RELOCATING+ > topram}
-
-.eight :
-	{
-	  *(.eight)
-	} ${RELOCATING+ > eight}
-
-.stab 0 ${RELOCATING+(NOLOAD)} :
-	{
-	  [ .stab ]
-	}
-
-.stabstr 0 ${RELOCATING+(NOLOAD)} :
-	{
-	  [ .stabstr ]
-	}
-}
-EOF
diff --git a/ld/scripttempl/h8300h.sc b/ld/scripttempl/h8300h.sc
deleted file mode 100644
index 9b7ba37..0000000
--- a/ld/scripttempl/h8300h.sc
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
-#
-# Copying and distribution of this file, with or without modification,
-# are permitted in any medium without royalty provided the copyright
-# notice and this notice are preserved.
-
-TORS=".tors :
-	{
-	  ___ctors = . ;
-	  *(.ctors)
-	  ___ctors_end = . ;
-	  ___dtors = . ;
-	  *(.dtors)
-	  ___dtors_end = . ;
-	} > ram"
-
-cat <<EOF
-/* Copyright (C) 2014-2018 Free Software Foundation, Inc.
-
-   Copying and distribution of this script, with or without modification,
-   are permitted in any medium without royalty provided the copyright
-   notice and this notice are preserved.  */
-
-OUTPUT_FORMAT("${OUTPUT_FORMAT}")
-OUTPUT_ARCH(h8300h)
-${RELOCATING+ENTRY ("_start")}
-
-/* The memory size is 256KB to coincide with the simulator.
-   Don't change either without considering the other.  */
-
-MEMORY
-{
-	/* 0xc4 is a magic entry.  We should have the linker just
-	   skip over it one day...  */
-	vectors : o = 0x0000, l = 0xc4
-	magicvectors : o = 0xc4, l = 0x3c
-	/* We still only use 256k as the main ram size.  */
-	ram    : o = 0x0100, l = 0x3fefc
-	/* The stack starts at the top of main ram.  */
-	topram : o = 0x3fffc, l = 0x4
-	/* This holds variables in the "tiny" sections.  */
-	tiny   : o = 0xff8000, l = 0x7f00
-	/* At the very top of the address space is the 8-bit area.  */
-	eight  : o = 0xffff00, l = 0x100
-}
-
-SECTIONS
-{
-.vectors :
-	{
-	  /* Use something like this to place a specific
-	     function's address into the vector table.
-
-	     LONG (ABSOLUTE (_foobar)).  */
-
-	  *(.vectors)
-	} ${RELOCATING+ > vectors}
-
-.text :
-	{
-	  *(.rodata)
-	  *(.text)
-	  *(.strings)
-	  ${RELOCATING+ _etext = . ; }
-	} ${RELOCATING+ > ram}
-
-${CONSTRUCTING+${TORS}}
-
-.data :
-	{
-	  *(.data)
-	  ${RELOCATING+ _edata = . ; }
-	} ${RELOCATING+ > ram}
-
-.bss :
-	{
-	  ${RELOCATING+ _bss_start = . ;}
-	  *(.bss)
-	  *(COMMON)
-	  ${RELOCATING+ _end = . ;  }
-	} ${RELOCATING+ >ram}
-
-.stack :
-	{
-	  ${RELOCATING+ _stack = . ; }
-	  *(.stack)
-	} ${RELOCATING+ > topram}
-
-.tiny :
-	{
-	  *(.tiny)
-	} ${RELOCATING+ > tiny}
-
-.eight :
-	{
-	  *(.eight)
-	} ${RELOCATING+ > eight}
-
-.stab 0 ${RELOCATING+(NOLOAD)} :
-	{
-	  [ .stab ]
-	}
-
-.stabstr 0 ${RELOCATING+(NOLOAD)} :
-	{
-	  [ .stabstr ]
-	}
-}
-EOF
diff --git a/ld/scripttempl/h8300hn.sc b/ld/scripttempl/h8300hn.sc
deleted file mode 100644
index 0098e72..0000000
--- a/ld/scripttempl/h8300hn.sc
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
-#
-# Copying and distribution of this file, with or without modification,
-# are permitted in any medium without royalty provided the copyright
-# notice and this notice are preserved.
-
-TORS=".tors :
-	{
-	  ___ctors = . ;
-	  *(.ctors)
-	  ___ctors_end = . ;
-	  ___dtors = . ;
-	  *(.dtors)
-	  ___dtors_end = . ;
-	} > ram"
-
-cat <<EOF
-/* Copyright (C) 2014-2018 Free Software Foundation, Inc.
-
-   Copying and distribution of this script, with or without modification,
-   are permitted in any medium without royalty provided the copyright
-   notice and this notice are preserved.  */
-
-OUTPUT_FORMAT("${OUTPUT_FORMAT}")
-OUTPUT_ARCH(h8300hn)
-${RELOCATING+ENTRY ("_start")}
-
-MEMORY
-{
-	/* 0xc4 is a magic entry.  We should have the linker just
-	   skip over it one day...  */
-	vectors : o = 0x0000, l = 0xc4
-	magicvectors : o = 0xc4, l = 0x3c
-	ram    : o = 0x0100, l = 0xfdfc
-	/* The stack starts at the top of main ram.  */
-	topram : o = 0xfefc, l = 0x4
-	/* At the very top of the address space is the 8-bit area.  */
-	eight : o = 0xff00, l = 0x100
-}
-
-SECTIONS
-{
-.vectors :
-	{
-	  /* Use something like this to place a specific
-	     function's address into the vector table.
-
-	     SHORT (ABSOLUTE (_foobar)).  */
-
-	  *(.vectors)
-	} ${RELOCATING+ > vectors}
-
-.text :
-	{
-	  *(.rodata)
-	  *(.text)
-	  *(.strings)
-	  ${RELOCATING+ _etext = . ; }
-	} ${RELOCATING+ > ram}
-
-${CONSTRUCTING+${TORS}}
-
-.data :
-	{
-	  *(.data)
-	  *(.tiny)
-	  ${RELOCATING+ _edata = . ; }
-	} ${RELOCATING+ > ram}
-
-.bss :
-	{
-	  ${RELOCATING+ _bss_start = . ;}
-	  *(.bss)
-	  *(COMMON)
-	  ${RELOCATING+ _end = . ;  }
-	} ${RELOCATING+ >ram}
-
-.stack :
-	{
-	  ${RELOCATING+ _stack = . ; }
-	  *(.stack)
-	} ${RELOCATING+ > topram}
-
-.eight :
-	{
-	  *(.eight)
-	} ${RELOCATING+ > eight}
-
-.stab 0 ${RELOCATING+(NOLOAD)} :
-	{
-	  [ .stab ]
-	}
-
-.stabstr 0 ${RELOCATING+(NOLOAD)} :
-	{
-	  [ .stabstr ]
-	}
-}
-EOF
diff --git a/ld/scripttempl/h8300s.sc b/ld/scripttempl/h8300s.sc
deleted file mode 100644
index e9eb4e1..0000000
--- a/ld/scripttempl/h8300s.sc
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
-#
-# Copying and distribution of this file, with or without modification,
-# are permitted in any medium without royalty provided the copyright
-# notice and this notice are preserved.
-
-TORS=".tors :
-	{
-	  ___ctors = . ;
-	  *(.ctors)
-	  ___ctors_end = . ;
-	  ___dtors = . ;
-	  *(.dtors)
-	  ___dtors_end = . ;
-	} > ram"
-
-cat <<EOF
-/* Copyright (C) 2014-2018 Free Software Foundation, Inc.
-
-   Copying and distribution of this script, with or without modification,
-   are permitted in any medium without royalty provided the copyright
-   notice and this notice are preserved.  */
-
-OUTPUT_FORMAT("${OUTPUT_FORMAT}")
-OUTPUT_ARCH(h8300s)
-${RELOCATING+ENTRY ("_start")}
-
-/* The memory size is 256KB to coincide with the simulator.
-   Don't change either without considering the other.  */
-
-MEMORY
-{
-	/* 0xc4 is a magic entry.  We should have the linker just
-	   skip over it one day...  */
-	vectors : o = 0x0000, l = 0xc4
-	magicvectors : o = 0xc4, l = 0x3c
-	/* We still only use 256k as the main ram size.  */
-	ram    : o = 0x0100, l = 0x3fefc
-	/* The stack starts at the top of main ram.  */
-	topram : o = 0x3fffc, l = 0x4
-	/* This holds variables in the "tiny" sections.  */
-	tiny   : o = 0xff8000, l = 0x7f00
-	/* At the very top of the address space is the 8-bit area.  */
-	eight  : o = 0xffff00, l = 0x100
-}
-
-SECTIONS
-{
-.vectors :
-	{
-	  /* Use something like this to place a specific
-	     function's address into the vector table.
-
-	     LONG (ABSOLUTE (_foobar)).  */
-
-	  *(.vectors)
-	} ${RELOCATING+ > vectors}
-
-.text :
-	{
-	  *(.rodata)
-	  *(.text)
-	  *(.strings)
-	  ${RELOCATING+ _etext = . ; }
-	} ${RELOCATING+ > ram}
-
-${CONSTRUCTING+${TORS}}
-
-.data :
-	{
-	  *(.data)
-	  ${RELOCATING+ _edata = . ; }
-	} ${RELOCATING+ > ram}
-
-.bss :
-	{
-	  ${RELOCATING+ _bss_start = . ;}
-	  *(.bss)
-	  *(COMMON)
-	  ${RELOCATING+ _end = . ;  }
-	} ${RELOCATING+ >ram}
-
-.stack :
-	{
-	  ${RELOCATING+ _stack = . ; }
-	  *(.stack)
-	} ${RELOCATING+ > topram}
-
-.tiny :
-	{
-	  *(.tiny)
-	} ${RELOCATING+ > tiny}
-
-.eight :
-	{
-	  *(.eight)
-	} ${RELOCATING+ > eight}
-
-.stab 0 ${RELOCATING+(NOLOAD)} :
-	{
-	  [ .stab ]
-	}
-
-.stabstr 0 ${RELOCATING+(NOLOAD)} :
-	{
-	  [ .stabstr ]
-	}
-}
-EOF
diff --git a/ld/scripttempl/h8300sn.sc b/ld/scripttempl/h8300sn.sc
deleted file mode 100644
index 961ef87..0000000
--- a/ld/scripttempl/h8300sn.sc
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
-#
-# Copying and distribution of this file, with or without modification,
-# are permitted in any medium without royalty provided the copyright
-# notice and this notice are preserved.
-
-TORS=".tors :
-	{
-	  ___ctors = . ;
-	  *(.ctors)
-	  ___ctors_end = . ;
-	  ___dtors = . ;
-	  *(.dtors)
-	  ___dtors_end = . ;
-	} > ram"
-
-cat <<EOF
-/* Copyright (C) 2014-2018 Free Software Foundation, Inc.
-
-   Copying and distribution of this script, with or without modification,
-   are permitted in any medium without royalty provided the copyright
-   notice and this notice are preserved.  */
-
-OUTPUT_FORMAT("${OUTPUT_FORMAT}")
-OUTPUT_ARCH(h8300sn)
-${RELOCATING+ENTRY ("_start")}
-
-MEMORY
-{
-	/* 0xc4 is a magic entry.  We should have the linker just
-	   skip over it one day...  */
-	vectors : o = 0x0000, l = 0xc4
-	magicvectors : o = 0xc4, l = 0x3c
-	ram    : o = 0x0100, l = 0xfdfc
-	/* The stack starts at the top of main ram.  */
-	topram : o = 0xfefc, l = 0x4
-	/* At the very top of the address space is the 8-bit area.  */
-	eight : o = 0xff00, l = 0x100
-}
-
-SECTIONS
-{
-.vectors :
-	{
-	  /* Use something like this to place a specific
-	     function's address into the vector table.
-
-	     SHORT (ABSOLUTE (_foobar)).  */
-
-	  *(.vectors)
-	} ${RELOCATING+ > vectors}
-
-.text :
-	{
-	  *(.rodata)
-	  *(.text)
-	  *(.strings)
-	  ${RELOCATING+ _etext = . ; }
-	} ${RELOCATING+ > ram}
-
-${CONSTRUCTING+${TORS}}
-
-.data :
-	{
-	  *(.data)
-	  *(.tiny)
-	  ${RELOCATING+ _edata = . ; }
-	} ${RELOCATING+ > ram}
-
-.bss :
-	{
-	  ${RELOCATING+ _bss_start = . ;}
-	  *(.bss)
-	  *(COMMON)
-	  ${RELOCATING+ _end = . ;  }
-	} ${RELOCATING+ >ram}
-
-.stack :
-	{
-	  ${RELOCATING+ _stack = . ; }
-	  *(.stack)
-	} ${RELOCATING+ > topram}
-
-.eight :
-	{
-	  *(.eight)
-	} ${RELOCATING+ > eight}
-
-.stab 0 ${RELOCATING+(NOLOAD)} :
-	{
-	  [ .stab ]
-	}
-
-.stabstr 0 ${RELOCATING+(NOLOAD)} :
-	{
-	  [ .stabstr ]
-	}
-}
-EOF
diff --git a/ld/scripttempl/h8300sx.sc b/ld/scripttempl/h8300sx.sc
deleted file mode 100644
index ea8d49b..0000000
--- a/ld/scripttempl/h8300sx.sc
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
-#
-# Copying and distribution of this file, with or without modification,
-# are permitted in any medium without royalty provided the copyright
-# notice and this notice are preserved.
-
-TORS=".tors :
-	{
-	  ___ctors = . ;
-	  *(.ctors)
-	  ___ctors_end = . ;
-	  ___dtors = . ;
-	  *(.dtors)
-	  ___dtors_end = . ;
-	} > ram"
-
-cat <<EOF
-/* Copyright (C) 2014-2018 Free Software Foundation, Inc.
-
-   Copying and distribution of this script, with or without modification,
-   are permitted in any medium without royalty provided the copyright
-   notice and this notice are preserved.  */
-
-OUTPUT_FORMAT("${OUTPUT_FORMAT}")
-OUTPUT_ARCH(h8300sx)
-${RELOCATING+ENTRY ("_start")}
-
-/* The memory size is 256KB to coincide with the simulator.
-   Don't change either without considering the other.  */
-
-MEMORY
-{
-	/* 0xc4 is a magic entry.  We should have the linker just
-	   skip over it one day...  */
-	vectors : o = 0x0000, l = 0xc4
-	magicvectors : o = 0xc4, l = 0x3c
-	/* We still only use 256k as the main ram size.  */
-	ram    : o = 0x0100, l = 0x3fefc
-	/* The stack starts at the top of main ram.  */
-	topram : o = 0x3fffc, l = 0x4
-	/* This holds variables in the "tiny" sections.  */
-	tiny   : o = 0xff8000, l = 0x7f00
-	/* At the very top of the address space is the 8-bit area.  */
-	eight  : o = 0xffff00, l = 0x100
-}
-
-SECTIONS
-{
-.vectors :
-	{
-	  /* Use something like this to place a specific
-	     function's address into the vector table.
-
-	     LONG (ABSOLUTE (_foobar)).  */
-
-	  *(.vectors)
-	} ${RELOCATING+ > vectors}
-
-.text :
-	{
-	  *(.rodata)
-	  *(.text)
-	  *(.strings)
-	  ${RELOCATING+ _etext = . ; }
-	} ${RELOCATING+ > ram}
-
-${CONSTRUCTING+${TORS}}
-
-.data :
-	{
-	  *(.data)
-	  ${RELOCATING+ _edata = . ; }
-	} ${RELOCATING+ > ram}
-
-.bss :
-	{
-	  ${RELOCATING+ _bss_start = . ;}
-	  *(.bss)
-	  *(COMMON)
-	  ${RELOCATING+ _end = . ;  }
-	} ${RELOCATING+ >ram}
-
-.stack :
-	{
-	  ${RELOCATING+ _stack = . ; }
-	  *(.stack)
-	} ${RELOCATING+ > topram}
-
-.tiny :
-	{
-	  *(.tiny)
-	} ${RELOCATING+ > tiny}
-
-.eight :
-	{
-	  *(.eight)
-	} ${RELOCATING+ > eight}
-
-.stab 0 ${RELOCATING+(NOLOAD)} :
-	{
-	  [ .stab ]
-	}
-
-.stabstr 0 ${RELOCATING+(NOLOAD)} :
-	{
-	  [ .stabstr ]
-	}
-}
-EOF
diff --git a/ld/scripttempl/h8300sxn.sc b/ld/scripttempl/h8300sxn.sc
deleted file mode 100644
index 6b4d3a6..0000000
--- a/ld/scripttempl/h8300sxn.sc
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
-#
-# Copying and distribution of this file, with or without modification,
-# are permitted in any medium without royalty provided the copyright
-# notice and this notice are preserved.
-
-TORS=".tors :
-	{
-	  ___ctors = . ;
-	  *(.ctors)
-	  ___ctors_end = . ;
-	  ___dtors = . ;
-	  *(.dtors)
-	  ___dtors_end = . ;
-	} > ram"
-
-cat <<EOF
-/* Copyright (C) 2014-2018 Free Software Foundation, Inc.
-
-   Copying and distribution of this script, with or without modification,
-   are permitted in any medium without royalty provided the copyright
-   notice and this notice are preserved.  */
-
-OUTPUT_FORMAT("${OUTPUT_FORMAT}")
-OUTPUT_ARCH(h8300sxn)
-${RELOCATING+ENTRY ("_start")}
-
-MEMORY
-{
-	/* 0xc4 is a magic entry.  We should have the linker just
-	   skip over it one day...  */
-	vectors : o = 0x0000, l = 0xc4
-	magicvectors : o = 0xc4, l = 0x3c
-	ram    : o = 0x0100, l = 0xfdfc
-	/* The stack starts at the top of main ram.  */
-	topram : o = 0xfefc, l = 0x4
-	/* At the very top of the address space is the 8-bit area.  */
-	eight : o = 0xff00, l = 0x100
-}
-
-SECTIONS
-{
-.vectors :
-	{
-	  /* Use something like this to place a specific
-	     function's address into the vector table.
-
-	     SHORT (ABSOLUTE (_foobar)).  */
-
-	  *(.vectors)
-	} ${RELOCATING+ > vectors}
-
-.text :
-	{
-	  *(.rodata)
-	  *(.text)
-	  *(.strings)
-	  ${RELOCATING+ _etext = . ; }
-	} ${RELOCATING+ > ram}
-
-${CONSTRUCTING+${TORS}}
-
-.data :
-	{
-	  *(.data)
-	  *(.tiny)
-	  ${RELOCATING+ _edata = . ; }
-	} ${RELOCATING+ > ram}
-
-.bss :
-	{
-	  ${RELOCATING+ _bss_start = . ;}
-	  *(.bss)
-	  *(COMMON)
-	  ${RELOCATING+ _end = . ;  }
-	} ${RELOCATING+ >ram}
-
-.stack :
-	{
-	  ${RELOCATING+ _stack = . ; }
-	  *(.stack)
-	} ${RELOCATING+ > topram}
-
-.eight :
-	{
-	  *(.eight)
-	} ${RELOCATING+ > eight}
-
-.stab 0 ${RELOCATING+(NOLOAD)} :
-	{
-	  [ .stab ]
-	}
-
-.stabstr 0 ${RELOCATING+(NOLOAD)} :
-	{
-	  [ .stabstr ]
-	}
-}
-EOF
diff --git a/ld/testsuite/ld-h8300/h8300.exp b/ld/testsuite/ld-h8300/h8300.exp
index 316bbd9..4a550a1 100644
--- a/ld/testsuite/ld-h8300/h8300.exp
+++ b/ld/testsuite/ld-h8300/h8300.exp
@@ -28,18 +28,10 @@ if ![istarget h8300-*-*] {
 }
 
 run_dump_test relax
-
-if [is_elf_format] {
-    run_dump_test relax-2
-    run_dump_test relax-3
-    run_dump_test relax-4
-    run_dump_test relax-5
-    run_dump_test relax-6
-    run_dump_test relax-7
-    run_dump_test gcsection	
-} else {
-    run_dump_test relax-3-coff
-    run_dump_test relax-4-coff
-    run_dump_test relax-5-coff
-    run_dump_test relax-6-coff
-}
+run_dump_test relax-2
+run_dump_test relax-3
+run_dump_test relax-4
+run_dump_test relax-5
+run_dump_test relax-6
+run_dump_test relax-7
+run_dump_test gcsection	
diff --git a/ld/testsuite/ld-h8300/relax-3-coff.d b/ld/testsuite/ld-h8300/relax-3-coff.d
deleted file mode 100644
index 0384398..0000000
--- a/ld/testsuite/ld-h8300/relax-3-coff.d
+++ /dev/null
@@ -1,36 +0,0 @@
-# name: H8300 Relaxation Test 3 (for COFF)
-# source: relax-3.s
-# ld: --relax -m h8300s
-# objdump: -d
-
-.*:     file format .*-h8300
-
-Disassembly of section .text:
-
-00000100 <_start>:
-#
-# Relaxation of aa:16
-#
-.*:	6a 08 00 00.*mov.b	@0x0:16,r0l
-.*:	6a 08 7f ff.*mov.b	@0x7fff:16,r0l
-.*:	6a 08 80 00.*mov.b	@0x8000:16,r0l
-.*:	6a 08 fe ff.*mov.b	@0xfeff:16,r0l
-.*:	28 00      .*mov.b	@0x0:8,r0l
-.*:	28 ff      .*mov.b	@0xff:8,r0l
-#
-# Relaxation of aa:32
-#
-.*:	6a 08 00 00.*mov.b	@0x0:16,r0l
-.*:	6a 08 7f ff.*mov.b	@0x7fff:16,r0l
-.*:	6a 28 00 00.*mov.b	@0x8000:32,r0l
-.*:	80 00 
-.*:	6a 28 00 00.*mov.b	@0xff00:32,r0l
-.*:	ff 00 
-.*:	6a 28 00 ff.*mov.b	@0xffff00:32,r0l
-.*:	ff 00 
-.*:	6a 28 ff ff.*mov.b	@0xffff7fff:32,r0l
-.*:	7f ff 
-.*:	6a 08 80 00.*mov.b	@0x8000:16,r0l
-.*:	6a 08 fe ff.*mov.b	@0xfeff:16,r0l
-.*:	28 00      .*mov.b	@0x0:8,r0l
-.*:	28 ff      .*mov.b	@0xff:8,r0l
diff --git a/ld/testsuite/ld-h8300/relax-4-coff.d b/ld/testsuite/ld-h8300/relax-4-coff.d
deleted file mode 100644
index d6417ac..0000000
--- a/ld/testsuite/ld-h8300/relax-4-coff.d
+++ /dev/null
@@ -1,76 +0,0 @@
-# name: H8300 Relaxation Test 4 (for COFF)
-# source: relax-4.s
-# ld: --relax -m h8300s
-# objdump: -d
-
-.*:     file format .*-h8300
-
-Disassembly of section .text:
-
-00000100 <_start>:
- 100:	f8 03.*mov.b	#0x3,r0l
- 102:	fa 05.*mov.b	#0x5,r2l
- 104:	7f ff 60 80.*bset	r0l,@0xff:8
- 108:	7f 00 60 a0.*bset	r2l,@0x0:8
- 10c:	7e ff 63 a0.*btst	r2l,@0xff:8
- 110:	7e 00 63 80.*btst	r0l,@0x0:8
- 114:	6a 18 00 00.*bset	#0x5,@0x0:16
- 118:	70 50 
- 11a:	6a 18 7f ff.*bset	#0x5,@0x7fff:16
- 11e:	70 50 
- 120:	6a 18 80 00.*bset	#0x5,@0x8000:16
- 124:	70 50 
- 126:	6a 18 fe ff.*bset	#0x5,@0xfeff:16
- 12a:	70 50 
- 12c:	7f 00 70 50.*bset	#0x5,@0x0:8
- 130:	7f ff 70 50.*bset	#0x5,@0xff:8
- 134:	6a 10 00 00.*band	#0x5,@0x0:16
- 138:	76 50 
- 13a:	6a 10 7f ff.*band	#0x5,@0x7fff:16
- 13e:	76 50 
- 140:	6a 10 80 00.*band	#0x5,@0x8000:16
- 144:	76 50 
- 146:	6a 10 fe ff.*band	#0x5,@0xfeff:16
- 14a:	76 50 
- 14c:	7e 00 76 50.*band	#0x5,@0x0:8
- 150:	7e ff 76 50.*band	#0x5,@0xff:8
- 154:	7f ff 60 a0.*bset	r2l,@0xff:8
- 158:	7f 00 60 80.*bset	r0l,@0x0:8
- 15c:	7e ff 63 80.*btst	r0l,@0xff:8
- 160:	7e 00 63 a0.*btst	r2l,@0x0:8
- 164:	6a 18 00 00.*bset	#0x6,@0x0:16
- 168:	70 60 
- 16a:	6a 18 7f ff.*bset	#0x6,@0x7fff:16
- 16e:	70 60 
- 170:	6a 38 00 00.*bset	#0x6,@0x8000:32
- 174:	80 00 70 60 
- 178:	6a 38 00 00.*bset	#0x6,@0xff00:32
- 17c:	ff 00 70 60 
- 180:	6a 38 00 ff.*bset	#0x6,@0xffff00:32
- 184:	ff 00 70 60 
- 188:	6a 38 ff ff.*bset	#0x6,@0xffff7fff:32
- 18c:	7f ff 70 60 
- 190:	6a 18 80 00.*bset	#0x6,@0x8000:16
- 194:	70 60 
- 196:	6a 18 fe ff.*bset	#0x6,@0xfeff:16
- 19a:	70 60 
- 19c:	7f 00 70 60.*bset	#0x6,@0x0:8
- 1a0:	7f ff 70 60.*bset	#0x6,@0xff:8
- 1a4:	6a 10 00 00.*band	#0x6,@0x0:16
- 1a8:	76 60 
- 1aa:	6a 10 7f ff.*band	#0x6,@0x7fff:16
- 1ae:	76 60 
- 1b0:	6a 30 00 00.*band	#0x6,@0x8000:32
- 1b4:	80 00 76 60 
- 1b8:	6a 30 00 00.*band	#0x6,@0xff00:32
- 1bc:	ff 00 76 60 
- 1c0:	6a 30 00 ff.*band	#0x6,@0xffff00:32
- 1c4:	ff 00 76 60 
- 1c8:	6a 30 ff ff.*band	#0x6,@0xffff7fff:32
- 1cc:	7f ff 76 60 
- 1d0:	6a 10 80 00.*band	#0x6,@0x8000:16
- 1d4:	76 60 
- 1d6:	6a 10 fe ff.*band	#0x6,@0xfeff:16
- 1da:	76 60 
- 1dc:	7e 00 76 60.*band	#0x6,@0x0:8
- 1e0:	7e ff 76 60.*band	#0x6,@0xff:8
diff --git a/ld/testsuite/ld-h8300/relax-5-coff.d b/ld/testsuite/ld-h8300/relax-5-coff.d
deleted file mode 100644
index eed2ba0..0000000
--- a/ld/testsuite/ld-h8300/relax-5-coff.d
+++ /dev/null
@@ -1,50 +0,0 @@
-# name: H8300 Relaxation Test 5 (for COFF)
-# source: relax-5.s
-# ld: --relax -m h8300s
-# objdump: -d --no-show-raw-insn
-
-.*:     file format .*-h8300
-
-Disassembly of section .text:
-
-00000100 <_start>:
- 100:.*ldc	@0x0:16,ccr
- 106:.*ldc	@0x7fff:16,ccr
- 10c:.*ldc	@0x8000:32,ccr
- 114:.*ldc	@0xff00:32,ccr
- 11c:.*ldc	@0xffff00:32,ccr
- 124:.*ldc	@0xffff7fff:32,ccr
- 12c:.*ldc	@0x8000:16,ccr
- 132:.*ldc	@0xfeff:16,ccr
- 138:.*ldc	@0xff00:16,ccr
- 13e:.*ldc	@0xffff:16,ccr
- 144:.*stc	ccr,@0x0:16
- 14a:.*stc	ccr,@0x7fff:16
- 150:.*stc	ccr,@0x8000:32
- 158:.*stc	ccr,@0xff00:32
- 160:.*stc	ccr,@0xffff00:32
- 168:.*stc	ccr,@0xffff7fff:32
- 170:.*stc	ccr,@0x8000:16
- 176:.*stc	ccr,@0xfeff:16
- 17c:.*stc	ccr,@0xff00:16
- 182:.*stc	ccr,@0xffff:16
- 188:.*ldc	@0x0:16,exr
- 18e:.*ldc	@0x7fff:16,exr
- 194:.*ldc	@0x8000:32,exr
- 19c:.*ldc	@0xff00:32,exr
- 1a4:.*ldc	@0xffff00:32,exr
- 1ac:.*ldc	@0xffff7fff:32,exr
- 1b4:.*ldc	@0x8000:16,exr
- 1ba:.*ldc	@0xfeff:16,exr
- 1c0:.*ldc	@0xff00:16,exr
- 1c6:.*ldc	@0xffff:16,exr
- 1cc:.*stc	exr,@0x0:16
- 1d2:.*stc	exr,@0x7fff:16
- 1d8:.*stc	exr,@0x8000:32
- 1e0:.*stc	exr,@0xff00:32
- 1e8:.*stc	exr,@0xffff00:32
- 1f0:.*stc	exr,@0xffff7fff:32
- 1f8:.*stc	exr,@0x8000:16
- 1fe:.*stc	exr,@0xfeff:16
- 204:.*stc	exr,@0xff00:16
- 20a:.*stc	exr,@0xffff:16
diff --git a/ld/testsuite/ld-h8300/relax-6-coff.d b/ld/testsuite/ld-h8300/relax-6-coff.d
deleted file mode 100644
index b9c1e2f..0000000
--- a/ld/testsuite/ld-h8300/relax-6-coff.d
+++ /dev/null
@@ -1,11 +0,0 @@
-# name: H8300 Relaxation Test 6
-# source: relax-6.s
-# ld: --relax -m h8300s
-# objdump: -d --no-show-raw-insn
-
-.*:     file format .*-h8300
-Disassembly of section .text:
-
-00000100 <_start>:
- 100:	mov.b	r2l,@0xbd:8
- 102:	rts