OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
H.J. Lu 2018-12-07 15:39:49 -08:00
parent d9c859da9f
commit fbcc8bafeb
6 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bfd/ChangeLog
View File

@ -1,3 +1,9 @@
2018-12-07 H.J. Lu <hongjiu.lu@intel.com>
PR ld/23958
* elflink.c (_bfd_elf_add_default_symbol): Override the previous
definition from IR object.
2018-12-08 Stafford Horne <shorne@gmail.com> 2018-12-08 Stafford Horne <shorne@gmail.com>
* elf32-or1k.c (or1k_grok_prstatus): New function. * elf32-or1k.c (or1k_grok_prstatus): New function.

9
bfd/elflink.c
View File

@ -1941,6 +1941,15 @@ _bfd_elf_add_default_symbol (bfd *abfd,
if (! bfd_link_relocatable (info)) if (! bfd_link_relocatable (info))
{ {
bh = &hi->root; 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 if (! (_bfd_generic_link_add_one_symbol
(info, abfd, shortname, BSF_INDIRECT, (info, abfd, shortname, BSF_INDIRECT,
bfd_ind_section_ptr, bfd_ind_section_ptr,

7
ld/ChangeLog
View File

@ -1,3 +1,10 @@
2018-12-07 H.J. Lu <hongjiu.lu@intel.com>
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.
2018-12-07 H.J. Lu <hongjiu.lu@intel.com> 2018-12-07 H.J. Lu <hongjiu.lu@intel.com>
* NEWS: Updated for property change report. * NEWS: Updated for property change report.

6
ld/testsuite/ld-plugin/lto.exp
View File

@ -225,6 +225,12 @@ set lto_link_tests [list \
{pr23818a.c pr23818b.c} \ {pr23818a.c pr23818b.c} \
{{"readelf" {-s --wide} "pr23818.d"}} \ {{"readelf" {-s --wide} "pr23818.d"}} \
"libpr23818.so"] \ "libpr23818.so"] \
[list "Build libpr23958.so" \
"-shared -flto -Wl,-version-script,pr23958.t" \
"-g -flto $lto_fat" \
{pr23958.c} \
"" \
"libpr23958.so"] \
] ]
if { [at_least_gcc_version 4 7] } { if { [at_least_gcc_version 4 7] } {

6
ld/testsuite/ld-plugin/pr23958.c Normal file
View File

@ -0,0 +1,6 @@
void
dwarf_bytesize (void)
{
}
asm (".symver dwarf_bytesize,dwarf_bytesize@@@ELFUTILS_0.143");

4
ld/testsuite/ld-plugin/pr23958.t Normal file
View File

@ -0,0 +1,4 @@
ELFUTILS_0.143 {
global:
dwarf_bytesize;
};