diff --git a/ld/ChangeLog b/ld/ChangeLog
index b5cc0cd93b..d85716f02e 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,22 @@
+Tue Aug 17 07:02:19 1993  Steve Chamberlain  (sac@phydeaux.cygnus.com)
+
+	* scripttempl/h8500.sc: Start all sections in a different segment.
+	* scripttempl/z8ksim.sc: Handle constructors
+
+
+Thu Aug 12 16:05:37 1993  Jeffrey Wheat  (cassidy@cygnus.com)
+
+        * Makefile.in: revert earlier changes back to execute runtest
+          with make check. cdtest and bootstrap now function as they
+	  did within the Makefile.
+
+Thu Aug 12 10:20:05 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* Makefile.in: 	Update dependencies.
+
+	* configure.in: Set EMULATION_OFILES in Makefile based on
+	--with-targets option.
+
 Thu Aug 12 08:52:29 1993  Jeffrey Wheat  (cassidy@cygnus.com)
 
 	* Makefile.in: check targets reimplemented to old way.
diff --git a/ld/scripttempl/z8ksim.sc b/ld/scripttempl/z8ksim.sc
index 7ee132a8b2..e9627d8487 100644
--- a/ld/scripttempl/z8ksim.sc
+++ b/ld/scripttempl/z8ksim.sc
@@ -1,22 +1,50 @@
 cat <<EOF
 OUTPUT_FORMAT("${OUTPUT_FORMAT}")
-OUTPUT_ARCH(${ARCH})
-
+OUTPUT_ARCH(z8002)
+ENTRY(_start)
 
 SECTIONS 				
 { 					
-.text :
-	{ 					
+.text : { 					
 	  *(.text) 				
 	  *(.strings)
-   	  _etext = .;
-	*(.data)
-	_edata = .;
-	*(.bss)
-	*(COMMON)
-	 _end = .;
+	  *(.rdata)
+	}
 
-}
+.ctors   : 
+	{
+	  ${RELOCATING+ ___ctors = . ;  }
+	  *(.ctors);
+	  ${RELOCATING+ ___ctors_end = . ; }
+	  ___dtors = . ;
+	  *(.dtors);
+	  ${RELOCATING+ ___dtors_end = . ; }
+	} 
+
+.data : {
+	*(.data)
+	}
+
+.bss : 
+  {
+    ${RELOCATING+ __start_bss = . ; }
+    *(.bss);
+    *(COMMON);
+    ${RELOCATING+ __end_bss = . ; }
+  }
+
+.heap : {
+	${RELOCATING+ __start_heap = . ; }
+	${RELOCATING+ . = . + 20k  ; }
+	${RELOCATING+ __end_heap = . ; }
+	} 
+
+.stack ${RELOCATING+ 0xf000 }  : 
+	{
+	${RELOCATING+ _stack = . ; }
+	*(.stack)
+	${RELOCATING+ __stack_top = . ; }
+	} 
 
 }
 EOF