This is the mail archive of the binutils-cvs@sourceware.org mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[binutils-gdb/binutils-2_25-branch] Correct GOLD PowerPC64 local-dynamic TLS linker optimization


https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=8e5ffad188dc9480e04e2952a96e1682c1470643

commit 8e5ffad188dc9480e04e2952a96e1682c1470643
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  |  4 ++++
 gold/powerpc.cc | 16 ++++++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/gold/ChangeLog b/gold/ChangeLog
index b7b2d9a..2c4a8c3 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,6 +1,10 @@
 2015-02-11  Alan Modra  <amodra@gmail.com>
 
 	Apply from master
+	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-22  Alan Modra  <amodra@gmail.com>
 	* powerpc.cc (Target_powerpc::Scan::local <got relocs>): Correct
 	condition for need of ifunc plt entry.
diff --git a/gold/powerpc.cc b/gold/powerpc.cc
index 707acda..264bbd8 100644
--- a/gold/powerpc.cc
+++ b/gold/powerpc.cc
@@ -3092,8 +3092,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;
@@ -6921,9 +6919,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());
@@ -6956,9 +6957,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;


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]