2009-01-05 Kai Tietz <kai.tietz@onevision.com>

        * emultempl/pe.em: Prefix dollar characters to be outputed in
        generated C file.
        * emultempl/pep.em: Likewise.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index b7a94857afe242fad88cd613cc5f25cb864d8961..a87bbad723c644ae7317f26c87fa643b841d5c40 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-05  Kai Tietz  <kai.tietz@onevision.com>
+
+       * emultempl/pe.em: Prefix dollar characters to be outputed in
+       generated C file.
+       * emultempl/pep.em: Likewise.
+
 2009-01-03  Dave Korn  <dave.korn.cygwin@gmail.com>
 
        * NEWS:  Mention new feature --exclude-modules-for-implib.

diff --git a/ld/emultempl/pe.em b/ld/emultempl/pe.em
index f902812b176a325f0e51a6150cb69e6b542b53ae..26a70a743aa4f90f222dec5d5554a3a54b9ccd3d 100644 (file)
--- a/ld/emultempl/pe.em
+++ b/ld/emultempl/pe.em
@@ -1300,14 +1300,14 @@ gld_${EMULATION_NAME}_after_open (void)
        import libraries which are dead code and eliminates them
        from the final link. For each exported symbol <sym>, there
        is a object file in the import library with a .text section
-       and several .idata$* sections. The .text section contains the
+       and several .idata\$* sections. The .text section contains the
        symbol definition for <sym> which is a jump stub of the form
-       jmp *__imp_<sym>. The .idata$5 contains the symbol definition
+       jmp *__imp_<sym>. The .idata\$5 contains the symbol definition
        for __imp_<sym> which is the address of the slot for <sym> in
        the import address table. When a symbol is imported explicitly
        using __declspec(dllimport) declaration, the compiler generates
        a reference to __imp_<sym> which directly resolves to the
-       symbol in .idata$5, in which case the jump stub code is not
+       symbol in .idata\$5, in which case the jump stub code is not
        needed. The following code tries to identify jump stub sections
        in import libraries which are not referred to by anyone and
        marks them for exclusion from the final link.  */
@@ -1625,7 +1625,7 @@ gld_${EMULATION_NAME}_finish (void)
    We use this to put sections in a reasonable place in the file, and
    to ensure that they are aligned as required.
 
-   We handle grouped sections here as well.  A section named .foo$nn
+   We handle grouped sections here as well.  A section named .foo\$nn
    goes into the output section .foo.  All grouped sections are sorted
    by name.
 
@@ -1645,7 +1645,7 @@ gld_${EMULATION_NAME}_place_orphan (asection *s,
 
   /* Look through the script to see where to place this section.  */
   if (!link_info.relocatable
-      && (dollar = strchr (secname, '$')) != NULL)
+      && (dollar = strchr (secname, '\$')) != NULL)
     {
       size_t len = dollar - secname;
       char *newname = xmalloc (len + 1);
@@ -1754,7 +1754,7 @@ gld_${EMULATION_NAME}_place_orphan (asection *s,
       {
        bfd_boolean found_dollar;
 
-       /* The section name has a '$'.  Sort it with the other '$'
+       /* The section name has a '\$'.  Sort it with the other '\$'
           sections.  */
        found_dollar = FALSE;
        for ( ; *pl != NULL; pl = &(*pl)->header.next)
@@ -1768,7 +1768,7 @@ gld_${EMULATION_NAME}_place_orphan (asection *s,
            ls = &(*pl)->input_section;
 
            lname = bfd_get_section_name (ls->section->owner, ls->section);
-           if (strchr (lname, '$') == NULL)
+           if (strchr (lname, '\$') == NULL)
              {
                if (found_dollar)
                  break;

diff --git a/ld/emultempl/pep.em b/ld/emultempl/pep.em
index 721fc23d5503fd8a4f8fb875c0e706dfe0af4762..f921c1ec6327936c9acf3ce8c134d33287934083 100644 (file)
--- a/ld/emultempl/pep.em
+++ b/ld/emultempl/pep.em
@@ -1419,7 +1419,7 @@ gld_${EMULATION_NAME}_finish (void)
    We use this to put sections in a reasonable place in the file, and
    to ensure that they are aligned as required.
 
-   We handle grouped sections here as well.  A section named .foo$nn
+   We handle grouped sections here as well.  A section named .foo\$nn
    goes into the output section .foo.  All grouped sections are sorted
    by name.
 
@@ -1439,7 +1439,7 @@ gld_${EMULATION_NAME}_place_orphan (asection *s,
 
   /* Look through the script to see where to place this section.  */
   if (!link_info.relocatable
-      && (dollar = strchr (secname, '$')) != NULL)
+      && (dollar = strchr (secname, '\$')) != NULL)
     {
       size_t len = dollar - secname;
       char *newname = xmalloc (len + 1);
@@ -1548,7 +1548,7 @@ gld_${EMULATION_NAME}_place_orphan (asection *s,
       {
        bfd_boolean found_dollar;
 
-       /* The section name has a '$'.  Sort it with the other '$'
+       /* The section name has a '\$'.  Sort it with the other '\$'
           sections.  */
        found_dollar = FALSE;
        for ( ; *pl != NULL; pl = &(*pl)->header.next)
@@ -1562,7 +1562,7 @@ gld_${EMULATION_NAME}_place_orphan (asection *s,
            ls = &(*pl)->input_section;
 
            lname = bfd_get_section_name (ls->section->owner, ls->section);
-           if (strchr (lname, '$') == NULL)
+           if (strchr (lname, '\$') == NULL)
              {
                if (found_dollar)
                  break;