d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a bug in ld, where indirect symbols are not handled properly during

Browse Source 
linking of a shared library, leading to corrupt indexes in the dynamic
symbol table.  This should fix the multimedia/ffmpegthumbnailer port.

Approved by:	re (kib)
Reported by:	swills
MFC after:	2 weeks
This commit is contained in:
Dimitry Andric 2013-09-28 23:03:40 +00:00
parent 0210509acd
commit 64fa5e4ddf
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
contrib/binutils/bfd/elflink.c
View File

@ -488,12 +488,28 @@ bfd_elf_record_link_assignment (bfd *output_bfd,
if (h->root.u.undef.next != NULL || htab->root.undefs_tail == &h->root)
bfd_link_repair_undef_list (&htab->root);
}
if (h->root.type == bfd_link_hash_new)
else if (h->root.type == bfd_link_hash_new)
{
bfd_elf_link_mark_dynamic_symbol (info, h, NULL);
h->non_elf = 0;
}
else if (h->root.type == bfd_link_hash_indirect)
{
const struct elf_backend_data *bed = get_elf_backend_data (output_bfd);
struct elf_link_hash_entry *hv = h;
do
hv = (struct elf_link_hash_entry *) hv->root.u.i.link;
while (hv->root.type == bfd_link_hash_indirect
|| hv->root.type == bfd_link_hash_warning);
h->root.type = bfd_link_hash_undefined;
hv->root.type = bfd_link_hash_indirect;
hv->root.u.i.link = (struct bfd_link_hash_entry *) h;
(*bed->elf_backend_copy_indirect_symbol) (info, h, hv);
}
else if (h->root.type == bfd_link_hash_warning)
{
abort ();
}
/* If this symbol is being provided by the linker script, and it is
currently defined by a dynamic object, but not by a regular
@ -1417,10 +1433,10 @@ _bfd_elf_merge_symbol (bfd *abfd,
case, we make the versioned symbol point to the normal one. */
const struct elf_backend_data *bed = get_elf_backend_data (abfd);
flip->root.type = h->root.type;
flip->root.u.undef.abfd = h->root.u.undef.abfd;
h->root.type = bfd_link_hash_indirect;
h->root.u.i.link = (struct bfd_link_hash_entry *) flip;
(*bed->elf_backend_copy_indirect_symbol) (info, flip, h);
flip->root.u.undef.abfd = h->root.u.undef.abfd;
if (h->def_dynamic)
{
h->def_dynamic = 0;