Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

bfd/

Browse Source 
* 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.
This commit is contained in:
Alan Modra
2005-02-03 14:12:54 +00:00
parent 10d86c8a5c
commit 4ea42fb74f
4 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
bfd/elflink.c
View File

@@ -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. */