FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

2005-05-04 H.J. Lu <hongjiu.lu@intel.com>

Browse source 
* elflink.c (_bfd_elf_merge_symbol): Only skip weak definitions
	at the end, if a strong definition has already been seen.
This commit is contained in:
H.J. Lu 2005-05-04 13:13:22 +00:00
parent 8423293d34
commit c5e2ceadb7
2 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
bfd/ChangeLog
View file

@ -1,3 +1,8 @@
2005-05-04 H.J. Lu <hongjiu.lu@intel.com>
* elflink.c (_bfd_elf_merge_symbol): Only skip weak definitions
at the end, if a strong definition has already been seen.
2005-05-04 Alan Modra <amodra@bigpond.net.au> 2005-05-04 Alan Modra <amodra@bigpond.net.au>
* section.c (struct bfd_section): Replace link_order_head and * section.c (struct bfd_section): Replace link_order_head and

11
bfd/elflink.c
View file

@ -1078,13 +1078,6 @@ _bfd_elf_merge_symbol (bfd *abfd,
|| h->root.type == bfd_link_hash_undefined) || h->root.type == bfd_link_hash_undefined)
*size_change_ok = TRUE; *size_change_ok = TRUE;
/* Skip weak definitions of symbols that are already defined. */
if (newdef && olddef && newweak && !oldweak)
{
*skip = TRUE;
return TRUE;
}
/* NEWDYNCOMMON and OLDDYNCOMMON indicate whether the new or old /* NEWDYNCOMMON and OLDDYNCOMMON indicate whether the new or old
symbol, respectively, appears to be a common symbol in a dynamic symbol, respectively, appears to be a common symbol in a dynamic
object. If a symbol appears in an uninitialized section, and is object. If a symbol appears in an uninitialized section, and is
@ -1211,6 +1204,10 @@ _bfd_elf_merge_symbol (bfd *abfd,
*size_change_ok = TRUE; *size_change_ok = TRUE;
} }
/* Skip weak definitions of symbols that are already defined. */
if (newdef && olddef && newweak && !oldweak)
*skip = TRUE;
/* If the old symbol is from a dynamic object, and the new symbol is /* If the old symbol is from a dynamic object, and the new symbol is
a definition which is not from a dynamic object, then the new a definition which is not from a dynamic object, then the new
symbol overrides the old symbol. Symbols from regular files symbol overrides the old symbol. Symbols from regular files