This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
PATCH: PR gold/14858: X32 TLS relocations are incorrectly handled
- From: "H.J. Lu" <hjl dot tools at gmail dot com>
- To: binutils at sourceware dot org
- Cc: ian at airs dot com
- Date: Mon, 19 Nov 2012 20:49:21 -0800
- Subject: PATCH: PR gold/14858: X32 TLS relocations are incorrectly handled
Hi,
This patch properly handles LD to LE optimizaton for x32. OK to
install for trunk and 2.23?
BTW, we can use
memcpy(view - 3, "\x66\x66\x66\x64\x48\x8b\x04\x25\0\0\0", 12);
instead of
memcpy(view - 3, "\x66\x66\x66\x64\x48\x8b\x04\x25\0\0\0\0", 12);
since there is a nul terminator at the end of string. But my patch
leaves it alone.
Thanks.
H.J.
2012-11-19 H.J. Lu <hongjiu.lu@intel.com>
PR gold/14858
* x86_64.cc (Relocate::tls_ld_to_le): Support x32.
diff --git a/gold/x86_64.cc b/gold/x86_64.cc
index 6342196..fd3a202 100644
--- a/gold/x86_64.cc
+++ b/gold/x86_64.cc
@@ -3965,8 +3965,12 @@ Target_x86_64<size>::Relocate::tls_ld_to_le(
section_size_type view_size)
{
// leaq foo@tlsld(%rip),%rdi; call __tls_get_addr@plt;
+ // For SIZE == 64:
// ... leq foo@dtpoff(%rax),%reg
// ==> .word 0x6666; .byte 0x66; movq %fs:0,%rax ... leaq x@tpoff(%rax),%rdx
+ // For SIZE == 32:
+ // ... leq foo@dtpoff(%rax),%reg
+ // ==> nopl 0x0(%rax); movq %fs:0,%eax ... leaq x@tpoff(%rax),%rdx
tls::check_range(relinfo, relnum, rela.get_r_offset(), view_size, -3);
tls::check_range(relinfo, relnum, rela.get_r_offset(), view_size, 9);
@@ -3976,7 +3980,10 @@ Target_x86_64<size>::Relocate::tls_ld_to_le(
tls::check_tls(relinfo, relnum, rela.get_r_offset(), view[4] == 0xe8);
- memcpy(view - 3, "\x66\x66\x66\x64\x48\x8b\x04\x25\0\0\0\0", 12);
+ if (size == 64)
+ memcpy(view - 3, "\x66\x66\x66\x64\x48\x8b\x04\x25\0\0\0\0", 12);
+ else
+ memcpy(view - 3, "\x0f\x1f\x40\x00\x64\x8b\x04\x25\0\0\0\0", 12);
// The next reloc should be a PLT32 reloc against __tls_get_addr.
// We can skip it.