From 6eec49fcec690806702f65f49b9f16c6723f2b34 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Wed, 29 Sep 1999 17:44:35 +0000 Subject: [PATCH] * emultempl/pe.em (gld_${EMULATION_NAME}_place_orphan): Defer merging sections when not relocating. --- ld/ChangeLog | 5 +++++ ld/emultempl/pe.em | 9 ++++++--- 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 + + * emultempl/pe.em (gld_${EMULATION_NAME}_place_orphan): Defer + merging sections when not relocating. + 1999-09-28 Mumit Khan * 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); -- 2.7.4