Module Name: src Committed By: martin Date: Mon Apr 9 13:00:07 UTC 2018
Modified Files: src/external/gpl3/binutils/dist/bfd [netbsd-6]: elflink.c Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.5.2.1 -r1.5.2.2 \ src/external/gpl3/binutils/dist/bfd/elflink.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/external/gpl3/binutils/dist/bfd/elflink.c diff -u src/external/gpl3/binutils/dist/bfd/elflink.c:1.5.2.1 src/external/gpl3/binutils/dist/bfd/elflink.c:1.5.2.2 --- src/external/gpl3/binutils/dist/bfd/elflink.c:1.5.2.1 Tue Apr 3 15:54:48 2012 +++ src/external/gpl3/binutils/dist/bfd/elflink.c Mon Apr 9 13:00:06 2018 @@ -2528,9 +2528,10 @@ _bfd_elf_fix_symbol_flags (struct elf_li 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;