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

x86: Don't set eh->local_ref to 1 for versioned symbol 

bfd_hide_sym_by_version can't be used to check if a versioned symbol is
hidden.  It has to be synced with _bfd_elf_link_assign_sym_version to
get the correct answer.

bfd/

	PR ld/23194
	* elfxx-x86.c (_bfd_x86_elf_link_symbol_references_local): Don't
	set eh->local_ref to 1 if a symbol is versioned and there is a
	version script.

ld/

	PR ld/23194
	* testsuite/ld-i386/i386.exp: Run pr23194.
	* testsuite/ld-x86-64/x86-64.exp: Likewise.
	* testsuite/ld-i386/pr23194.d: New file.
	* testsuite/ld-i386/pr23194.map: Likewise.
	* testsuite/ld-i386/pr23194.s: Likewise.
	* testsuite/ld-x86-64/pr23194.d: Likewise.
	* testsuite/ld-x86-64/pr23194.map: Likewise.
	* testsuite/ld-x86-64/pr23194.s: Likewise.
This commit is contained in:
H.J. Lu 2018-05-18 14:23:41 -07:00
parent 941036f4ff
commit 97373b2eba
11 changed files with 76 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bfd/ChangeLog
View File

@ -1,3 +1,10 @@
2018-05-18 H.J. Lu <hongjiu.lu@intel.com>
PR ld/23194
* elfxx-x86.c (_bfd_x86_elf_link_symbol_references_local): Don't
set eh->local_ref to 1 if a symbol is versioned and there is a
version script.
2018-05-18 Kito Cheng <kito.cheng@gmail.com>
* elfnn-riscv.c (_bfd_riscv_elf_merge_private_bfd_data): Handle

7
bfd/elfxx-x86.c
View File

@ -2048,8 +2048,11 @@ _bfd_x86_elf_link_symbol_references_local (struct bfd_link_info *info,
}
/* Symbols created by HIDDEN and PROVIDE_HIDDEN assignments in linker
script aren't forced local here yet. */
if (!h->root.ldscript_def)
script aren't forced local here yet. bfd_hide_sym_by_version
can't be used to check if a versioned symbol is hidden. It has to
be syncd with _bfd_elf_link_assign_sym_version to get the correct
answer. */
if (!h->root.ldscript_def && h->versioned == unversioned)
eh->local_ref = 1;
return FALSE;

12
ld/ChangeLog
View File

@ -1,3 +1,15 @@
2018-05-18 H.J. Lu <hongjiu.lu@intel.com>
PR ld/23194
* testsuite/ld-i386/i386.exp: Run pr23194.
* testsuite/ld-x86-64/x86-64.exp: Likewise.
* testsuite/ld-i386/pr23194.d: New file.
* testsuite/ld-i386/pr23194.map: Likewise.
* testsuite/ld-i386/pr23194.s: Likewise.
* testsuite/ld-x86-64/pr23194.d: Likewise.
* testsuite/ld-x86-64/pr23194.map: Likewise.
* testsuite/ld-x86-64/pr23194.s: Likewise.
2018-05-18 H.J. Lu <hongjiu.lu@intel.com>
* testsuite/ld-i386/i386.exp: Run pr23189 for all targets.

1
ld/testsuite/ld-i386/i386.exp
View File

@ -459,6 +459,7 @@ run_dump_test "pr22135"
run_dump_test "pr22782"
run_dump_test "pr22929"
run_dump_test "pr23189"
run_dump_test "pr23194"
if { !([istarget "i?86-*-linux*"]
|| [istarget "i?86-*-gnu*"]

7
ld/testsuite/ld-i386/pr23194.d Normal file
View File

@ -0,0 +1,7 @@
#as: --32 -mrelax-relocations=yes
#ld: -shared -melf_i386 --version-script pr23194.map
#readelf: -r --wide
Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 1 entry:
Offset Info Type Sym. Value Symbol's Name
[0-9a-f]+ +[0-9a-f]+ +R_386_RELATIVE +

6
ld/testsuite/ld-i386/pr23194.map Normal file
View File

@ -0,0 +1,6 @@
FOO {
global:
bar;
local:
*;
};

12
ld/testsuite/ld-i386/pr23194.s Normal file
View File

@ -0,0 +1,12 @@
.text
.symver foo,foo@FOO
.globl foo
.type foo, @function
foo:
ret
.size foo, .-foo
.globl bar
.type bar, @function
bar:
jmp *foo@GOT(%eax)
.size bar, .-bar

7
ld/testsuite/ld-x86-64/pr23194.d Normal file
View File

@ -0,0 +1,7 @@
#as: --64 -mrelax-relocations=yes
#ld: -shared -melf_x86_64 --version-script pr23194.map
#readelf: -r --wide
Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 1 entry:
Offset Info Type Symbol's Value Symbol's Name \+ Addend
[0-9a-f]+ +[0-9a-f]+ +R_X86_64_RELATIVE +[0-9a-f]+

6
ld/testsuite/ld-x86-64/pr23194.map Normal file
View File

@ -0,0 +1,6 @@
FOO {
global:
bar;
local:
*;
};

12
ld/testsuite/ld-x86-64/pr23194.s Normal file
View File

@ -0,0 +1,12 @@
.text
.symver foo,foo@FOO
.globl foo
.type foo, @function
foo:
ret
.size foo, .-foo
.globl bar
.type bar, @function
bar:
jmp *foo@GOTPCREL(%rip)
.size bar, .-bar

1
ld/testsuite/ld-x86-64/x86-64.exp
View File

@ -396,6 +396,7 @@ run_dump_test "pr22135"
run_dump_test "pr22782a"
run_dump_test "pr22782b"
run_dump_test "pr23189"
run_dump_test "pr23194"
if { ![istarget "x86_64-*-linux*"] && ![istarget "x86_64-*-nacl*"]} {
return