* 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.

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 363de0fe8866df03e72de7c1a9d06cc30ae8163b..f9525984102fe71252ae1b8118913896a3fe582c 100644 (file)
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,10 @@
+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,

diff --git a/gold/layout.cc b/gold/layout.cc
index f44640cd55853e90b5ec39efd1c160180eedefcb..1e5d23ef64ad7e61925b1419589e3c07f53ea235 100644 (file)
--- 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 0134d338ddaf2492f69356785c8e1e43fdc3b18b..d6d08ffacfff5fcb3f02508ba1b395db57c876b0 100644 (file)
--- 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);