aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>1999-09-29 17:44:35 +0000
committerDJ Delorie <dj@redhat.com>1999-09-29 17:44:35 +0000
commit6eec49fcec690806702f65f49b9f16c6723f2b34 (patch)
tree0c887a035e0c9431250b24b16a72801a02b29378
parentabf4be04fa19842f0e8ef0a9bb19cde572318346 (diff)
downloadgdb-6eec49fcec690806702f65f49b9f16c6723f2b34.zip
gdb-6eec49fcec690806702f65f49b9f16c6723f2b34.tar.gz
gdb-6eec49fcec690806702f65f49b9f16c6723f2b34.tar.bz2
* emultempl/pe.em (gld_${EMULATION_NAME}_place_orphan): Defer
merging sections when not relocating.
-rw-r--r--ld/ChangeLog5
-rw-r--r--ld/emultempl/pe.em9
2 files changed, 11 insertions, 3 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 60e6cb4..94fd853 100644
--- 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 1727b4f..cea09fe 100644
--- 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);