diff options
| -rw-r--r-- | gold/ChangeLog | 7 | ||||
| -rw-r--r-- | gold/layout.cc | 2 | ||||
| -rw-r--r-- | gold/output.cc | 5 |
3 files changed, 9 insertions, 5 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog index 363de0fe886..f9525984102 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,5 +1,12 @@ 2011-06-07 Cary Coutant <ccoutant@google.com> + * layout.cc (Layout::set_segment_offsets): Don't adjust layout + for incremental links. + * output.cc (Output_segment::set_section_list_addresses): Remove + FIXME and test for TLS or BSS. + +2011-06-07 Cary Coutant <ccoutant@google.com> + * testsuite/Makefile.am: Add incremental_copy_test, incremental_common_test_1. * testsuite/Makefile.in: Regenerate. diff --git a/gold/layout.cc b/gold/layout.cc index f44640cd558..1e5d23ef64a 100644 --- a/gold/layout.cc +++ b/gold/layout.cc @@ -2957,7 +2957,7 @@ Layout::set_segment_offsets(const Target* target, Output_segment* load_seg, if (!are_addresses_set && !has_relro && aligned_addr != addr - && !parameters->incremental_update()) + && !parameters->incremental()) { uint64_t first_off = (common_pagesize - (aligned_addr diff --git a/gold/output.cc b/gold/output.cc index 0134d338dda..d6d08ffacff 100644 --- a/gold/output.cc +++ b/gold/output.cc @@ -4156,10 +4156,7 @@ Output_segment::set_section_list_addresses(Layout* layout, bool reset, } } - // FIXME: Need to handle TLS and .bss with incremental update. - if (!parameters->incremental_update() - || (*p)->is_section_flag_set(elfcpp::SHF_TLS) - || (*p)->is_section_type(elfcpp::SHT_NOBITS)) + if (!parameters->incremental_update()) { off = align_address(off, align); (*p)->set_address_and_file_offset(addr + (off - startoff), off); |