diff options
| -rw-r--r-- | gold/ChangeLog | 7 | ||||
| -rw-r--r-- | gold/arm.cc | 7 | ||||
| -rwxr-xr-x | gold/testsuite/script_test_5.sh | 4 |
3 files changed, 12 insertions, 6 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog index 92f8344..34b582f 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,5 +1,12 @@ 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 flags and attributes merging if an input file is a binary file. * fileread.cc (Input_file::open): Record format of original file. diff --git a/gold/arm.cc b/gold/arm.cc index 497072a..136fed6 100644 --- 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 9415483..76e2e31 100755 --- 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 |