Group common symbol checking together

	PR ld/19579
	* elflink.c (_bfd_elf_merge_symbol): Group common symbol checking
	together.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 2b6cf15aaefdccb6af9b038ba394583539c73524..c3b91320504a46d25223bef578a0f6538bf69ebb 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -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>
 

diff --git a/bfd/elflink.c b/bfd/elflink.c
index 39157bf77894ddd365c6c7c682c57270114ce050..ccff7808c3a0ca6e0d9c4868b66f88cccba6c9ed 100644 (file)
--- a/bfd/elflink.c
+++ b/bfd/elflink.c
@@ -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;