From 154e0e9aa714f93206c01ab62920a8ce9220fd9c Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Tue, 15 Apr 2008 04:06:41 +0000 Subject: * layout.cc (Layout::Layout): Initialize sections_are_attached_. (Layout::get_output_section): Ignore SHF_WRITE and SHF_EXECINSTR in the name/type/flags to section mapping. Don't call allocate_output_section. (Layout::choose_output_section): Change parameter from adjust_name to is_input_section. Don't permit input sections after sections are attached to segments. Don't call allocate_output_section. (Layout::layout_eh_frame): Call update_flags_for_input_section, not write_enable_output_section. (Layout::make_output_section): Don't push to unattached_section_list_ nor call attach_to_segment. Call attach_section_to_segment if sections are attached. (Layout::attach_sections_to_segments): New function. (Layout::attach_section_to_segment): New function. (Layout::attach_allocated_section_to_segment): Rename from attach_to_segment. Remove flags parameter. (Layout::allocate_output_section): Remove function. (Layout::write_enable_output_section): Remove function. * layout.h (class Layout): Update for above changes. Add new field sections_are_attached_. * output.h (Output_section::update_flags_for_input_section): New function. * output.cc (Output_section::add_input_section): Call update_flags_for_input_section. * gold.cc (queue_middle_tasks): Call attach_sections_to_segments. --- gold/output.cc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'gold/output.cc') diff --git a/gold/output.cc b/gold/output.cc index 48609a2..09b7312 100644 --- a/gold/output.cc +++ b/gold/output.cc @@ -1673,10 +1673,7 @@ Output_section::add_input_section(Sized_relobj* object, this->addralign_ = addralign; typename elfcpp::Elf_types::Elf_WXword sh_flags = shdr.get_sh_flags(); - this->flags_ |= (sh_flags - & (elfcpp::SHF_WRITE - | elfcpp::SHF_ALLOC - | elfcpp::SHF_EXECINSTR)); + this->update_flags_for_input_section(sh_flags); uint64_t entsize = shdr.get_sh_entsize(); -- cgit v1.1