From 115c6d5c37ee70477adc3d8c45ec7d77c2278951 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Sat, 5 Apr 2014 12:38:47 +1030 Subject: [PATCH] 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. --- bfd/ChangeLog | 5 +++++ bfd/elflink.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index f5216eb0954..6ad175fd044 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2014-04-05 Alan Modra + + * elflink.c (_bfd_elf_add_default_symbol): Pass poldbfd when + merging non-default sym. + 2014-04-04 Tristan Gingold * 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 354f8d0c380..3de00e10eee 100644 --- 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;