diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2020-05-01 10:08:31 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2020-05-01 10:08:48 -0700 |
| commit | 6d520e36de0229eefe2f1671438cc8333a90b5e6 (patch) | |
| tree | 715843d140e793d17d2f3ef1728987bcf30704cc /gold/x86_64.cc | |
| parent | e10cfd063328872efa721b4a08b9d52486fb5878 (diff) | |
| download | binutils-gdb-6d520e36de0229eefe2f1671438cc8333a90b5e6.tar.gz | |
gold: x86-64: Fix TLSDESC -> LE relaxation
X86-64 TLSDESC sequences can be:
4c 8d 0d 00 00 00 00 leaq foo@TLSDESC(%rip), %r9
4c 89 c8 movq %r9, %rax
ff 10 call *foo@TLSCALL(%rax)
TLSDESC -> LE relaxation can turn them into:
49 c7 c1 fc ff ff ff mov $0xfffffffffffffffc,%r9
4c 89 c8 mov %r9,%rax
66 90 xchg %ax,%ax
We need to check and update the REX byte in this case.
PR gold/25473
* x86_64.cc (Target_x86_64<size>::Relocate::tls_desc_gd_to_ie):
Properly check r8 - r15 in "lea foo@TLSDESC(%rip), %reg".
(Target_x86_64<size>::Relocate::tls_desc_gd_to_le): Properly
relax r8 - r15 in "lea foo@TLSDESC(%rip), %reg".
* testsuite/Makefile.am (check_SCRIPTS): Add x86_64_gd_to_le.sh.
(check_DATA): Add x86_64_gd_to_le.stdout.
(MOSTLYCLEANFILES): Add x86_64_gd_to_le.
(x86_64_gd_to_le.o): New target.
(x86_64_gd_to_le): Likewise.
(x86_64_gd_to_le.stdout): Likewise.
* testsuite/Makefile.in: Regenerated.
* testsuite/x86_64_gd_to_le.s: New file.
* testsuite/x86_64_gd_to_le.sh: Likewise.
Diffstat (limited to 'gold/x86_64.cc')
| -rw-r--r-- | gold/x86_64.cc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/gold/x86_64.cc b/gold/x86_64.cc index 114ebb081fd..d4f1d6b2324 100644 --- a/gold/x86_64.cc +++ b/gold/x86_64.cc @@ -5477,7 +5477,9 @@ Target_x86_64<size>::Relocate::tls_desc_gd_to_ie( tls::check_range(relinfo, relnum, rela.get_r_offset(), view_size, -3); tls::check_range(relinfo, relnum, rela.get_r_offset(), view_size, 4); tls::check_tls(relinfo, relnum, rela.get_r_offset(), - view[-3] == 0x48 && view[-2] == 0x8d && view[-1] == 0x05); + ((view[-3] & 0xfb) == 0x48 + && view[-2] == 0x8d + && (view[-1] & 0xc7) == 0x05)); view[-2] = 0x8b; const elfcpp::Elf_Xword addend = rela.get_r_addend(); Relocate_functions<size, false>::pcrela32(view, value, addend, address); @@ -5516,9 +5518,12 @@ Target_x86_64<size>::Relocate::tls_desc_gd_to_le( tls::check_range(relinfo, relnum, rela.get_r_offset(), view_size, -3); tls::check_range(relinfo, relnum, rela.get_r_offset(), view_size, 4); tls::check_tls(relinfo, relnum, rela.get_r_offset(), - view[-3] == 0x48 && view[-2] == 0x8d && view[-1] == 0x05); + ((view[-3] & 0xfb) == 0x48 + && view[-2] == 0x8d + && (view[-1] & 0xc7) == 0x05)); + view[-3] = 0x48 | ((view[-3] >> 2) & 1); view[-2] = 0xc7; - view[-1] = 0xc0; + view[-1] = 0xc0 | ((view[-1] >> 3) & 7); value -= tls_segment->memsz(); Relocate_functions<size, false>::rela32(view, value, 0); } |