* layout.cc (Layout::make_output_section): Mark .tdata section
	as RELRO.
	* testsuite/relro_test.cc: Add a TLS variable.
This commit is contained in:
Cary Coutant 2012-05-14 17:35:43 +00:00
parent e7e0cddfb0
commit 1007b5031a
3 changed files with 13 additions and 1 deletions

View File

@ -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

View File

@ -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)
{

View File

@ -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;
}