Thu Jul 27 15:26:28 1995 steve chamberlain <sac@slash.cygnus.com>

	* scripttempl/i386pe.sc: Cope with constructors.
	* scripttempl/z8ksim.sc: Deleted.
	* scripttempl/z8000.sc: Resurrected as this, but
	can handle z8001 and z8002 formats.
	* emulparams/z8ksim.sh: Deleted.
	* emulparams/{z8001.sh, z8002.sh}: New files.
	* config/z8ksim.mt: Deleted
	* config/z8k-coff.mt: New, generates both emulations.

9 files changed, 26 insertions, 12 deletions

diff --git a/ld/config/.Sanitize b/ld/config/.Sanitize
index dac6803..e004cc0 100644
--- a/ld/config/.Sanitize
+++ b/ld/config/.Sanitize
@@ -127,7 +127,7 @@ sun4sol2.mt
 vax.mt
 vsta.mt
 vxworks68.mt
-z8ksim.mt
+z8k-coff.mt
 
 Things-to-lose:
 
diff --git a/ld/config/z8k-coff.mt b/ld/config/z8k-coff.mt
new file mode 100644
index 0000000..ec0a07e
--- /dev/null
+++ b/ld/config/z8k-coff.mt
@@ -0,0 +1,5 @@
+EMUL=z8001
+EMUL=z8002
+
+
+
diff --git a/ld/config/z8ksim.mt b/ld/config/z8ksim.mt
deleted file mode 100644
index 5a01485..0000000
--- a/ld/config/z8ksim.mt
+++ /dev/null
@@ -1,2 +0,0 @@
-EMUL=z8ksim
-
diff --git a/ld/emulparams/.Sanitize b/ld/emulparams/.Sanitize
index a665237..1b084b8 100644
--- a/ld/emulparams/.Sanitize
+++ b/ld/emulparams/.Sanitize
@@ -108,7 +108,8 @@ vanilla.sh
 vax.sh
 vsta.sh
 w65.sh
-z8ksim.sh
+z8001.sh
+z8002.sh
 
 Things-to-lose:
 
diff --git a/ld/emulparams/z8001.sh b/ld/emulparams/z8001.sh
new file mode 100644
index 0000000..2c4115e
--- /dev/null
+++ b/ld/emulparams/z8001.sh
@@ -0,0 +1,7 @@
+SCRIPT_NAME=z8001
+OUTPUT_FORMAT="coff-z8k"
+OUTPUT_ARCH="z8001"
+TEXT_START_ADDR=0x0
+PAGE_SIZE=128
+ARCH=z8k
+BIG=1
diff --git a/ld/emulparams/z8ksim.sh b/ld/emulparams/z8002.sh
index aee5957..5497468 100644
--- a/ld/emulparams/z8ksim.sh
+++ b/ld/emulparams/z8002.sh
@@ -1,5 +1,6 @@
-SCRIPT_NAME=z8ksim
+SCRIPT_NAME=z8001
 OUTPUT_FORMAT="coff-z8k"
+OUTPUT_ARCH="z8002"
 TEXT_START_ADDR=0x0
 PAGE_SIZE=128
 ARCH=z8k
diff --git a/ld/scripttempl/.Sanitize b/ld/scripttempl/.Sanitize
index 8e97c30..0cb1172 100644
--- a/ld/scripttempl/.Sanitize
+++ b/ld/scripttempl/.Sanitize
@@ -69,7 +69,7 @@ sparclynx.sc
 st2000.sc
 vanilla.sc
 w65.sc
-z8ksim.sc
+z8000.sc
 
 Things-to-lose:
 
diff --git a/ld/scripttempl/i386pe.sc b/ld/scripttempl/i386pe.sc
index 8923ad7..4219736 100644
--- a/ld/scripttempl/i386pe.sc
+++ b/ld/scripttempl/i386pe.sc
@@ -16,6 +16,8 @@ SECTIONS
 	{
 	    ${RELOCATING+ *(.init);}
 	    *(.text)
+	    ${CONSTRUCTING+ ___CTOR_LIST__ = .; LONG (-1); *(.ctor); LONG (0); }
+            ${CONSTRUCTING+ ___DTOR_LIST__ = .; LONG (-1); *(.dtor); LONG (0); }
 	    ${RELOCATING+ *(.fini);}
 	    ${RELOCATING+ etext  =  .};
 	  }
diff --git a/ld/scripttempl/z8ksim.sc b/ld/scripttempl/z8000.sc
index e9627d8..2b87930 100644
--- a/ld/scripttempl/z8ksim.sc
+++ b/ld/scripttempl/z8000.sc
@@ -1,17 +1,17 @@
 cat <<EOF
 OUTPUT_FORMAT("${OUTPUT_FORMAT}")
-OUTPUT_ARCH(z8002)
+OUTPUT_ARCH("${OUTPUT_ARCH}")
 ENTRY(_start)
 
 SECTIONS 				
 { 					
-.text : { 					
+.text ${BIG+ ${RELOCATING+ 0x0000000}} : { 					
 	  *(.text) 				
 	  *(.strings)
 	  *(.rdata)
 	}
 
-.ctors   : 
+.ctors ${BIG+ ${RELOCATING+ 0x2000000}}  : 
 	{
 	  ${RELOCATING+ ___ctors = . ;  }
 	  *(.ctors);
@@ -21,11 +21,11 @@ SECTIONS
 	  ${RELOCATING+ ___dtors_end = . ; }
 	} 
 
-.data : {
+.data ${BIG+ ${RELOCATING+ 0x3000000}} : {
 	*(.data)
 	}
 
-.bss : 
+.bss ${BIG+ ${RELOCATING+ 0x4000000}} : 
   {
     ${RELOCATING+ __start_bss = . ; }
     *(.bss);
@@ -33,7 +33,7 @@ SECTIONS
     ${RELOCATING+ __end_bss = . ; }
   }
 
-.heap : {
+.heap ${BIG+ ${RELOCATING+ 0x5000000}} : {
 	${RELOCATING+ __start_heap = . ; }
 	${RELOCATING+ . = . + 20k  ; }
 	${RELOCATING+ __end_heap = . ; }