2010-02-24 Doug Kwan <dougkwan@google.com>

	* arm.cc (Target_arm::got_section): Make the .got section the first
	non RELRO section in the data segment.
	* testsuite/script_test_5.sh: Fix match patterns to avoid matching
	suffixes of section names.

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 92f83448356756894dfeecd174ef8286b052b6b3..34b582ffa6c941df4bc77c2ca42b85da41c80f09 100644 (file)
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,10 @@
+2010-02-24  Doug Kwan  <dougkwan@google.com>
+
+       * arm.cc (Target_arm::got_section): Make the .got section the first
+       non RELRO section in the data segment.
+       * testsuite/script_test_5.sh: Fix match patterns to avoid matching
+       suffixes of section names.
+
 2010-02-24  Doug Kwan  <dougkwan@google.com>
 
        * arm.cc (Target_arm::do_finalize_sections): Skip processor specific

diff --git a/gold/arm.cc b/gold/arm.cc
index 497072a8706edd38c7831178823cbcc63747028c..136fed630788a7cacac2e2d39cbe29e5e0f4a0bb 100644 (file)
--- a/gold/arm.cc
+++ b/gold/arm.cc
@@ -3949,9 +3949,8 @@ Target_arm<big_endian>::got_section(Symbol_table* symtab, Layout* layout)
       os = layout->add_output_section_data(".got", elfcpp::SHT_PROGBITS,
                                           (elfcpp::SHF_ALLOC
                                            | elfcpp::SHF_WRITE),
-                                          this->got_, false, true, true,
-                                          false);
-
+                                          this->got_, false, false, false,
+                                          true);
       // The old GNU linker creates a .got.plt section.  We just
       // create another set of data in the .got section.  Note that we
       // always create a PLT if we create a GOT, although the PLT
@@ -3961,7 +3960,7 @@ Target_arm<big_endian>::got_section(Symbol_table* symtab, Layout* layout)
                                           (elfcpp::SHF_ALLOC
                                            | elfcpp::SHF_WRITE),
                                           this->got_plt_, false, false,
-                                          false, true);
+                                          false, false);
 
       // The first three entries are reserved.
       this->got_plt_->set_current_data_size(3 * 4);

diff --git a/gold/testsuite/script_test_5.sh b/gold/testsuite/script_test_5.sh
index 941548305de04fcef86d97ffcfa23ca4e90f12d8..76e2e3171547c88dd5a795d817413aa634cd88ca 100755 (executable)
--- a/gold/testsuite/script_test_5.sh
+++ b/gold/testsuite/script_test_5.sh
@@ -39,5 +39,5 @@ check_count()
     fi
 }
 
-check_count script_test_5.stdout ".text " 1
-check_count script_test_5.stdout ".text.foo " 1
+check_count script_test_5.stdout " .text " 1
+check_count script_test_5.stdout " .text.foo " 1