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 5bdda032308bf4ebeadd1d269b79d93ab0bcdf5e..0c1a7e1cf599ab1d05d686bf213150ec3cc625e2 100644 (file)
--- 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 a4ef31ac5c249db077728f9720562f9c515949d1..c12037671fdfa9abfeff89607b8a0158f65e144a 100644 (file)
--- 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)