* emultempl/pe.em (gld_${EMULATION_NAME}_before_parse): Set

	default entry symbol to ENTRY here.
	* scripttempl/pe.sc: Not here.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 786fe348f6f7187445961d2d3dfd98366d225be0..515ffd8887b5c65287d77806e3bcc86e7ea160a0 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-05  Danny Smith  <dannysmith@users.sourceforge.net>
+
+       * emultempl/pe.em (gld_${EMULATION_NAME}_before_parse): Set
+       default entry symbol to ENTRY here.
+       * scripttempl/pe.sc: Not here.
+
 2005-09-30  James E Wilson  <wilson@specifix.com>
 
        * ldlang.c (lang_startup): Add missing ": " to einfo call.

diff --git a/ld/emultempl/pe.em b/ld/emultempl/pe.em
index df7692d680c169052d99cc8a1306482dc00d2882..a4ed25d4462adaf27b1c95431d96d6dd5962d9f4 100644 (file)
--- a/ld/emultempl/pe.em
+++ b/ld/emultempl/pe.em
@@ -1,5 +1,6 @@
 # This shell script emits a C file. -*- C -*-
 # It does some substitutions.
+test -z "${ENTRY}" && ENTRY="_mainCRTStartup"
 if [ -z "$MACHINE" ]; then
   OUTPUT_ARCH=${ARCH}
 else
@@ -143,6 +144,8 @@ gld_${EMULATION_NAME}_before_parse (void)
 #else
   lang_default_entry ("_WinMainCRTStartup");
 #endif
+#else
+  lang_default_entry ("${ENTRY}");
 #endif
 #endif
 }

diff --git a/ld/scripttempl/pe.sc b/ld/scripttempl/pe.sc
index 69890f15f3e27a232fbb9fa6a62fa758e4327281..c9931b51489c84baf343f2ce9d72f7bf5ce9acc7 100644 (file)
--- a/ld/scripttempl/pe.sc
+++ b/ld/scripttempl/pe.sc
@@ -50,8 +50,6 @@ ${OUTPUT_ARCH+OUTPUT_ARCH(${OUTPUT_ARCH})}
 
 ${LIB_SEARCH_DIRS}
 
-ENTRY(${ENTRY})
-
 SECTIONS
 {
   ${RELOCATING+/* Make the virtual address and file offset synced if the alignment is}