diff options
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 5 | ||||
| -rw-r--r-- | bfd/elfxx-mips.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 46095f7..3b91a85 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2012-12-06 Alan Modra <amodra@gmail.com> + + * elfxx-mips.c (allocate_dynrelocs): Correct test for symbol + defined in a regular file to include common symbols. + 2012-12-05 Leif Ekblad <leif@rdos.net> * config.bfd: Add x86_64-*-rdos. diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c index a4aa125..4036273 100644 --- a/bfd/elfxx-mips.c +++ b/bfd/elfxx-mips.c @@ -8568,7 +8568,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf) if (! info->relocatable && hmips->possibly_dynamic_relocs != 0 && (h->root.type == bfd_link_hash_defweak - || !h->def_regular + || (!h->def_regular && !ELF_COMMON_DEF_P (h)) || info->shared)) { bfd_boolean do_copy = TRUE; |