gold/

	* layout.cc (Layout::make_output_section): Mark .tdata section
	as RELRO.
	* testsuite/relro_test.cc: Add a TLS variable.

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 7fffe40fd6ba2a59054b7c28d54048f5037e1460..80ce49ed7007f93889a0071f2ce3402e865ba092 100644 (file)
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-14  Cary Coutant  <ccoutant@google.com>
+
+       * layout.cc (Layout::make_output_section): Mark .tdata section
+       as RELRO.
+       * testsuite/relro_test.cc: Add a TLS variable.
+
 2012-05-10  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR gold/14091

diff --git a/gold/layout.cc b/gold/layout.cc
index b58f9d2e40df244c82d2aa40e75067040aa8b6e2..0ac0fbf9175e407ca223c7884cddaf4292d26089 100644 (file)
--- a/gold/layout.cc
+++ b/gold/layout.cc
@@ -1430,7 +1430,9 @@ Layout::make_output_section(const char* name, elfcpp::Elf_Word type,
     {
       if (type == elfcpp::SHT_PROGBITS)
        {
-         if (strcmp(name, ".data.rel.ro") == 0)
+         if ((flags & elfcpp::SHF_TLS) != 0)
+           is_relro = true;
+         else if (strcmp(name, ".data.rel.ro") == 0)
            is_relro = true;
          else if (strcmp(name, ".data.rel.ro.local") == 0)
            {

diff --git a/gold/testsuite/relro_test.cc b/gold/testsuite/relro_test.cc
index d74102245a49a46d92c3350376eec263190f049b..795ad391097ec4a8c6e17e32c7800250d2967005 100644 (file)
--- a/gold/testsuite/relro_test.cc
+++ b/gold/testsuite/relro_test.cc
@@ -45,6 +45,9 @@ int* const p1 __attribute__ ((aligned(64))) = &i1;
 // P2 is a local relro variable.
 int* const p2 __attribute__ ((aligned(64))) = &i2;
 
+// Add a TLS variable to make sure -z relro works correctly with TLS.
+__thread int i3 = 1;
+
 // Test symbol addresses.
 
 bool
@@ -76,6 +79,7 @@ t1()
   assert(i1page != p2page);
   assert(i2page != p1page);
   assert(i2page != p2page);
+  assert(i3 == 1);
 
   return true;
 }