Fix map file reference

The testcase in pr16417 comment #6 produces a map file showing
libpthread.so.0               (write@@GLIBC_2.2.5)
ie. missing the file referencing the symbol.

	* elflink.c (_bfd_elf_add_default_symbol): Pass poldbfd when
	merging non-default sym.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index f5216eb0954a09a0a39e6c60502b89e34c58fc3f..6ad175fd0448daedc18902aad62de24627d9ef35 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-05  Alan Modra  <amodra@gmail.com>
+
+       * elflink.c (_bfd_elf_add_default_symbol): Pass poldbfd when
+       merging non-default sym.
+
 2014-04-04  Tristan Gingold  <gingold@adacore.com>
 
        * mach-o.c (bfd_mach_o_header_p): Reject 64 bit target when not

diff --git a/bfd/elflink.c b/bfd/elflink.c
index 354f8d0c3807d1e1810b75543403f73c7e3e009e..3de00e10eee140b7eb29725b57d05d1530b6bd9c 100644 (file)
--- a/bfd/elflink.c
+++ b/bfd/elflink.c
@@ -1745,7 +1745,7 @@ nondefault:
   size_change_ok = FALSE;
   tmp_sec = sec;
   if (!_bfd_elf_merge_symbol (abfd, info, shortname, sym, &tmp_sec, &value,
-                             &hi, NULL, NULL, NULL, &skip, &override,
+                             &hi, poldbfd, NULL, NULL, &skip, &override,
                              &type_change_ok, &size_change_ok))
     return FALSE;