From: Steve Chamberlain <sac@cygnus>
Date: Thu, 27 Jul 1995 22:43:44 +0000 (+0000)
Subject: Thu Jul 27 15:26:28 1995  steve chamberlain  <sac@slash.cygnus.com>
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=66a61efd3770f4bad13f08c4093bed73bbbb7dae;p=deliverable%2Fbinutils-gdb.git

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.
---

diff --git a/ld/config/.Sanitize b/ld/config/.Sanitize
index dac68039d7..e004cc0d72 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 0000000000..ec0a07e19e
--- /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 5a01485433..0000000000
--- a/ld/config/z8ksim.mt
+++ /dev/null
@@ -1,2 +0,0 @@
-EMUL=z8ksim
-
diff --git a/ld/emulparams/.Sanitize b/ld/emulparams/.Sanitize
index a665237c02..1b084b8a05 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 0000000000..2c4115eab1
--- /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/z8002.sh b/ld/emulparams/z8002.sh
new file mode 100644
index 0000000000..5497468603
--- /dev/null
+++ b/ld/emulparams/z8002.sh
@@ -0,0 +1,6 @@
+SCRIPT_NAME=z8001
+OUTPUT_FORMAT="coff-z8k"
+OUTPUT_ARCH="z8002"
+TEXT_START_ADDR=0x0
+PAGE_SIZE=128
+ARCH=z8k
diff --git a/ld/emulparams/z8ksim.sh b/ld/emulparams/z8ksim.sh
deleted file mode 100644
index aee5957803..0000000000
--- a/ld/emulparams/z8ksim.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-SCRIPT_NAME=z8ksim
-OUTPUT_FORMAT="coff-z8k"
-TEXT_START_ADDR=0x0
-PAGE_SIZE=128
-ARCH=z8k
diff --git a/ld/scripttempl/.Sanitize b/ld/scripttempl/.Sanitize
index 8e97c3009c..0cb11720f9 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 8923ad7432..4219736514 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/z8000.sc b/ld/scripttempl/z8000.sc
new file mode 100644
index 0000000000..2b87930100
--- /dev/null
+++ b/ld/scripttempl/z8000.sc
@@ -0,0 +1,54 @@
+cat <<EOF
+OUTPUT_FORMAT("${OUTPUT_FORMAT}")
+OUTPUT_ARCH("${OUTPUT_ARCH}")
+ENTRY(_start)
+
+SECTIONS 				
+{ 					
+.text ${BIG+ ${RELOCATING+ 0x0000000}} : { 					
+	  *(.text) 				
+	  *(.strings)
+	  *(.rdata)
+	}
+
+.ctors ${BIG+ ${RELOCATING+ 0x2000000}}  : 
+	{
+	  ${RELOCATING+ ___ctors = . ;  }
+	  *(.ctors);
+	  ${RELOCATING+ ___ctors_end = . ; }
+	  ___dtors = . ;
+	  *(.dtors);
+	  ${RELOCATING+ ___dtors_end = . ; }
+	} 
+
+.data ${BIG+ ${RELOCATING+ 0x3000000}} : {
+	*(.data)
+	}
+
+.bss ${BIG+ ${RELOCATING+ 0x4000000}} : 
+  {
+    ${RELOCATING+ __start_bss = . ; }
+    *(.bss);
+    *(COMMON);
+    ${RELOCATING+ __end_bss = . ; }
+  }
+
+.heap ${BIG+ ${RELOCATING+ 0x5000000}} : {
+	${RELOCATING+ __start_heap = . ; }
+	${RELOCATING+ . = . + 20k  ; }
+	${RELOCATING+ __end_heap = . ; }
+	} 
+
+.stack ${RELOCATING+ 0xf000 }  : 
+	{
+	${RELOCATING+ _stack = . ; }
+	*(.stack)
+	${RELOCATING+ __stack_top = . ; }
+	} 
+
+}
+EOF
+
+
+
+
diff --git a/ld/scripttempl/z8ksim.sc b/ld/scripttempl/z8ksim.sc
deleted file mode 100644
index e9627d8487..0000000000
--- a/ld/scripttempl/z8ksim.sc
+++ /dev/null
@@ -1,54 +0,0 @@
-cat <<EOF
-OUTPUT_FORMAT("${OUTPUT_FORMAT}")
-OUTPUT_ARCH(z8002)
-ENTRY(_start)
-
-SECTIONS 				
-{ 					
-.text : { 					
-	  *(.text) 				
-	  *(.strings)
-	  *(.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
-
-
-
-