From: Ian Lance Taylor <ian@airs.com>
Date: Thu, 15 Mar 2012 16:32:22 +0000 (+0000)
Subject: 	PR gold/13850
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=14dc9ef7d17b555efe65bb40ff358696c4f038ad;p=binutils-gdb.git

	PR gold/13850
	* layout.cc (Layout::make_output_section): Correctly mark
	SHT_INIT_ARRAY, et. al., as relro.
---

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 5bdda032308..0c1a7e1cf59 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,9 @@
+2012-03-15  Ian Lance Taylor  <iant@google.com>
+
+	PR gold/13850
+	* layout.cc (Layout::make_output_section): Correctly mark
+	SHT_INIT_ARRAY, et. al., as relro.
+
 2012-03-14  Doug Kwan  <dougkwan@google.com>
 
 	* gold/arm.cc (Target_arm::Scan::global): Generate R_ARM_GLOB_DAT
diff --git a/gold/layout.cc b/gold/layout.cc
index a4ef31ac5c2..c12037671fd 100644
--- a/gold/layout.cc
+++ b/gold/layout.cc
@@ -1379,25 +1379,27 @@ Layout::make_output_section(const char* name, elfcpp::Elf_Word type,
   bool is_relro_local = false;
   if (!this->script_options_->saw_sections_clause()
       && parameters->options().relro()
-      && type == elfcpp::SHT_PROGBITS
       && (flags & elfcpp::SHF_ALLOC) != 0
       && (flags & elfcpp::SHF_WRITE) != 0)
     {
-      if (strcmp(name, ".data.rel.ro") == 0)
-	is_relro = true;
-      else if (strcmp(name, ".data.rel.ro.local") == 0)
+      if (type == elfcpp::SHT_PROGBITS)
 	{
-	  is_relro = true;
-	  is_relro_local = true;
+	  if (strcmp(name, ".data.rel.ro") == 0)
+	    is_relro = true;
+	  else if (strcmp(name, ".data.rel.ro.local") == 0)
+	    {
+	      is_relro = true;
+	      is_relro_local = true;
+	    }
+	  else if (strcmp(name, ".ctors") == 0
+		   || strcmp(name, ".dtors") == 0
+		   || strcmp(name, ".jcr") == 0)
+	    is_relro = true;
 	}
       else if (type == elfcpp::SHT_INIT_ARRAY
 	       || type == elfcpp::SHT_FINI_ARRAY
 	       || type == elfcpp::SHT_PREINIT_ARRAY)
 	is_relro = true;
-      else if (strcmp(name, ".ctors") == 0
-	       || strcmp(name, ".dtors") == 0
-	       || strcmp(name, ".jcr") == 0)
-	is_relro = true;
     }
 
   if (is_relro)