* elflink.h (elf_merge_symbol): Don't check the hash creator until
after we have set *sym_hash.
This commit is contained in:
parent
af51b8d56d
commit
3359a0bcec
|
@ -298,11 +298,6 @@ elf_merge_symbol (abfd, info, name, sym, psec, pvalue, sym_hash,
|
||||||
bfd *oldbfd;
|
bfd *oldbfd;
|
||||||
boolean newdyn, olddyn, olddef, newdef, newdyncommon, olddyncommon;
|
boolean newdyn, olddyn, olddef, newdef, newdyncommon, olddyncommon;
|
||||||
|
|
||||||
/* This code is for coping with dynamic objects, and is only useful
|
|
||||||
if we are doing an ELF link. */
|
|
||||||
if (info->hash->creator != abfd->xvec)
|
|
||||||
return true;
|
|
||||||
|
|
||||||
*override = false;
|
*override = false;
|
||||||
*type_change_ok = false;
|
*type_change_ok = false;
|
||||||
*size_change_ok = false;
|
*size_change_ok = false;
|
||||||
|
@ -319,6 +314,11 @@ elf_merge_symbol (abfd, info, name, sym, psec, pvalue, sym_hash,
|
||||||
return false;
|
return false;
|
||||||
*sym_hash = h;
|
*sym_hash = h;
|
||||||
|
|
||||||
|
/* This code is for coping with dynamic objects, and is only useful
|
||||||
|
if we are doing an ELF link. */
|
||||||
|
if (info->hash->creator != abfd->xvec)
|
||||||
|
return true;
|
||||||
|
|
||||||
/* For merging, we only care about real symbols. */
|
/* For merging, we only care about real symbols. */
|
||||||
|
|
||||||
while (h->root.type == bfd_link_hash_indirect
|
while (h->root.type == bfd_link_hash_indirect
|
||||||
|
|
Loading…
Reference in New Issue