From 7aee19a1c49ad1ec97080e6f34715b625b6a43c1 Mon Sep 17 00:00:00 2001
From: Kai Tietz <kai.tietz@onevision.com>
Date: Wed, 28 Oct 2009 17:34:14 +0000
Subject: [PATCH] 2009-10-28  Kai Tietz  <kai.tietz@onevision.com>

        * emultempl/pep.em (U): Define underscore macro.
        (init): Use for __ImageBase U macro.
---
 ld/ChangeLog        | 5 +++++
 ld/emultempl/pep.em | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 250ec27aaa7..f4337ccb361 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-28  Kai Tietz  <kai.tietz@onevision.com>
+
+	* emultempl/pep.em (U): Define underscore macro.
+	(init): Use for __ImageBase U macro.
+
 2009-10-23  Kai Tietz  <kai.tietz@onevision.com>
 
 	* deffile.h (def_file_export): New member its_name.
diff --git a/ld/emultempl/pep.em b/ld/emultempl/pep.em
index ff0c589dce4..656ff482051 100644
--- a/ld/emultempl/pep.em
+++ b/ld/emultempl/pep.em
@@ -98,6 +98,7 @@ fragment <<EOF
 #define PE_DEF_SECTION_ALIGNMENT	0x00000400
 #endif
 
+#define U(S) ${INITIAL_SYMBOL_CHAR} S
 
 static struct internal_extra_pe_aouthdr pep;
 static int dll;
@@ -293,7 +294,7 @@ static definfo init[] =
 #define DLLOFF 1
   {&dll, sizeof(dll), 0, "__dll__", 0},
 #define MSIMAGEBASEOFF	2
-  D(ImageBase,"___ImageBase", NT_EXE_IMAGE_BASE),
+  D(ImageBase, U("__ImageBase"), NT_EXE_IMAGE_BASE),
   D(SectionAlignment,"__section_alignment__", PE_DEF_SECTION_ALIGNMENT),
   D(FileAlignment,"__file_alignment__", PE_DEF_FILE_ALIGNMENT),
   D(MajorOperatingSystemVersion,"__major_os_version__", 4),
-- 
2.30.2