* emultempl/pe.em (gld_${EMULATION_NAME}_place_orphan): Defer

merging sections when not relocating.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 60e6cb4c2ba03ab678ee0587284456207e7bcd2b..94fd853e9e4c48951a0714199272178fd27283b6 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+1999-09-29  Andrew Haley  <aph@cygnus.com>
+
+       * emultempl/pe.em (gld_${EMULATION_NAME}_place_orphan): Defer
+       merging sections when not relocating.
+
 1999-09-28  Mumit Khan  <khan@xraylith.wisc.edu>
 
        * pe-dll.c (process_def_file): Move the offset lookup from here to

diff --git a/ld/emultempl/pe.em b/ld/emultempl/pe.em
index 1727b4f15cc959d0b7550dd77bf3531e57ab25df..cea09fe84b91ca28e428475cfedecab32f643f50 100644 (file)
--- a/ld/emultempl/pe.em
+++ b/ld/emultempl/pe.em
@@ -1028,9 +1028,12 @@ gld_${EMULATION_NAME}_place_orphan (file, s)
   hold_section = s;
 
   hold_section_name = xstrdup (secname);
-  dollar = strchr (hold_section_name, '$');
-  if (dollar != NULL)
-    *dollar = '\0';
+  if (!link_info.relocateable)
+    {
+      dollar = strchr (hold_section_name, '$');
+      if (dollar != NULL)
+       *dollar = '\0';
+    }
 
   hold_use = NULL;
   lang_for_each_statement (gld${EMULATION_NAME}_place_section);