darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* elflink.c (_bfd_elf_merge_symbol): Reinstate code to handle

Browse source 
strong syms in one shared object overriding weak syms in another.
This commit is contained in:
Alan Modra 2004-03-18 23:02:06 +00:00
parent 90b04e2953
commit f218a464b2
2 changed files with 29 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
bfd/ChangeLog
View file

@ -1,3 +1,8 @@
2004-03-19 Alan Modra <amodra@bigpond.net.au>
* elflink.c (_bfd_elf_merge_symbol): Reinstate code to handle
strong syms in one shared object overriding weak syms in another.
2004-03-18 Alan Modra <amodra@bigpond.net.au>
* elf-bfd.h (struct elf_obj_tdata): Delete dt_soname field. Add

24
bfd/elflink.c
View file

@ -1153,6 +1153,30 @@ _bfd_elf_merge_symbol (bfd *abfd,
}
}
/* Handle the special case of a weak definition in one shared object
followed by a non-weak definition in another. We are covering for
a deficiency of _bfd_generic_link_add_one_symbol here. A new
strong definition of an indirect symbol is treated as a multiple
definition even when the indirect symbol points to a weak sym. */
if (olddef
&& oldweak
&& olddyn
&& newdef
&& !newweak
&& newdyn)
{
/* To make this work we have to frob the flags so that the rest
of the code does not think we are using the old definition. */
h->elf_link_hash_flags |= ELF_LINK_HASH_REF_DYNAMIC;
h->elf_link_hash_flags &= ~ELF_LINK_HASH_DEF_DYNAMIC;
/* If H is the target of an indirection, we want the caller to
use H rather than the indirect symbol. Otherwise if we are
defining a new indirect symbol we will wind up attaching it
to the entry we are overriding. */
*sym_hash = h;
}
return TRUE;
}