From be4514d38dd8c05e99b7a58a182913d0b9f09e80 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@airs.com>
Date: Sun, 12 Sep 1999 16:48:02 +0000
Subject: [PATCH] 1999-09-12  Donn Terry  <donn@interix.com>

	* scripttempl/pe.sc: Use ${ENTRY} rather than _mainCRTStartup.
	Move .bss section after .rdata.  Move .reloc section after .rsrc.
---
 ld/ChangeLog         |  8 ++++++--
 ld/scripttempl/pe.sc | 26 +++++++++++++-------------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 1215b63d5e..f827b6b045 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -23,6 +23,9 @@
 
 1999-09-12  Donn Terry  <donn@interix.com>
 
+	* scripttempl/pe.sc: Use ${ENTRY} rather than _mainCRTStartup.
+	Move .bss section after .rdata.  Move .reloc section after .rsrc.
+
 	* lexsup.c (parse_args): Use strtoul for --split-by-reloc
 	argument.
 
@@ -45,12 +48,13 @@
 	* ldlang.c (open_output): Change local variable desired_endian
 	from int to enum bfd_endian.
 
-	* emulparams/arm_epoc_pe.sh: Define SUBSYSTEM and
+	* emulparams/arm_epoc_pe.sh: Define ENTRY, SUBSYSTEM and
 	INITIAL_SYMBOL_CHAR.
 	* emulparams/armpe.sh: Likewise.
 	* emulparams/morepe.sh: Likewise.
 	* emulparams/ppcpe.sh: Likewise.
-	* emulparams/i386pe.sh (SUBSYSTEM): Define as PE_DEF_SUBSYSTEM.
+	* emulparams/i386pe.sh (ENTRY): Define as _mainCRTStartup.
+	(SUBSYSTEM): Define as PE_DEF_SUBSYSTEM.
 
 Fri Sep 10 00:22:50 1999  Jeffrey A Law  (law@cygnus.com)
 
diff --git a/ld/scripttempl/pe.sc b/ld/scripttempl/pe.sc
index 6212d42434..961babdc44 100644
--- a/ld/scripttempl/pe.sc
+++ b/ld/scripttempl/pe.sc
@@ -42,7 +42,7 @@ ${OUTPUT_ARCH+OUTPUT_ARCH(${OUTPUT_ARCH})}
 
 ${LIB_SEARCH_DIRS}
 
-ENTRY(_mainCRTStartup)
+ENTRY(${ENTRY})
 
 SECTIONS
 {
@@ -80,6 +80,13 @@ SECTIONS
     ${RELOCATING+*(.data_cygwin_nocopy)}
   }
 
+  .rdata ${RELOCATING+BLOCK(__section_alignment__)} :
+  {
+    *(.rdata)
+    ${R_RDATA}
+    *(.eh_frame)
+  }
+
   .bss ${RELOCATING+BLOCK(__section_alignment__)} :
   {
     ${RELOCATING+__bss_start__ = . ;}
@@ -88,13 +95,6 @@ SECTIONS
     ${RELOCATING+__bss_end__ = . ;}
   }
 
-  .rdata ${RELOCATING+BLOCK(__section_alignment__)} :
-  {
-    *(.rdata)
-    ${R_RDATA}
-    *(.eh_frame)
-  }
-
   .edata ${RELOCATING+BLOCK(__section_alignment__)} :
   {
     *(.edata)
@@ -127,17 +127,17 @@ SECTIONS
     ${RELOCATING+ __end__ = .;}
   }
 
-  .reloc ${RELOCATING+BLOCK(__section_alignment__)} :
-  { 					
-    *(.reloc)
-  }
-
   .rsrc ${RELOCATING+BLOCK(__section_alignment__)} :
   { 					
     *(.rsrc)
     ${R_RSRC}
   }
 
+  .reloc ${RELOCATING+BLOCK(__section_alignment__)} :
+  { 					
+    *(.reloc)
+  }
+
   .stab ${RELOCATING+BLOCK(__section_alignment__)} ${RELOCATING+(NOLOAD)} :
   {
     [ .stab ]
-- 
2.34.1