This is the mail archive of the
binutils-cvs@sourceware.org
mailing list for the binutils project.
[binutils-gdb] Correct GOLD PowerPC64 local-dynamic TLS linker optimization
- From: Alan Modra <amodra at sourceware dot org>
- To: bfd-cvs at sourceware dot org
- Date: 29 Jan 2015 10:07:39 -0000
- Subject: [binutils-gdb] Correct GOLD PowerPC64 local-dynamic TLS linker optimization
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=0f81d3f0a799c6e8c2a89d7f519916e3c9c0f65e
commit 0f81d3f0a799c6e8c2a89d7f519916e3c9c0f65e
Author: Alan Modra <amodra@gmail.com>
Date: Thu Jan 29 20:33:26 2015 +1030
Correct GOLD PowerPC64 local-dynamic TLS linker optimization
Similar to b86ac8e3
* powerpc.cc (Target_powerpc::Relocate::relocate): Correct GOT_TLSLD
and GOT_TLSGD to LE optimization.
Diff:
---
gold/ChangeLog | 5 +++++
gold/powerpc.cc | 16 ++++++++++------
2 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/gold/ChangeLog b/gold/ChangeLog
index 2944b51..8803028 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-29 Alan Modra <amodra@gmail.com>
+
+ * powerpc.cc (Target_powerpc::Relocate::relocate): Correct GOT_TLSLD
+ and GOT_TLSGD to LE optimization.
+
2015-01-28 Cary Coutant <ccoutant@google.com>
* x86_64.cc (Target_x86_64::Scan::global): Allow IE-to-LE optimization
diff --git a/gold/powerpc.cc b/gold/powerpc.cc
index 2eae938..ac8d05b 100644
--- a/gold/powerpc.cc
+++ b/gold/powerpc.cc
@@ -3178,8 +3178,6 @@ static const uint32_t addi_11_11 = 0x396b0000;
static const uint32_t addi_12_12 = 0x398c0000;
static const uint32_t addis_0_2 = 0x3c020000;
static const uint32_t addis_0_13 = 0x3c0d0000;
-static const uint32_t addis_3_2 = 0x3c620000;
-static const uint32_t addis_3_13 = 0x3c6d0000;
static const uint32_t addis_11_2 = 0x3d620000;
static const uint32_t addis_11_11 = 0x3d6b0000;
static const uint32_t addis_11_30 = 0x3d7e0000;
@@ -7008,9 +7006,12 @@ Target_powerpc<size, big_endian>::Relocate::relocate(
|| r_type == elfcpp::R_POWERPC_GOT_TLSGD16_LO)
{
Insn* iview = reinterpret_cast<Insn*>(view - 2 * big_endian);
- Insn insn = addis_3_13;
+ Insn insn = elfcpp::Swap<32, big_endian>::readval(iview);
+ insn &= (1 << 26) - (1 << 21); // extract rt
if (size == 32)
- insn = addis_3_2;
+ insn |= addis_0_2;
+ else
+ insn |= addis_0_13;
elfcpp::Swap<32, big_endian>::writeval(iview, insn);
r_type = elfcpp::R_POWERPC_TPREL16_HA;
value = psymval->value(object, rela.get_r_addend());
@@ -7043,9 +7044,12 @@ Target_powerpc<size, big_endian>::Relocate::relocate(
|| r_type == elfcpp::R_POWERPC_GOT_TLSLD16_LO)
{
Insn* iview = reinterpret_cast<Insn*>(view - 2 * big_endian);
- Insn insn = addis_3_13;
+ Insn insn = elfcpp::Swap<32, big_endian>::readval(iview);
+ insn &= (1 << 26) - (1 << 21); // extract rt
if (size == 32)
- insn = addis_3_2;
+ insn |= addis_0_2;
+ else
+ insn |= addis_0_13;
elfcpp::Swap<32, big_endian>::writeval(iview, insn);
r_type = elfcpp::R_POWERPC_TPREL16_HA;
value = dtp_offset;