[src/trunk]: src/external/gpl3/binutils/dist/bfd Apply change from upstream t...

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fdc17bf49028
branches:  trunk
changeset: 331478:fdc17bf49028
user:      skrll <skrll%NetBSD.org@localhost>
date:      Mon Aug 11 20:53:16 2014 +0000

description:
Apply change from upstream to fix PR/48709 - port-alpha/48709: static
threaded programs crash.

With this fix the new weak symbol's st_other is not merged in, i.e. NOPV
is not copied from the libc __libc_thr_init.

* elflink.c (_bfd_elf_merge_symbol): If merging a new weak
symbol that will be skipped, we don't have a new definition.

diffstat:

 external/gpl3/binutils/dist/bfd/ChangeLog |  5 +++++
 external/gpl3/binutils/dist/bfd/elflink.c |  5 ++++-
 2 files changed, 9 insertions(+), 1 deletions(-)

diffs (27 lines):

diff -r 80c5297b499a -r fdc17bf49028 external/gpl3/binutils/dist/bfd/ChangeLog
--- a/external/gpl3/binutils/dist/bfd/ChangeLog Mon Aug 11 14:07:55 2014 +0000
+++ b/external/gpl3/binutils/dist/bfd/ChangeLog Mon Aug 11 20:53:16 2014 +0000
@@ -1,3 +1,8 @@
+2013-12-14  Alan Modra  <amodra%gmail.com@localhost>
+
+       * elflink.c (_bfd_elf_merge_symbol): If merging a new weak
+       symbol that will be skipped, we don't have a new definition.
+
 2013-03-25  Tristan Gingold  <gingold%adacore.com@localhost>
 
        * configure.in: Bump version to 2.23.2
diff -r 80c5297b499a -r fdc17bf49028 external/gpl3/binutils/dist/bfd/elflink.c
--- a/external/gpl3/binutils/dist/bfd/elflink.c Mon Aug 11 14:07:55 2014 +0000
+++ b/external/gpl3/binutils/dist/bfd/elflink.c Mon Aug 11 20:53:16 2014 +0000
@@ -1442,7 +1442,10 @@
       if (!(oldbfd != NULL
            && (oldbfd->flags & BFD_PLUGIN) != 0
            && (abfd->flags & BFD_PLUGIN) == 0))
-       *skip = TRUE;
+       {
+         newdef = FALSE;
+         *skip = TRUE;
+       }
 
       /* Merge st_other.  If the symbol already has a dynamic index,
         but visibility says it should not be visible, turn it into a