aboutsummaryrefslogtreecommitdiff
path: root/ld
diff options
context:
space:
mode:
Diffstat (limited to 'ld')
-rw-r--r--ld/ChangeLog5
-rw-r--r--ld/pe-dll.c9
2 files changed, 14 insertions, 0 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 6f959bb..4a3eb3b 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-13 Dave Korn <dave.korn.cygwin@gmail.com>
+
+ * pe-dll.c (generate_reloc): Don't emit a base reloc for an
+ underlying BFD reloc that will be discarded in eh_frame data.
+
2011-10-10 Nick Clifton <nickc@redhat.com>
* po/bg.po: Updated Bulgarian translation.
diff --git a/ld/pe-dll.c b/ld/pe-dll.c
index 7848063..ce0ab5d 100644
--- a/ld/pe-dll.c
+++ b/ld/pe-dll.c
@@ -1395,6 +1395,15 @@ generate_reloc (bfd *abfd, struct bfd_link_info *info)
else if (!blhe || blhe->type != bfd_link_hash_defined)
continue;
}
+ /* Nor for Dwarf FDE references to discarded sections. */
+ else if (bfd_is_abs_section (sym->section->output_section))
+ {
+ /* We only ignore relocs from .eh_frame sections, as
+ they are discarded by the final link rather than
+ resolved against the kept section. */
+ if (!strcmp (s->name, ".eh_frame"))
+ continue;
+ }
reloc_data[total_relocs].vma = sec_vma + relocs[i]->address;