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

include/

Browse Source 
* bfdlink.h (struct bfd_link_hash_entry): Add u.undef.weak.
bfd/
	* linker.c (_bfd_generic_link_add_one_symbol): Set u.undef.weak.
	* elflink.c (elf_smash_syms): Restore symbols that were undefweak
	before the as-needed lib was loaded.  Abort on unexpected refs.
This commit is contained in:
Alan Modra
2005-02-03 03:30:49 +00:00
parent 474867c124
commit 11f25ea6ca
5 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
bfd/elflink.c
View File

@@ -2842,6 +2842,21 @@ elf_smash_syms (struct elf_link_hash_entry *h, void *data)
return TRUE;
case bfd_link_hash_undefined:
if (h->root.u.undef.abfd != inf->not_needed)
return TRUE;
if (h->root.u.undef.weak != NULL)
{
/* Symbol was undefweak in u.undef.weak bfd, and has become
undefined in as-needed lib. Restore weak. */
h->root.type = bfd_link_hash_undefweak;
h->root.u.undef.abfd = h->root.u.undef.weak;
if (h->root.u.undef.next != NULL
|| inf->htab->root.undefs_tail == &h->root)
inf->twiddled = TRUE;
return TRUE;
}
break;
case bfd_link_hash_undefweak:
if (h->root.u.undef.abfd != inf->not_needed)
return TRUE;
@@ -2868,6 +2883,11 @@ elf_smash_syms (struct elf_link_hash_entry *h, void *data)
break;
}
/* There is no way we can undo symbol table state from defined or
defweak back to undefined. */
if (h->ref_regular)
abort ();
/* Set sym back to newly created state, but keep undefs list pointer. */
bh = h->root.u.undef.next;
if (bh != NULL || inf->htab->root.undefs_tail == &h->root)