aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ld/ChangeLog6
-rw-r--r--ld/emultempl/pe.em3
-rw-r--r--ld/scripttempl/pe.sc2
3 files changed, 9 insertions, 2 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 786fe34..515ffd8 100644
--- 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 df7692d..a4ed25d 100644
--- 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 69890f1..c9931b5 100644
--- 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}