diff --git a/ld/.Sanitize b/ld/.Sanitize
index 91ee6643847..3f463991598 100644
--- a/ld/.Sanitize
+++ b/ld/.Sanitize
@@ -59,9 +59,9 @@ hp300bsd.sh
 h8300hms.em
 h8300hms.sc-sh
 h8300hms.sh
-h8300xray.em
-h8300xray.sc-sh
-h8300xray.sh
+h8500hms.em
+h8500hms.sc-sh
+h8500hms.sh
 i386aout.sh
 i386bsd.sh
 i386coff.sc-sh
@@ -163,7 +163,10 @@ fi
 #
 #
 # $Log$
-# Revision 1.55  1993/03/30 23:24:53  pesch
+# Revision 1.56  1993/04/09 17:44:54  sac
+# Support for the H8/500
+#
+# Revision 1.55  1993/03/30  23:24:53  pesch
 # ld.texinfo:
 # Conditionalize manual to maintain Cygnus, Hitachi versions in parallel.
 # (Texinfo conditionals are stable enough to permit this, at last!)
diff --git a/ld/config/.Sanitize b/ld/config/.Sanitize
index 42495a0f31f..bde7b6d8331 100644
--- a/ld/config/.Sanitize
+++ b/ld/config/.Sanitize
@@ -25,6 +25,7 @@ Things-to-keep:
 
 coff-a29k.mt
 coff-h8300.mt
+coff-h8500.mt
 delta88.mh
 dgux.mh
 ebmon29k.mt
diff --git a/ld/config/coff-h8500.mt b/ld/config/coff-h8500.mt
new file mode 100644
index 00000000000..4981d2154cf
--- /dev/null
+++ b/ld/config/coff-h8500.mt
@@ -0,0 +1 @@
+EMUL=h8500hms
diff --git a/ld/h8300xray.sc-sh b/ld/h8300xray.sc-sh
deleted file mode 100755
index b0a4622d1f5..00000000000
--- a/ld/h8300xray.sc-sh
+++ /dev/null
@@ -1,26 +0,0 @@
-cat <<EOF
-OUTPUT_FORMAT("${OUTPUT_FORMAT}")
-OUTPUT_ARCH(${ARCH})
-
-
-SECTIONS 				
-{ 					
-.text :
-	{ 					
-	  *(.text) 				
-	  *(.strings)
-   	  _etext = .;
-	*(.data)
-	_edata = .;
-	*(.bss)
-	*(COMMON)
-	 _end = .;
-_stack = 0xe000;	
-}
-
-}
-EOF
-
-
-
-
diff --git a/ld/h8300xray.sh b/ld/h8300xray.sh
deleted file mode 100755
index ee84e704cfd..00000000000
--- a/ld/h8300xray.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-EMULATION_NAME=h8300xray
-SCRIPT_NAME=h8300xray
-OUTPUT_FORMAT="ieee"
-TEXT_START_ADDR=0x0
-PAGE_SIZE=128
-ARCH=h8300
-TEMPLATE_NAME=h8300xray
-
diff --git a/ld/h8300xray.em b/ld/h8500hms.em
similarity index 68%
rename from ld/h8300xray.em
rename to ld/h8500hms.em
index 8b9bf226ead..2b009c11c1c 100644
--- a/ld/h8300xray.em
+++ b/ld/h8500hms.em
@@ -1,5 +1,5 @@
 cat >em_${EMULATION_NAME}.c <<EOF
-/* Copyright (C) 1991 Free Software Foundation, Inc.
+/* Copyright (C) 1993 Free Software Foundation, Inc.
 
 This file is part of GLD, the Gnu Linker.
 
@@ -18,10 +18,10 @@ along with GLD; see the file COPYING.  If not, write to
 the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /* 
- Written by Steve Chamberlain steve@cygnus.com
+ Written by Steve Chamberlain sac@cygnus.com
 
  The controller which tells the gnu linker how to behave like one for
- the Hitach H8/300 with IEEE records.
+ the Hitach H8/500.
 */
 
 #include "bfd.h"
@@ -44,37 +44,37 @@ extern bfd *output_bfd;
 
 
 
-static void h8300xray_before_parse()
+static void h8500hms_before_parse()
 {
-  ldfile_output_architecture = bfd_arch_h8300;
+  ldfile_output_architecture = bfd_arch_h8500;
 }
 
-static char *h8300xray_script =  
-#include "h8300xray.x"
+static char *h8500hms_script =  
+#include "h8500hms.x"
 ;
-static char *h8300xray_script_option_Ur  =  
-#include "h8300xray.x"
+static char *h8500hms_script_option_Ur  =  
+#include "h8500hms.xu"
 ;
-static char *h8300xray_script_option_r  =  
-#include "h8300xray.x"
+static char *h8500hms_script_option_r  =  
+#include "h8500hms.xr"
 ;
 
-static char *h8300xray_get_script()
+static char *h8500hms_get_script()
 {			     
   extern ld_config_type config;
   if (config.relocateable_output == true &&
       config.build_constructors == true) {
-    return h8300xray_script_option_Ur;
+    return h8500hms_script_option_Ur;
   }
   if (config.relocateable_output) {
-    return h8300xray_script_option_r;
+    return h8500hms_script_option_r;
   }
 	
-  return h8300xray_script;
+  return h8500hms_script;
 }
-struct ld_emulation_xfer_struct ld_h8300xray_emulation = 
+struct ld_emulation_xfer_struct ld_h8500hms_emulation = 
 {
-  h8300xray_before_parse,
+  h8500hms_before_parse,
   syslib_default,
   hll_default,
   after_parse_default,
@@ -82,7 +82,7 @@ struct ld_emulation_xfer_struct ld_h8300xray_emulation =
   set_output_arch_default,
   ldemul_default_target,
   before_allocation_default,
-  h8300xray_get_script,
-  "h8300xray"
+  h8500hms_get_script,
+  "h8500hms"
 };
 EOF
diff --git a/ld/h8500hms.sc-sh b/ld/h8500hms.sc-sh
new file mode 100755
index 00000000000..ed2d44f83e0
--- /dev/null
+++ b/ld/h8500hms.sc-sh
@@ -0,0 +1,43 @@
+cat <<EOF
+OUTPUT_FORMAT("${OUTPUT_FORMAT}")
+OUTPUT_ARCH(${ARCH})
+
+MEMORY {
+	rom   : o = 0x0000, l = 0x7fe0 
+	duart : o = 0x7fe0, l = 16
+	ram   : o = 0x8000, l = 28k
+	topram : o = 0x8000+28k, l = 1k
+	hmsram : o = 0xfb80, l = 512
+	}
+
+SECTIONS 				
+{ 					
+.text :
+	{ 					
+	  *(.text) 				
+	  *(.strings)
+   	 ${RELOCATING+ _etext = . ; }
+	} ${RELOCATING+ > ram}
+.data  :
+	{
+	*(.data)
+	${RELOCATING+ _edata = . ; }
+	} ${RELOCATING+ > ram}
+.bss  :
+	{
+	${RELOCATING+ _bss_start = . ;}
+	*(.bss)
+	*(COMMON)
+	${RELOCATING+ _end = . ;  }
+	} ${RELOCATING+ >ram}
+.stack : 
+	{
+	${RELOCATING+ _stack = . ; }
+	*(.stack)
+	} ${RELOCATING+ > topram}
+}
+EOF
+
+
+
+
diff --git a/ld/h8500hms.sh b/ld/h8500hms.sh
new file mode 100755
index 00000000000..87f1b7d92ca
--- /dev/null
+++ b/ld/h8500hms.sh
@@ -0,0 +1,7 @@
+EMULATION_NAME=h8500hms
+SCRIPT_NAME=h8500hms
+OUTPUT_FORMAT="coff-h8500"
+TEXT_START_ADDR=0x8000
+PAGE_SIZE=128
+ARCH=h8500
+TEMPLATE_NAME=h8500hms