Mon Apr 9 13:00:07 2018 UTC ()

Pull up following revision(s) (requested by joerg in ticket #1543):

	external/gpl3/binutils/dist/bfd/elflink.c: revision 1.14 (patch)

When trying to decide the status of a weak symbol, resolve any
indirectness first. In the case of various Qt5 libraries, __bss_start
ends up with a Qt5 version, but it has to be resolved first to match the
actual (implicit) definition. This fixes the root cause of pkg/53089.


(martin)

diff -r1.5.2.1 -r1.5.2.2 src/external/gpl3/binutils/dist/bfd/elflink.c

--- src/external/gpl3/binutils/dist/bfd/elflink.c 2012/04/03 15:54:48	1.5.2.1
+++ src/external/gpl3/binutils/dist/bfd/elflink.c 2018/04/09 13:00:06	1.5.2.2

 @@ -2518,29 +2518,30 @@ _bfd_elf_fix_symbol_flags (struct elf_li
+    }
   /* If a weak undefined symbol has non-default visibility, we also
      hide it from the dynamic linker.  */
   if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT
       && h->root.type == bfd_link_hash_undefweak)
     (*bed->elf_backend_hide_symbol) (eif->info, h, TRUE);
   /* If this is a weak defined symbol in a dynamic object, and we know
      the real definition in the dynamic object, copy interesting flags
      over to the real definition.  */
   if (h->u.weakdef != NULL)
+    {
-      struct elf_link_hash_entry *weakdef;
+      struct elf_link_hash_entry *weakdef = h->u.weakdef;
       while (weakdef->root.type == bfd_link_hash_indirect)
         weakdef = (struct elf_link_hash_entry *) weakdef->root.u.i.link;
       weakdef = h->u.weakdef;
       if (h->root.type == bfd_link_hash_indirect)
 	h = (struct elf_link_hash_entry *) h->root.u.i.link;
       BFD_ASSERT (h->root.type == bfd_link_hash_defined
 		  || h->root.type == bfd_link_hash_defweak);
       BFD_ASSERT (weakdef->def_dynamic);
       /* If the real definition is defined by a regular object file,
 	 don't do anything special.  See the longer description in
 	 _bfd_elf_adjust_dynamic_symbol, below.  */
       if (weakdef->def_regular)
 	h->u.weakdef = NULL;
       else