diff options
| author | Alan Modra <amodra@gmail.com> | 2005-02-03 14:12:54 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2005-02-03 14:12:54 +0000 |
| commit | 4ea42fb74f7eeda2968163eaa74a10139c4a04b2 (patch) | |
| tree | 7b617c4fbeea4bf94c73070375faf7baae7aa25b /bfd/elflink.c | |
| parent | 10d86c8a5c3965bfcc895c7e6a624cd3fd6e240d (diff) | |
| download | gdb-4ea42fb74f7eeda2968163eaa74a10139c4a04b2.zip gdb-4ea42fb74f7eeda2968163eaa74a10139c4a04b2.tar.gz gdb-4ea42fb74f7eeda2968163eaa74a10139c4a04b2.tar.bz2 | |
bfd/
* elflink.c (bfd_elf_record_link_assignment): Do "provide" symbol
lookup here. Set to new before calling bfd_link_repair_undef_list.
(elf_smash_syms): Check that u.undef.weak isn't the not_needed bfd.
ld/
emultempl/elf32.em (gld${EMULATION_NAME}_find_exp_assignment): Don't
look up symbol for etree_provide here.
Diffstat (limited to 'bfd/elflink.c')
| -rw-r--r-- | bfd/elflink.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/bfd/elflink.c b/bfd/elflink.c index ba2676d..4ece121 100644 --- a/bfd/elflink.c +++ b/bfd/elflink.c @@ -440,13 +440,15 @@ bfd_elf_record_link_assignment (bfd *output_bfd ATTRIBUTE_UNUSED, bfd_boolean provide) { struct elf_link_hash_entry *h; + struct elf_link_hash_table *htab; if (!is_elf_hash_table (info->hash)) return TRUE; - h = elf_link_hash_lookup (elf_hash_table (info), name, TRUE, TRUE, FALSE); + htab = elf_hash_table (info); + h = elf_link_hash_lookup (htab, name, !provide, TRUE, FALSE); if (h == NULL) - return FALSE; + return provide; /* Since we're defining the symbol, don't let it seem to have not been defined. record_dynamic_symbol and size_dynamic_sections @@ -454,11 +456,9 @@ bfd_elf_record_link_assignment (bfd *output_bfd ATTRIBUTE_UNUSED, if (h->root.type == bfd_link_hash_undefweak || h->root.type == bfd_link_hash_undefined) { - struct elf_link_hash_table *htab = elf_hash_table (info); - + h->root.type = bfd_link_hash_new; if (h->root.u.undef.next != NULL || htab->root.undefs_tail == &h->root) bfd_link_repair_undef_list (&htab->root); - h->root.type = bfd_link_hash_new; } if (h->root.type == bfd_link_hash_new) @@ -2844,7 +2844,8 @@ elf_smash_syms (struct elf_link_hash_entry *h, void *data) case bfd_link_hash_undefined: if (h->root.u.undef.abfd != inf->not_needed) return TRUE; - if (h->root.u.undef.weak != NULL) + if (h->root.u.undef.weak != NULL + && h->root.u.undef.weak != inf->not_needed) { /* Symbol was undefweak in u.undef.weak bfd, and has become undefined in as-needed lib. Restore weak. */ |