diff options
| -rw-r--r-- | bfd/ChangeLog | 5 | ||||
| -rw-r--r-- | bfd/elf32-ppc.c | 3 | ||||
| -rw-r--r-- | bfd/elf64-ppc.c | 3 |
3 files changed, 9 insertions, 2 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 3f4da9c..6162d9c 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,5 +1,10 @@ 2006-02-17 Alan Modra <amodra@bigpond.net.au> + * elf32-ppc.c (allocate_dynrelocs): Tweak undef weak handling. + * elf64-ppc.c (allocate_dynrelocs): Likewise. + +2006-02-17 Alan Modra <amodra@bigpond.net.au> + PR ld/2218 * elf64-ppc.c (allocate_dynrelocs): Ensure undef weak sym is dynamic. diff --git a/bfd/elf32-ppc.c b/bfd/elf32-ppc.c index caa5ed4..134b960 100644 --- a/bfd/elf32-ppc.c +++ b/bfd/elf32-ppc.c @@ -4546,7 +4546,8 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf) /* Also discard relocs on undefined weak syms with non-default visibility. */ - if (h->root.type == bfd_link_hash_undefweak) + if (eh->dyn_relocs != NULL + && h->root.type == bfd_link_hash_undefweak) { if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT) eh->dyn_relocs = NULL; diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c index 785c859..1cfac82 100644 --- a/bfd/elf64-ppc.c +++ b/bfd/elf64-ppc.c @@ -7582,7 +7582,8 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf) /* Also discard relocs on undefined weak syms with non-default visibility. */ - if (h->root.type == bfd_link_hash_undefweak) + if (eh->dyn_relocs != NULL + && h->root.type == bfd_link_hash_undefweak) { if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT) eh->dyn_relocs = NULL; |