2009-10-28 Kai Tietz <kai.tietz@onevision.com>

        * emultempl/pep.em (U): Define underscore macro.
        (init): Use for __ImageBase U macro.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 250ec27..f4337cc 100644 (file)
--- 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 ff0c589..656ff48 100644 (file)
--- 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),