Fix assertion failure relaxing TLS for position-independent executables.

gold/
	PR gold/21444
	* gold.cc (Target_sparc::Relocate::relocate_tls): Local
	variables are final for position-independent executables. This
	has to be consistent with Target_sparc::Scan::local otherwise
	they will disagree as to whether local-exec is used.

diff --git a/gold/ChangeLog b/gold/ChangeLog
index d598386fd7a0373c0707cf1770b29482824430d9..eaf30d3913d3f66dedc1b0d0f0f29387fc022857 100644 (file)
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,11 @@
+2017-05-13  James Clarke  <jrtc27@jrtc27.com>
+
+       PR gold/21444
+       * gold.cc (Target_sparc::Relocate::relocate_tls): Local
+       variables are final for position-independent executables. This
+       has to be consistent with Target_sparc::Scan::local otherwise
+       they will disagree as to whether local-exec is used.
+
 2017-02-22  Alan Modra  <amodra@gmail.com>
 
        * powerpc.cc (Target_powerpc::make_iplt_section): Check that

diff --git a/gold/sparc.cc b/gold/sparc.cc
index a9cb93adda2e2ebe199a8fd92f26fc0b94f69668..54c7c334984e62772619888fff43f80e17bcc93e 100644 (file)
--- a/gold/sparc.cc
+++ b/gold/sparc.cc
@@ -3730,7 +3730,7 @@ Target_sparc<size, big_endian>::Relocate::relocate_tls(
 
   const bool is_final =
     (gsym == NULL
-     ? !parameters->options().output_is_position_independent()
+     ? !parameters->options().shared()
      : gsym->final_value_is_known());
   const tls::Tls_optimization optimized_type
       = optimize_tls_reloc(is_final, r_type);