mirrors/binutils-gdb
0
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2024-11-27 12:03:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

x86-64: Set tlsdesc_plt if GOT_TLS_GDESC_P is true

Browse Source 
We need to set tlsdesc_plt for x86-64 if GOT_TLS_GDESC_P is true when
allocating dynamic relocations so that _bfd_x86_elf_size_dynamic_sections
will generate TLSDESC_PLT and TLSDESC_GOT in x86-64 output.

bfd/

	PR ld/22071
	* elfxx-x86.c (elf_x86_allocate_dynrelocs): Set tlsdesc_plt
	for x86-64 if GOT_TLS_GDESC_P is true.

ld/

	PR ld/22071
	* testsuite/ld-x86-64/pr22071.d: New file.
	* testsuite/ld-x86-64/pr22071.s: Likewise.
	* testsuite/ld-x86-64/x86-64.exp: Run pr22071.
This commit is contained in:
H.J. Lu 2017-09-03 10:18:24 -07:00
parent 1cf58434bf
commit 0e30d99180
6 changed files with 105 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bfd/ChangeLog
View File

@ -1,3 +1,9 @@
2017-09-03 H.J. Lu <hongjiu.lu@intel.com>
PR ld/22071
* elfxx-x86.c (elf_x86_allocate_dynrelocs): Set tlsdesc_plt
for x86-64 if GOT_TLS_GDESC_P is true.
2017-09-03 Alan Modra <amodra@gmail.com>
PR 22067

6
bfd/elfxx-x86.c
View File

@ -368,7 +368,11 @@ elf_x86_allocate_dynrelocs (struct elf_link_hash_entry *h,
|| WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, 0, h)))
htab->elf.srelgot->size += htab->sizeof_reloc;
if (GOT_TLS_GDESC_P (tls_type))
htab->elf.srelplt->size += htab->sizeof_reloc;
{
htab->elf.srelplt->size += htab->sizeof_reloc;
if (bed->target_id == X86_64_ELF_DATA)
htab->tlsdesc_plt = (bfd_vma) -1;
}
}
else
h->got.offset = (bfd_vma) -1;

7
ld/ChangeLog
View File

@ -1,3 +1,10 @@
2017-09-03 H.J. Lu <hongjiu.lu@intel.com>
PR ld/22071
* testsuite/ld-x86-64/pr22071.d: New file.
* testsuite/ld-x86-64/pr22071.s: Likewise.
* testsuite/ld-x86-64/x86-64.exp: Run pr22071.
2017-09-02 Alan Modra <amodra@gmail.com>
* ldlang.h (lang_input_statement_type): Expand comments.

8
ld/testsuite/ld-x86-64/pr22071.d Normal file
View File

@ -0,0 +1,8 @@
#as: --64
#ld: -melf_x86_64 -shared
#readelf: -d --wide
#...
.*\(TLSDESC_PLT\).*
.*\(TLSDESC_GOT\).*
#pass

78
ld/testsuite/ld-x86-64/pr22071.s Normal file
View File

@ -0,0 +1,78 @@
.text
.p2align 4,,15
.globl get_ld
.type get_ld, @function
get_ld:
subq $8, %rsp
leaq _TLS_MODULE_BASE_@TLSDESC(%rip), %rax
call *_TLS_MODULE_BASE_@TLSCALL(%rax)
addq $8, %rsp
addq $ld@dtpoff, %rax
addq %fs:0, %rax
ret
.size get_ld, .-get_ld
.p2align 4,,15
.globl set_ld
.type set_ld, @function
set_ld:
subq $8, %rsp
leaq _TLS_MODULE_BASE_@TLSDESC(%rip), %rax
call *_TLS_MODULE_BASE_@TLSCALL(%rax)
movl %edi, %fs:ld@dtpoff(%rax)
addq $8, %rsp
ret
.size set_ld, .-set_ld
.p2align 4,,15
.globl test_ld
.type test_ld, @function
test_ld:
subq $8, %rsp
leaq _TLS_MODULE_BASE_@TLSDESC(%rip), %rax
call *_TLS_MODULE_BASE_@TLSCALL(%rax)
cmpl %edi, %fs:ld@dtpoff(%rax)
sete %al
addq $8, %rsp
movzbl %al, %eax
ret
.size test_ld, .-test_ld
.p2align 4,,15
.globl get_gd
.type get_gd, @function
get_gd:
subq $8, %rsp
leaq gd@TLSDESC(%rip), %rax
call *gd@TLSCALL(%rax)
addq $8, %rsp
addq %fs:0, %rax
ret
.size get_gd, .-get_gd
.p2align 4,,15
.globl set_gd
.type set_gd, @function
set_gd:
subq $8, %rsp
leaq gd@TLSDESC(%rip), %rax
call *gd@TLSCALL(%rax)
movl %edi, %fs:(%rax)
addq $8, %rsp
ret
.size set_gd, .-set_gd
.p2align 4,,15
.globl test_gd
.type test_gd, @function
test_gd:
subq $8, %rsp
leaq gd@TLSDESC(%rip), %rax
call *gd@TLSCALL(%rax)
cmpl %edi, %fs:(%rax)
sete %al
addq $8, %rsp
movzbl %al, %eax
ret
.size test_gd, .-test_gd
.section .tbss,"awT",@nobits
.align 4
.type ld, @object
.size ld, 4
ld:
.zero 4

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

@ -368,6 +368,7 @@ run_dump_test "property-x86-shstk5"
run_dump_test "property-x86-shstk5-x32"
run_dump_test "pr21884"
run_dump_test "pr21884-nacl"
run_dump_test "pr22071"
if { ![istarget "x86_64-*-linux*"] && ![istarget "x86_64-*-nacl*"]} {
return