From fbcc8bafeb413a111cd3caab39b3ab57d5b8ce93 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Fri, 7 Dec 2018 15:39:49 -0800 Subject: Override the previous definition from IR object Mark the previous definition from IR object as undefined so that the generic linker will override it. bfd/ PR ld/23958 * elflink.c (_bfd_elf_add_default_symbol): Override the previous definition from IR object. ld/ PR ld/23958 * testsuite/ld-plugin/lto.exp: Run PR ld/23958 test. * testsuite/ld-plugin/pr23958.c: New file. * testsuite/ld-plugin/pr23958.t: Likewise. --- bfd/ChangeLog | 6 ++++++ bfd/elflink.c | 9 +++++++++ 2 files changed, 15 insertions(+) (limited to 'bfd') diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 85277a1..aa8be34 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2018-12-07 H.J. Lu + + PR ld/23958 + * elflink.c (_bfd_elf_add_default_symbol): Override the previous + definition from IR object. + 2018-12-08 Stafford Horne * elf32-or1k.c (or1k_grok_prstatus): New function. diff --git a/bfd/elflink.c b/bfd/elflink.c index 4eca389..8992a50 100644 --- a/bfd/elflink.c +++ b/bfd/elflink.c @@ -1941,6 +1941,15 @@ _bfd_elf_add_default_symbol (bfd *abfd, if (! bfd_link_relocatable (info)) { bh = &hi->root; + if (bh->type == bfd_link_hash_defined + && (bh->u.def.section->owner->flags & BFD_PLUGIN) != 0) + { + /* Mark the previous definition from IR object as + undefined so that the generic linker will override + it. */ + bh->type = bfd_link_hash_undefined; + bh->u.undef.abfd = bh->u.def.section->owner; + } if (! (_bfd_generic_link_add_one_symbol (info, abfd, shortname, BSF_INDIRECT, bfd_ind_section_ptr, -- cgit v1.1