OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Group common symbol checking together

Browse Source 
PR ld/19579
	* elflink.c (_bfd_elf_merge_symbol): Group common symbol checking
	together.
This commit is contained in:
H.J. Lu 2016-03-08 05:28:55 -08:00
parent 72f3b6aae7
commit 202ac193bb
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bfd/ChangeLog
View File

@ -1,3 +1,9 @@
2016-03-08 H.J. Lu <hongjiu.lu@intel.com>
PR ld/19579
* elflink.c (_bfd_elf_merge_symbol): Group common symbol checking
together.
2016-03-08 Cupertino Miranda <Cupertino.Miranda@synopsys.com>
Andrew Burgess <andrew.burgess@embecosm.com>

12
bfd/elflink.c
View File

@ -1172,12 +1172,9 @@ _bfd_elf_merge_symbol (bfd *abfd,
newdef = !bfd_is_und_section (sec) && !bfd_is_com_section (sec);
/* The old common symbol in executable is a definition if the new
definition comes from a shared library. */
olddef = (h->root.type != bfd_link_hash_undefined
&& h->root.type != bfd_link_hash_undefweak
&& (h->root.type != bfd_link_hash_common
|| (!olddyn && newdyn && bfd_link_executable (info))));
&& h->root.type != bfd_link_hash_common);
/* NEWFUNC and OLDFUNC indicate whether the new or old symbol,
respectively, appear to be a function. */
@ -1489,13 +1486,16 @@ _bfd_elf_merge_symbol (bfd *abfd,
represent variables; this can cause confusion in principle, but
any such confusion would seem to indicate an erroneous program or
shared library. We also permit a common symbol in a regular
object to override a weak symbol in a shared object. */
object to override a weak symbol in a shared object. A common
symbol in executable also overrides a symbol in a shared object. */
if (newdyn
&& newdef
&& (olddef
|| (h->root.type == bfd_link_hash_common
&& (newweak || newfunc))))
&& (newweak
|| newfunc
|| (!olddyn && bfd_link_executable (info))))))
{
*override = TRUE;
newdef = FALSE;