* 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.
This commit is contained in:
Cary Coutant 2011-06-08 04:34:22 +00:00
parent a5ee4d5d1e
commit fb0e076f5c
3 changed files with 9 additions and 5 deletions

View file

@ -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,

View file

@ -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

View file

@ -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);