2006-09-21 22:13:18 +00:00
|
|
|
// output.h -- manage the output file for gold -*- C++ -*-
|
|
|
|
|
2011-04-12 18:06:16 +00:00
|
|
|
// Copyright 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
|
2007-09-22 21:02:10 +00:00
|
|
|
// Written by Ian Lance Taylor <iant@google.com>.
|
|
|
|
|
|
|
|
// This file is part of gold.
|
|
|
|
|
|
|
|
// This program is free software; you can redistribute it and/or modify
|
|
|
|
// it under the terms of the GNU General Public License as published by
|
|
|
|
// the Free Software Foundation; either version 3 of the License, or
|
|
|
|
// (at your option) any later version.
|
|
|
|
|
|
|
|
// This program is distributed in the hope that it will be useful,
|
|
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
// GNU General Public License for more details.
|
|
|
|
|
|
|
|
// You should have received a copy of the GNU General Public License
|
|
|
|
// along with this program; if not, write to the Free Software
|
|
|
|
// Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
|
|
|
|
// MA 02110-1301, USA.
|
|
|
|
|
2006-09-21 22:13:18 +00:00
|
|
|
#ifndef GOLD_OUTPUT_H
|
|
|
|
#define GOLD_OUTPUT_H
|
|
|
|
|
|
|
|
#include <list>
|
2006-11-03 18:26:11 +00:00
|
|
|
#include <vector>
|
2006-09-21 22:13:18 +00:00
|
|
|
|
|
|
|
#include "elfcpp.h"
|
2008-05-21 21:37:44 +00:00
|
|
|
#include "mapfile.h"
|
2006-09-26 21:00:34 +00:00
|
|
|
#include "layout.h"
|
2006-11-16 00:38:25 +00:00
|
|
|
#include "reloc-types.h"
|
2006-09-21 22:13:18 +00:00
|
|
|
|
|
|
|
namespace gold
|
|
|
|
{
|
|
|
|
|
2006-09-29 19:58:17 +00:00
|
|
|
class General_options;
|
2006-09-21 22:13:18 +00:00
|
|
|
class Object;
|
2006-11-29 17:56:40 +00:00
|
|
|
class Symbol;
|
2006-09-21 22:13:18 +00:00
|
|
|
class Output_file;
|
2009-10-09 Doug Kwan <dougkwan@google.com>
* layout.cc (Layout::make_output_section): Call target hook to make
ordinary output section.
(Layout::finalize): Adjust parameter list of call the
Target::may_relax().
* layout.h (class Layout::section_list): New method.
* merge.h (Output_merge_base::entsize): Change visibility to public.
(Output_merge_base::is_string, Output_merge_base::do_is_string):
New methods.
(Output_merge_string::do_is_string): New method.
* object.cc (Sized_relobj::do_setup): renamed from
Sized_relobj::set_up.
* object.h (Sized_relobj::adjust_shndx,
Sized_relobj::initializ_input_to_output_maps,
Sized_relobj::free_input_to_output_maps): Change visibilities to
protected.
(Sized_relobj::setup): Virtualize.
(Sized_relobj::do_setup): New method declaration.
(Sized_relobj::invalidate_section_offset,
Sized_relobj::do_invalidate_section_offset): New method decfinitions.
(Sized_relobj::elf_file, Sized_relobj::local_values): New methods.
* options.cc (parse_int): New function.
* options.h (parse_int): New declaration.
(DEFINE_int): New macro.
(stub_group_size): New option.
* output.cc (Output_section::Output_section): Initialize memebers
merge_section_map_, merge_section_by_properties_map_,
relaxed_input_section_map_, is_relaxed_input_section_map_valid_.
(Output_section::add_input_section): Handled deferred code-fill
generation and remove an old comment.
(Output_section::add_relaxed_input_section): New method definition.
(Output_section::add_merge_input_section): Use merge section by
properties map to speed to search. Update merge section maps
as appropriate.
(Output_section::build_relaxation_map): New method definition.
(Output_section::convert_input_sections_in_list_to_relaxed_sections):
Same.
(Output_section::relax_input_section): Renamed to
Output_section::convert_input_sections_to_relaxed_sections and change
interface to take a vector of pointers to relaxed sections.
(Output_section::find_merge_section,
Output_section::find_relaxed_input_section): New method definitions.
(Output_section::is_input_address_mapped,
Output_section::output_offset, Output_section::output_address):
Use output section data maps to speed up searching.
(Output_section::find_starting_output_address): Add comments.
(Output_section::do_write,
Output_section::write_to_postprocessing_buffer): Do code-fill
generation as appropriate.
(Output_section::get_input_sections): Invalidate relaxed input section
map.
(Output_section::restore_states): Adjust type of checkpoint .
Invalidate relaxed input section map.
* output.h (Output_merge_base): New class declaration.
(Input_section_specifier): New class defintion.
(class Output_relaxed_input_section) Change base class to
Output_section_data_build.
(Output_relaxed_input_section::Output_relaxed_input_section): Adjust
base class initializer.
(Output_section::add_relaxed_input_section): New method declaration.
(Output_section::Input_section): Change visibility to protected.
(Output_section::Input_section::relobj,
Output_section::Input_section::shndx): Handle relaxed input sections.
Output_section::input_sections) Change visibility to protected. Also
define overload to return a non-const pointer.
(Output_section::Merge_section_properties): New class defintion.
(Output_section::Merge_section_by_properties_map,
Output_section::Output_section_data_by_input_section_map,
Output_section::Relaxation_map): New types.
(Output_section::relax_input_section): Rename method to
Output_section::convert_input_sections_to_relaxed_sections and change
interface to take a vector of relaxed section pointers.
(Output_section::find_merge_section,
Output_section::find_relaxed_input_section,
Output_section::build_relaxation_map,
Output_section::convert_input_sections_in_list_to_relaxed_sections):
New method declarations.
(Output_section::merge_section_map_
Output_section::merge_section_by_properties_map_,
Output_section::relaxed_input_section_map_,
Output_section::is_relaxed_input_section_map_valid_,
Output_section::generate_code_fills_at_write_): New data members.
* script-sections.cc
(Output_section_element_input::set_section_addresses): Call
current_data_size and addralign methods of relaxed input sections.
(Orphan_output_section::set_section_addresses): Call current_data_size
and addralign methods of relaxed input sections.
* symtab.cc (Symbol_table::compute_final_value): Extract template
from the body of Symbol_table::sized_finalize_symbol.
(Symbol_table::sized_finalized_symbol): Call
Symbol_table::compute_final_value.
* symtab.h (Symbol_table::Compute_final_value_status): New enum type.
(Symbol_table::compute_final_value): New templated method declaration.
* target.cc (Target::do_make_output_section): New method defintion.
* target.h (Target::make_output_section): New method declaration.
(Target::relax): Add more parameters for input objects, symbol table
and layout. Adjust call to do_relax.
(Target::do_make_output_section): New method declaration.
(Target::do_relax): Add parameters for input objects, symbol table
and layout.
2009-10-09 23:18:19 +00:00
|
|
|
class Output_merge_base;
|
2006-11-16 00:38:25 +00:00
|
|
|
class Output_section;
|
2008-02-06 08:13:50 +00:00
|
|
|
class Relocatable_relocs;
|
2006-11-29 17:56:40 +00:00
|
|
|
class Target;
|
2006-09-26 21:00:34 +00:00
|
|
|
template<int size, bool big_endian>
|
|
|
|
class Sized_target;
|
2006-11-16 00:38:25 +00:00
|
|
|
template<int size, bool big_endian>
|
|
|
|
class Sized_relobj;
|
2011-05-24 21:41:10 +00:00
|
|
|
template<int size, bool big_endian>
|
|
|
|
class Sized_relobj_file;
|
2006-09-26 21:00:34 +00:00
|
|
|
|
|
|
|
// An abtract class for data which has to go into the output file.
|
2006-09-21 22:13:18 +00:00
|
|
|
|
|
|
|
class Output_data
|
|
|
|
{
|
|
|
|
public:
|
2007-11-29 20:10:17 +00:00
|
|
|
explicit Output_data()
|
|
|
|
: address_(0), data_size_(0), offset_(-1),
|
|
|
|
is_address_valid_(false), is_data_size_valid_(false),
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 01:10:38 +00:00
|
|
|
is_offset_valid_(false), is_data_size_fixed_(false),
|
2010-08-03 Ian Lance Taylor <iant@google.com>
PR 11805
* layout.h (enum Output_section_order): Define.
(class Layout): Update declarations.
* layout.cc (Layout::get_output_section): Add order parameter.
Remove is_interp, is_dynamic_linker_section, is_last_relro, and
is_first_non_relro parameters. Change all callers.
(Layout::choose_output_section): Likewise.
(Layout::add_output_section_data): Likewise.
(Layout::make_output_section): Likewise. Set order.
(Layout::default_section_order): New function.
(Layout::layout_eh_frame): Call add_output_section_to_nonload.
* output.cc (Output_section::Output_section): Initialize order_.
Don't initialize deleted fields.
(Output_segment::Output_segment): Don't initialize deleted
fields.
(Output_segment::add_output_section_to_load): New function
replacing add_output_section. Change all callers to call this or
add_output_section_to_nonload.
(Output_segment::add_output_section_to_nonload): New function.
(Output_segment::remove_output_section): Rewrite.
(Output_segment::add_initial_output_data): Likewise.
(Output_segment::has_any_data_sections): Likewise.
(Output_segment::is_first_section_relro): Likewise.
(Output_segment::maximum_alignment): Likewise.
(Output_segment::has_dynamic_reloc): New function replacing
dynamic_reloc_count. Change all callers.
(Output_segment::has_dynamic_reloc_list): New function replacing
dynamic_reloc_count_list. Change all callers.
(Output_segment::set_section_addresses): Rewrite.
(Output_segment::set_offset): Rewrite.
(Output_segment::find_first_and_last_list): Remove.
(Output_segment::set_tls_offsets): Rewrite.
(Output_segment::first_section_load_address): Likewise.
(Output_segment::output_section_count): Likewise.
(Output_segment::section_with_lowest_load_address): Likewise.
(Output_segment::write_section_headers): Likewise.
(Output_segment::print_sections_to_map): Likewise.
* output.h (class Output_data): Remove dynamic_reloc_count_
field. Add has_dynamic_reloc_ field. Make bools into bitfields.
(Output_data::add_dynamic_reloc): Rewrite.
(Output_data::has_dynamic_reloc): New function.
(Output_data::dynamic_reloc_count): Remove.
(class Output_section): Add order_ field. Remvoe is_relro_local_,
is_last_relro_, is_first_non_relro_, is_interp_,
is_dynamic_linker_section_ fields. Add order and set_order
functions. Remove is_relro_local, set_is_relro_local,
is_last_relro, set_is_last_relro, is_first_non_relro,
set_is_first_non_relro functions, is_interp, set_is_interp,
is_dynamic_linker_section, and set_is_dynamic_linker_section
functions.
(class Output_segment): Change Output_data_list from std::list to
std:;vector. Add output_lists_ field. Remove output_data_ and
output_bss_ fields. Update declarations.
2010-08-03 14:07:13 +00:00
|
|
|
has_dynamic_reloc_(false)
|
2006-09-21 22:13:18 +00:00
|
|
|
{ }
|
|
|
|
|
|
|
|
virtual
|
|
|
|
~Output_data();
|
|
|
|
|
2007-11-29 20:10:17 +00:00
|
|
|
// Return the address. For allocated sections, this is only valid
|
|
|
|
// after Layout::finalize is finished.
|
2006-09-27 22:53:42 +00:00
|
|
|
uint64_t
|
|
|
|
address() const
|
2007-11-29 20:10:17 +00:00
|
|
|
{
|
|
|
|
gold_assert(this->is_address_valid_);
|
|
|
|
return this->address_;
|
|
|
|
}
|
2006-09-27 22:53:42 +00:00
|
|
|
|
2007-11-29 20:10:17 +00:00
|
|
|
// Return the size of the data. For allocated sections, this must
|
|
|
|
// be valid after Layout::finalize calls set_address, but need not
|
|
|
|
// be valid before then.
|
2006-09-21 22:13:18 +00:00
|
|
|
off_t
|
2006-09-27 22:53:42 +00:00
|
|
|
data_size() const
|
2007-11-29 20:10:17 +00:00
|
|
|
{
|
|
|
|
gold_assert(this->is_data_size_valid_);
|
|
|
|
return this->data_size_;
|
|
|
|
}
|
2006-09-27 22:53:42 +00:00
|
|
|
|
2011-04-12 00:44:48 +00:00
|
|
|
// Get the current data size.
|
|
|
|
off_t
|
|
|
|
current_data_size() const
|
|
|
|
{ return this->current_data_size_for_child(); }
|
|
|
|
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 01:10:38 +00:00
|
|
|
// Return true if data size is fixed.
|
|
|
|
bool
|
|
|
|
is_data_size_fixed() const
|
|
|
|
{ return this->is_data_size_fixed_; }
|
|
|
|
|
2006-11-03 18:26:11 +00:00
|
|
|
// Return the file offset. This is only valid after
|
2007-11-29 20:10:17 +00:00
|
|
|
// Layout::finalize is finished. For some non-allocated sections,
|
|
|
|
// it may not be valid until near the end of the link.
|
2006-09-27 22:53:42 +00:00
|
|
|
off_t
|
|
|
|
offset() const
|
2007-11-29 20:10:17 +00:00
|
|
|
{
|
|
|
|
gold_assert(this->is_offset_valid_);
|
|
|
|
return this->offset_;
|
|
|
|
}
|
2006-09-27 22:53:42 +00:00
|
|
|
|
2008-02-04 05:43:05 +00:00
|
|
|
// Reset the address and file offset. This essentially disables the
|
|
|
|
// sanity testing about duplicate and unknown settings.
|
|
|
|
void
|
|
|
|
reset_address_and_file_offset()
|
|
|
|
{
|
|
|
|
this->is_address_valid_ = false;
|
|
|
|
this->is_offset_valid_ = false;
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 01:10:38 +00:00
|
|
|
if (!this->is_data_size_fixed_)
|
|
|
|
this->is_data_size_valid_ = false;
|
2008-02-04 05:43:05 +00:00
|
|
|
this->do_reset_address_and_file_offset();
|
|
|
|
}
|
|
|
|
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 01:10:38 +00:00
|
|
|
// Return true if address and file offset already have reset values. In
|
|
|
|
// other words, calling reset_address_and_file_offset will not change them.
|
|
|
|
bool
|
|
|
|
address_and_file_offset_have_reset_values() const
|
|
|
|
{ return this->do_address_and_file_offset_have_reset_values(); }
|
|
|
|
|
2006-09-27 22:53:42 +00:00
|
|
|
// Return the required alignment.
|
|
|
|
uint64_t
|
|
|
|
addralign() const
|
|
|
|
{ return this->do_addralign(); }
|
|
|
|
|
2008-02-04 05:43:05 +00:00
|
|
|
// Return whether this has a load address.
|
|
|
|
bool
|
|
|
|
has_load_address() const
|
|
|
|
{ return this->do_has_load_address(); }
|
|
|
|
|
|
|
|
// Return the load address.
|
|
|
|
uint64_t
|
|
|
|
load_address() const
|
|
|
|
{ return this->do_load_address(); }
|
|
|
|
|
2006-09-27 22:53:42 +00:00
|
|
|
// Return whether this is an Output_section.
|
|
|
|
bool
|
|
|
|
is_section() const
|
|
|
|
{ return this->do_is_section(); }
|
|
|
|
|
|
|
|
// Return whether this is an Output_section of the specified type.
|
|
|
|
bool
|
|
|
|
is_section_type(elfcpp::Elf_Word stt) const
|
|
|
|
{ return this->do_is_section_type(stt); }
|
|
|
|
|
|
|
|
// Return whether this is an Output_section with the specified flag
|
|
|
|
// set.
|
|
|
|
bool
|
|
|
|
is_section_flag_set(elfcpp::Elf_Xword shf) const
|
|
|
|
{ return this->do_is_section_flag_set(shf); }
|
|
|
|
|
2008-02-09 01:22:17 +00:00
|
|
|
// Return the output section that this goes in, if there is one.
|
|
|
|
Output_section*
|
|
|
|
output_section()
|
|
|
|
{ return this->do_output_section(); }
|
|
|
|
|
2010-01-07 20:43:35 +00:00
|
|
|
const Output_section*
|
|
|
|
output_section() const
|
|
|
|
{ return this->do_output_section(); }
|
|
|
|
|
2006-11-03 18:26:11 +00:00
|
|
|
// Return the output section index, if there is an output section.
|
|
|
|
unsigned int
|
|
|
|
out_shndx() const
|
|
|
|
{ return this->do_out_shndx(); }
|
|
|
|
|
|
|
|
// Set the output section index, if this is an output section.
|
|
|
|
void
|
|
|
|
set_out_shndx(unsigned int shndx)
|
|
|
|
{ this->do_set_out_shndx(shndx); }
|
|
|
|
|
2007-11-29 20:10:17 +00:00
|
|
|
// Set the address and file offset of this data, and finalize the
|
|
|
|
// size of the data. This is called during Layout::finalize for
|
|
|
|
// allocated sections.
|
2006-09-27 22:53:42 +00:00
|
|
|
void
|
2007-11-29 20:10:17 +00:00
|
|
|
set_address_and_file_offset(uint64_t addr, off_t off)
|
|
|
|
{
|
|
|
|
this->set_address(addr);
|
|
|
|
this->set_file_offset(off);
|
|
|
|
this->finalize_data_size();
|
|
|
|
}
|
|
|
|
|
|
|
|
// Set the address.
|
|
|
|
void
|
|
|
|
set_address(uint64_t addr)
|
|
|
|
{
|
|
|
|
gold_assert(!this->is_address_valid_);
|
|
|
|
this->address_ = addr;
|
|
|
|
this->is_address_valid_ = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Set the file offset.
|
|
|
|
void
|
|
|
|
set_file_offset(off_t off)
|
|
|
|
{
|
|
|
|
gold_assert(!this->is_offset_valid_);
|
|
|
|
this->offset_ = off;
|
|
|
|
this->is_offset_valid_ = true;
|
|
|
|
}
|
|
|
|
|
2011-04-12 00:44:48 +00:00
|
|
|
// Update the data size without finalizing it.
|
|
|
|
void
|
|
|
|
pre_finalize_data_size()
|
|
|
|
{
|
|
|
|
if (!this->is_data_size_valid_)
|
|
|
|
{
|
|
|
|
// Tell the child class to update the data size.
|
|
|
|
this->update_data_size();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-11-29 20:10:17 +00:00
|
|
|
// Finalize the data size.
|
|
|
|
void
|
|
|
|
finalize_data_size()
|
|
|
|
{
|
|
|
|
if (!this->is_data_size_valid_)
|
|
|
|
{
|
|
|
|
// Tell the child class to set the data size.
|
|
|
|
this->set_final_data_size();
|
|
|
|
gold_assert(this->is_data_size_valid_);
|
|
|
|
}
|
|
|
|
}
|
2006-09-27 22:53:42 +00:00
|
|
|
|
2007-12-06 05:55:50 +00:00
|
|
|
// Set the TLS offset. Called only for SHT_TLS sections.
|
|
|
|
void
|
|
|
|
set_tls_offset(uint64_t tls_base)
|
|
|
|
{ this->do_set_tls_offset(tls_base); }
|
|
|
|
|
|
|
|
// Return the TLS offset, relative to the base of the TLS segment.
|
|
|
|
// Valid only for SHT_TLS sections.
|
|
|
|
uint64_t
|
|
|
|
tls_offset() const
|
|
|
|
{ return this->do_tls_offset(); }
|
|
|
|
|
2006-11-03 18:26:11 +00:00
|
|
|
// Write the data to the output file. This is called after
|
|
|
|
// Layout::finalize is complete.
|
2006-09-27 22:53:42 +00:00
|
|
|
void
|
|
|
|
write(Output_file* file)
|
|
|
|
{ this->do_write(file); }
|
2006-09-21 22:13:18 +00:00
|
|
|
|
2007-11-29 20:10:17 +00:00
|
|
|
// This is called by Layout::finalize to note that the sizes of
|
|
|
|
// allocated sections must now be fixed.
|
2006-11-29 17:56:40 +00:00
|
|
|
static void
|
|
|
|
layout_complete()
|
2007-11-29 20:10:17 +00:00
|
|
|
{ Output_data::allocated_sizes_are_fixed = true; }
|
2006-11-29 17:56:40 +00:00
|
|
|
|
2007-11-09 07:00:15 +00:00
|
|
|
// Used to check that layout has been done.
|
|
|
|
static bool
|
|
|
|
is_layout_complete()
|
2007-11-29 20:10:17 +00:00
|
|
|
{ return Output_data::allocated_sizes_are_fixed; }
|
2007-11-09 07:00:15 +00:00
|
|
|
|
2010-08-03 Ian Lance Taylor <iant@google.com>
PR 11805
* layout.h (enum Output_section_order): Define.
(class Layout): Update declarations.
* layout.cc (Layout::get_output_section): Add order parameter.
Remove is_interp, is_dynamic_linker_section, is_last_relro, and
is_first_non_relro parameters. Change all callers.
(Layout::choose_output_section): Likewise.
(Layout::add_output_section_data): Likewise.
(Layout::make_output_section): Likewise. Set order.
(Layout::default_section_order): New function.
(Layout::layout_eh_frame): Call add_output_section_to_nonload.
* output.cc (Output_section::Output_section): Initialize order_.
Don't initialize deleted fields.
(Output_segment::Output_segment): Don't initialize deleted
fields.
(Output_segment::add_output_section_to_load): New function
replacing add_output_section. Change all callers to call this or
add_output_section_to_nonload.
(Output_segment::add_output_section_to_nonload): New function.
(Output_segment::remove_output_section): Rewrite.
(Output_segment::add_initial_output_data): Likewise.
(Output_segment::has_any_data_sections): Likewise.
(Output_segment::is_first_section_relro): Likewise.
(Output_segment::maximum_alignment): Likewise.
(Output_segment::has_dynamic_reloc): New function replacing
dynamic_reloc_count. Change all callers.
(Output_segment::has_dynamic_reloc_list): New function replacing
dynamic_reloc_count_list. Change all callers.
(Output_segment::set_section_addresses): Rewrite.
(Output_segment::set_offset): Rewrite.
(Output_segment::find_first_and_last_list): Remove.
(Output_segment::set_tls_offsets): Rewrite.
(Output_segment::first_section_load_address): Likewise.
(Output_segment::output_section_count): Likewise.
(Output_segment::section_with_lowest_load_address): Likewise.
(Output_segment::write_section_headers): Likewise.
(Output_segment::print_sections_to_map): Likewise.
* output.h (class Output_data): Remove dynamic_reloc_count_
field. Add has_dynamic_reloc_ field. Make bools into bitfields.
(Output_data::add_dynamic_reloc): Rewrite.
(Output_data::has_dynamic_reloc): New function.
(Output_data::dynamic_reloc_count): Remove.
(class Output_section): Add order_ field. Remvoe is_relro_local_,
is_last_relro_, is_first_non_relro_, is_interp_,
is_dynamic_linker_section_ fields. Add order and set_order
functions. Remove is_relro_local, set_is_relro_local,
is_last_relro, set_is_last_relro, is_first_non_relro,
set_is_first_non_relro functions, is_interp, set_is_interp,
is_dynamic_linker_section, and set_is_dynamic_linker_section
functions.
(class Output_segment): Change Output_data_list from std::list to
std:;vector. Add output_lists_ field. Remove output_data_ and
output_bss_ fields. Update declarations.
2010-08-03 14:07:13 +00:00
|
|
|
// Note that a dynamic reloc has been applied to this data.
|
2007-11-15 23:46:46 +00:00
|
|
|
void
|
|
|
|
add_dynamic_reloc()
|
2010-08-03 Ian Lance Taylor <iant@google.com>
PR 11805
* layout.h (enum Output_section_order): Define.
(class Layout): Update declarations.
* layout.cc (Layout::get_output_section): Add order parameter.
Remove is_interp, is_dynamic_linker_section, is_last_relro, and
is_first_non_relro parameters. Change all callers.
(Layout::choose_output_section): Likewise.
(Layout::add_output_section_data): Likewise.
(Layout::make_output_section): Likewise. Set order.
(Layout::default_section_order): New function.
(Layout::layout_eh_frame): Call add_output_section_to_nonload.
* output.cc (Output_section::Output_section): Initialize order_.
Don't initialize deleted fields.
(Output_segment::Output_segment): Don't initialize deleted
fields.
(Output_segment::add_output_section_to_load): New function
replacing add_output_section. Change all callers to call this or
add_output_section_to_nonload.
(Output_segment::add_output_section_to_nonload): New function.
(Output_segment::remove_output_section): Rewrite.
(Output_segment::add_initial_output_data): Likewise.
(Output_segment::has_any_data_sections): Likewise.
(Output_segment::is_first_section_relro): Likewise.
(Output_segment::maximum_alignment): Likewise.
(Output_segment::has_dynamic_reloc): New function replacing
dynamic_reloc_count. Change all callers.
(Output_segment::has_dynamic_reloc_list): New function replacing
dynamic_reloc_count_list. Change all callers.
(Output_segment::set_section_addresses): Rewrite.
(Output_segment::set_offset): Rewrite.
(Output_segment::find_first_and_last_list): Remove.
(Output_segment::set_tls_offsets): Rewrite.
(Output_segment::first_section_load_address): Likewise.
(Output_segment::output_section_count): Likewise.
(Output_segment::section_with_lowest_load_address): Likewise.
(Output_segment::write_section_headers): Likewise.
(Output_segment::print_sections_to_map): Likewise.
* output.h (class Output_data): Remove dynamic_reloc_count_
field. Add has_dynamic_reloc_ field. Make bools into bitfields.
(Output_data::add_dynamic_reloc): Rewrite.
(Output_data::has_dynamic_reloc): New function.
(Output_data::dynamic_reloc_count): Remove.
(class Output_section): Add order_ field. Remvoe is_relro_local_,
is_last_relro_, is_first_non_relro_, is_interp_,
is_dynamic_linker_section_ fields. Add order and set_order
functions. Remove is_relro_local, set_is_relro_local,
is_last_relro, set_is_last_relro, is_first_non_relro,
set_is_first_non_relro functions, is_interp, set_is_interp,
is_dynamic_linker_section, and set_is_dynamic_linker_section
functions.
(class Output_segment): Change Output_data_list from std::list to
std:;vector. Add output_lists_ field. Remove output_data_ and
output_bss_ fields. Update declarations.
2010-08-03 14:07:13 +00:00
|
|
|
{ this->has_dynamic_reloc_ = true; }
|
2007-11-15 23:46:46 +00:00
|
|
|
|
2010-08-03 Ian Lance Taylor <iant@google.com>
PR 11805
* layout.h (enum Output_section_order): Define.
(class Layout): Update declarations.
* layout.cc (Layout::get_output_section): Add order parameter.
Remove is_interp, is_dynamic_linker_section, is_last_relro, and
is_first_non_relro parameters. Change all callers.
(Layout::choose_output_section): Likewise.
(Layout::add_output_section_data): Likewise.
(Layout::make_output_section): Likewise. Set order.
(Layout::default_section_order): New function.
(Layout::layout_eh_frame): Call add_output_section_to_nonload.
* output.cc (Output_section::Output_section): Initialize order_.
Don't initialize deleted fields.
(Output_segment::Output_segment): Don't initialize deleted
fields.
(Output_segment::add_output_section_to_load): New function
replacing add_output_section. Change all callers to call this or
add_output_section_to_nonload.
(Output_segment::add_output_section_to_nonload): New function.
(Output_segment::remove_output_section): Rewrite.
(Output_segment::add_initial_output_data): Likewise.
(Output_segment::has_any_data_sections): Likewise.
(Output_segment::is_first_section_relro): Likewise.
(Output_segment::maximum_alignment): Likewise.
(Output_segment::has_dynamic_reloc): New function replacing
dynamic_reloc_count. Change all callers.
(Output_segment::has_dynamic_reloc_list): New function replacing
dynamic_reloc_count_list. Change all callers.
(Output_segment::set_section_addresses): Rewrite.
(Output_segment::set_offset): Rewrite.
(Output_segment::find_first_and_last_list): Remove.
(Output_segment::set_tls_offsets): Rewrite.
(Output_segment::first_section_load_address): Likewise.
(Output_segment::output_section_count): Likewise.
(Output_segment::section_with_lowest_load_address): Likewise.
(Output_segment::write_section_headers): Likewise.
(Output_segment::print_sections_to_map): Likewise.
* output.h (class Output_data): Remove dynamic_reloc_count_
field. Add has_dynamic_reloc_ field. Make bools into bitfields.
(Output_data::add_dynamic_reloc): Rewrite.
(Output_data::has_dynamic_reloc): New function.
(Output_data::dynamic_reloc_count): Remove.
(class Output_section): Add order_ field. Remvoe is_relro_local_,
is_last_relro_, is_first_non_relro_, is_interp_,
is_dynamic_linker_section_ fields. Add order and set_order
functions. Remove is_relro_local, set_is_relro_local,
is_last_relro, set_is_last_relro, is_first_non_relro,
set_is_first_non_relro functions, is_interp, set_is_interp,
is_dynamic_linker_section, and set_is_dynamic_linker_section
functions.
(class Output_segment): Change Output_data_list from std::list to
std:;vector. Add output_lists_ field. Remove output_data_ and
output_bss_ fields. Update declarations.
2010-08-03 14:07:13 +00:00
|
|
|
// Return whether a dynamic reloc has been applied.
|
|
|
|
bool
|
|
|
|
has_dynamic_reloc() const
|
|
|
|
{ return this->has_dynamic_reloc_; }
|
2007-11-15 23:46:46 +00:00
|
|
|
|
2007-12-21 21:19:45 +00:00
|
|
|
// Whether the address is valid.
|
|
|
|
bool
|
|
|
|
is_address_valid() const
|
|
|
|
{ return this->is_address_valid_; }
|
|
|
|
|
|
|
|
// Whether the file offset is valid.
|
|
|
|
bool
|
|
|
|
is_offset_valid() const
|
|
|
|
{ return this->is_offset_valid_; }
|
|
|
|
|
|
|
|
// Whether the data size is valid.
|
|
|
|
bool
|
|
|
|
is_data_size_valid() const
|
|
|
|
{ return this->is_data_size_valid_; }
|
|
|
|
|
2008-05-21 21:37:44 +00:00
|
|
|
// Print information to the map file.
|
|
|
|
void
|
|
|
|
print_to_mapfile(Mapfile* mapfile) const
|
|
|
|
{ return this->do_print_to_mapfile(mapfile); }
|
|
|
|
|
2006-09-27 22:53:42 +00:00
|
|
|
protected:
|
|
|
|
// Functions that child classes may or in some cases must implement.
|
|
|
|
|
|
|
|
// Write the data to the output file.
|
2006-09-21 22:13:18 +00:00
|
|
|
virtual void
|
2006-09-27 22:53:42 +00:00
|
|
|
do_write(Output_file*) = 0;
|
|
|
|
|
|
|
|
// Return the required alignment.
|
|
|
|
virtual uint64_t
|
|
|
|
do_addralign() const = 0;
|
|
|
|
|
2008-02-04 05:43:05 +00:00
|
|
|
// Return whether this has a load address.
|
|
|
|
virtual bool
|
|
|
|
do_has_load_address() const
|
|
|
|
{ return false; }
|
|
|
|
|
|
|
|
// Return the load address.
|
|
|
|
virtual uint64_t
|
|
|
|
do_load_address() const
|
|
|
|
{ gold_unreachable(); }
|
|
|
|
|
2006-09-27 22:53:42 +00:00
|
|
|
// Return whether this is an Output_section.
|
|
|
|
virtual bool
|
|
|
|
do_is_section() const
|
|
|
|
{ return false; }
|
2006-09-21 22:13:18 +00:00
|
|
|
|
2006-09-26 21:00:34 +00:00
|
|
|
// Return whether this is an Output_section of the specified type.
|
2006-09-27 22:53:42 +00:00
|
|
|
// This only needs to be implement by Output_section.
|
2006-09-26 21:00:34 +00:00
|
|
|
virtual bool
|
2006-09-27 22:53:42 +00:00
|
|
|
do_is_section_type(elfcpp::Elf_Word) const
|
2006-09-26 21:00:34 +00:00
|
|
|
{ return false; }
|
|
|
|
|
2006-09-27 22:53:42 +00:00
|
|
|
// Return whether this is an Output_section with the specific flag
|
|
|
|
// set. This only needs to be implemented by Output_section.
|
2006-09-26 21:00:34 +00:00
|
|
|
virtual bool
|
2006-09-27 22:53:42 +00:00
|
|
|
do_is_section_flag_set(elfcpp::Elf_Xword) const
|
2006-09-26 21:00:34 +00:00
|
|
|
{ return false; }
|
|
|
|
|
2008-02-09 01:22:17 +00:00
|
|
|
// Return the output section, if there is one.
|
|
|
|
virtual Output_section*
|
|
|
|
do_output_section()
|
|
|
|
{ return NULL; }
|
|
|
|
|
2010-01-07 20:43:35 +00:00
|
|
|
virtual const Output_section*
|
|
|
|
do_output_section() const
|
|
|
|
{ return NULL; }
|
|
|
|
|
2006-11-03 18:26:11 +00:00
|
|
|
// Return the output section index, if there is an output section.
|
|
|
|
virtual unsigned int
|
|
|
|
do_out_shndx() const
|
2006-11-29 17:56:40 +00:00
|
|
|
{ gold_unreachable(); }
|
2006-11-03 18:26:11 +00:00
|
|
|
|
|
|
|
// Set the output section index, if this is an output section.
|
|
|
|
virtual void
|
|
|
|
do_set_out_shndx(unsigned int)
|
2006-11-29 17:56:40 +00:00
|
|
|
{ gold_unreachable(); }
|
2006-11-03 18:26:11 +00:00
|
|
|
|
2011-04-12 00:44:48 +00:00
|
|
|
// This is a hook for derived classes to set the preliminary data size.
|
|
|
|
// This is called by pre_finalize_data_size, normally called during
|
|
|
|
// Layout::finalize, before the section address is set, and is used
|
|
|
|
// during an incremental update, when we need to know the size of a
|
|
|
|
// section before allocating space in the output file. For classes
|
|
|
|
// where the current data size is up to date, this default version of
|
|
|
|
// the method can be inherited.
|
|
|
|
virtual void
|
|
|
|
update_data_size()
|
|
|
|
{ }
|
|
|
|
|
2007-11-29 20:10:17 +00:00
|
|
|
// This is a hook for derived classes to set the data size. This is
|
|
|
|
// called by finalize_data_size, normally called during
|
|
|
|
// Layout::finalize, when the section address is set.
|
2006-09-27 22:53:42 +00:00
|
|
|
virtual void
|
2007-11-29 20:10:17 +00:00
|
|
|
set_final_data_size()
|
|
|
|
{ gold_unreachable(); }
|
2006-09-27 22:53:42 +00:00
|
|
|
|
2008-02-04 05:43:05 +00:00
|
|
|
// A hook for resetting the address and file offset.
|
|
|
|
virtual void
|
|
|
|
do_reset_address_and_file_offset()
|
|
|
|
{ }
|
|
|
|
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 01:10:38 +00:00
|
|
|
// Return true if address and file offset already have reset values. In
|
|
|
|
// other words, calling reset_address_and_file_offset will not change them.
|
|
|
|
// A child class overriding do_reset_address_and_file_offset may need to
|
|
|
|
// also override this.
|
|
|
|
virtual bool
|
|
|
|
do_address_and_file_offset_have_reset_values() const
|
|
|
|
{ return !this->is_address_valid_ && !this->is_offset_valid_; }
|
|
|
|
|
2007-12-06 05:55:50 +00:00
|
|
|
// Set the TLS offset. Called only for SHT_TLS sections.
|
|
|
|
virtual void
|
|
|
|
do_set_tls_offset(uint64_t)
|
|
|
|
{ gold_unreachable(); }
|
|
|
|
|
|
|
|
// Return the TLS offset, relative to the base of the TLS segment.
|
|
|
|
// Valid only for SHT_TLS sections.
|
|
|
|
virtual uint64_t
|
|
|
|
do_tls_offset() const
|
|
|
|
{ gold_unreachable(); }
|
|
|
|
|
2008-05-21 21:37:44 +00:00
|
|
|
// Print to the map file. This only needs to be implemented by
|
|
|
|
// classes which may appear in a PT_LOAD segment.
|
|
|
|
virtual void
|
|
|
|
do_print_to_mapfile(Mapfile*) const
|
|
|
|
{ gold_unreachable(); }
|
|
|
|
|
2006-09-27 22:53:42 +00:00
|
|
|
// Functions that child classes may call.
|
|
|
|
|
2009-06-24 19:48:51 +00:00
|
|
|
// Reset the address. The Output_section class needs this when an
|
|
|
|
// SHF_ALLOC input section is added to an output section which was
|
|
|
|
// formerly not SHF_ALLOC.
|
|
|
|
void
|
|
|
|
mark_address_invalid()
|
|
|
|
{ this->is_address_valid_ = false; }
|
|
|
|
|
2006-09-21 22:13:18 +00:00
|
|
|
// Set the size of the data.
|
|
|
|
void
|
2009-12-14 19:53:05 +00:00
|
|
|
set_data_size(off_t data_size)
|
2006-11-29 17:56:40 +00:00
|
|
|
{
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 01:10:38 +00:00
|
|
|
gold_assert(!this->is_data_size_valid_
|
|
|
|
&& !this->is_data_size_fixed_);
|
2009-12-14 19:53:05 +00:00
|
|
|
this->data_size_ = data_size;
|
2007-11-29 20:10:17 +00:00
|
|
|
this->is_data_size_valid_ = true;
|
|
|
|
}
|
|
|
|
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 01:10:38 +00:00
|
|
|
// Fix the data size. Once it is fixed, it cannot be changed
|
|
|
|
// and the data size remains always valid.
|
|
|
|
void
|
|
|
|
fix_data_size()
|
|
|
|
{
|
|
|
|
gold_assert(this->is_data_size_valid_);
|
|
|
|
this->is_data_size_fixed_ = true;
|
|
|
|
}
|
|
|
|
|
2007-11-29 20:10:17 +00:00
|
|
|
// Get the current data size--this is for the convenience of
|
|
|
|
// sections which build up their size over time.
|
|
|
|
off_t
|
|
|
|
current_data_size_for_child() const
|
|
|
|
{ return this->data_size_; }
|
|
|
|
|
|
|
|
// Set the current data size--this is for the convenience of
|
|
|
|
// sections which build up their size over time.
|
|
|
|
void
|
2009-12-14 19:53:05 +00:00
|
|
|
set_current_data_size_for_child(off_t data_size)
|
2007-11-29 20:10:17 +00:00
|
|
|
{
|
|
|
|
gold_assert(!this->is_data_size_valid_);
|
2009-12-14 19:53:05 +00:00
|
|
|
this->data_size_ = data_size;
|
2006-11-29 17:56:40 +00:00
|
|
|
}
|
2006-09-27 22:53:42 +00:00
|
|
|
|
2007-11-09 07:00:15 +00:00
|
|
|
// Return default alignment for the target size.
|
|
|
|
static uint64_t
|
|
|
|
default_alignment();
|
|
|
|
|
|
|
|
// Return default alignment for a specified size--32 or 64.
|
2006-09-27 22:53:42 +00:00
|
|
|
static uint64_t
|
2007-11-09 07:00:15 +00:00
|
|
|
default_alignment_for_size(int size);
|
2006-09-21 22:13:18 +00:00
|
|
|
|
|
|
|
private:
|
|
|
|
Output_data(const Output_data&);
|
|
|
|
Output_data& operator=(const Output_data&);
|
|
|
|
|
2006-11-29 17:56:40 +00:00
|
|
|
// This is used for verification, to make sure that we don't try to
|
2007-11-29 20:10:17 +00:00
|
|
|
// change any sizes of allocated sections after we set the section
|
|
|
|
// addresses.
|
|
|
|
static bool allocated_sizes_are_fixed;
|
2006-11-29 17:56:40 +00:00
|
|
|
|
2007-11-29 20:10:17 +00:00
|
|
|
// Memory address in output file.
|
2006-09-27 22:53:42 +00:00
|
|
|
uint64_t address_;
|
2007-11-29 20:10:17 +00:00
|
|
|
// Size of data in output file.
|
2006-09-27 22:53:42 +00:00
|
|
|
off_t data_size_;
|
2007-11-29 20:10:17 +00:00
|
|
|
// File offset of contents in output file.
|
2006-09-27 22:53:42 +00:00
|
|
|
off_t offset_;
|
2007-11-29 20:10:17 +00:00
|
|
|
// Whether address_ is valid.
|
2010-08-03 Ian Lance Taylor <iant@google.com>
PR 11805
* layout.h (enum Output_section_order): Define.
(class Layout): Update declarations.
* layout.cc (Layout::get_output_section): Add order parameter.
Remove is_interp, is_dynamic_linker_section, is_last_relro, and
is_first_non_relro parameters. Change all callers.
(Layout::choose_output_section): Likewise.
(Layout::add_output_section_data): Likewise.
(Layout::make_output_section): Likewise. Set order.
(Layout::default_section_order): New function.
(Layout::layout_eh_frame): Call add_output_section_to_nonload.
* output.cc (Output_section::Output_section): Initialize order_.
Don't initialize deleted fields.
(Output_segment::Output_segment): Don't initialize deleted
fields.
(Output_segment::add_output_section_to_load): New function
replacing add_output_section. Change all callers to call this or
add_output_section_to_nonload.
(Output_segment::add_output_section_to_nonload): New function.
(Output_segment::remove_output_section): Rewrite.
(Output_segment::add_initial_output_data): Likewise.
(Output_segment::has_any_data_sections): Likewise.
(Output_segment::is_first_section_relro): Likewise.
(Output_segment::maximum_alignment): Likewise.
(Output_segment::has_dynamic_reloc): New function replacing
dynamic_reloc_count. Change all callers.
(Output_segment::has_dynamic_reloc_list): New function replacing
dynamic_reloc_count_list. Change all callers.
(Output_segment::set_section_addresses): Rewrite.
(Output_segment::set_offset): Rewrite.
(Output_segment::find_first_and_last_list): Remove.
(Output_segment::set_tls_offsets): Rewrite.
(Output_segment::first_section_load_address): Likewise.
(Output_segment::output_section_count): Likewise.
(Output_segment::section_with_lowest_load_address): Likewise.
(Output_segment::write_section_headers): Likewise.
(Output_segment::print_sections_to_map): Likewise.
* output.h (class Output_data): Remove dynamic_reloc_count_
field. Add has_dynamic_reloc_ field. Make bools into bitfields.
(Output_data::add_dynamic_reloc): Rewrite.
(Output_data::has_dynamic_reloc): New function.
(Output_data::dynamic_reloc_count): Remove.
(class Output_section): Add order_ field. Remvoe is_relro_local_,
is_last_relro_, is_first_non_relro_, is_interp_,
is_dynamic_linker_section_ fields. Add order and set_order
functions. Remove is_relro_local, set_is_relro_local,
is_last_relro, set_is_last_relro, is_first_non_relro,
set_is_first_non_relro functions, is_interp, set_is_interp,
is_dynamic_linker_section, and set_is_dynamic_linker_section
functions.
(class Output_segment): Change Output_data_list from std::list to
std:;vector. Add output_lists_ field. Remove output_data_ and
output_bss_ fields. Update declarations.
2010-08-03 14:07:13 +00:00
|
|
|
bool is_address_valid_ : 1;
|
2007-11-29 20:10:17 +00:00
|
|
|
// Whether data_size_ is valid.
|
2010-08-03 Ian Lance Taylor <iant@google.com>
PR 11805
* layout.h (enum Output_section_order): Define.
(class Layout): Update declarations.
* layout.cc (Layout::get_output_section): Add order parameter.
Remove is_interp, is_dynamic_linker_section, is_last_relro, and
is_first_non_relro parameters. Change all callers.
(Layout::choose_output_section): Likewise.
(Layout::add_output_section_data): Likewise.
(Layout::make_output_section): Likewise. Set order.
(Layout::default_section_order): New function.
(Layout::layout_eh_frame): Call add_output_section_to_nonload.
* output.cc (Output_section::Output_section): Initialize order_.
Don't initialize deleted fields.
(Output_segment::Output_segment): Don't initialize deleted
fields.
(Output_segment::add_output_section_to_load): New function
replacing add_output_section. Change all callers to call this or
add_output_section_to_nonload.
(Output_segment::add_output_section_to_nonload): New function.
(Output_segment::remove_output_section): Rewrite.
(Output_segment::add_initial_output_data): Likewise.
(Output_segment::has_any_data_sections): Likewise.
(Output_segment::is_first_section_relro): Likewise.
(Output_segment::maximum_alignment): Likewise.
(Output_segment::has_dynamic_reloc): New function replacing
dynamic_reloc_count. Change all callers.
(Output_segment::has_dynamic_reloc_list): New function replacing
dynamic_reloc_count_list. Change all callers.
(Output_segment::set_section_addresses): Rewrite.
(Output_segment::set_offset): Rewrite.
(Output_segment::find_first_and_last_list): Remove.
(Output_segment::set_tls_offsets): Rewrite.
(Output_segment::first_section_load_address): Likewise.
(Output_segment::output_section_count): Likewise.
(Output_segment::section_with_lowest_load_address): Likewise.
(Output_segment::write_section_headers): Likewise.
(Output_segment::print_sections_to_map): Likewise.
* output.h (class Output_data): Remove dynamic_reloc_count_
field. Add has_dynamic_reloc_ field. Make bools into bitfields.
(Output_data::add_dynamic_reloc): Rewrite.
(Output_data::has_dynamic_reloc): New function.
(Output_data::dynamic_reloc_count): Remove.
(class Output_section): Add order_ field. Remvoe is_relro_local_,
is_last_relro_, is_first_non_relro_, is_interp_,
is_dynamic_linker_section_ fields. Add order and set_order
functions. Remove is_relro_local, set_is_relro_local,
is_last_relro, set_is_last_relro, is_first_non_relro,
set_is_first_non_relro functions, is_interp, set_is_interp,
is_dynamic_linker_section, and set_is_dynamic_linker_section
functions.
(class Output_segment): Change Output_data_list from std::list to
std:;vector. Add output_lists_ field. Remove output_data_ and
output_bss_ fields. Update declarations.
2010-08-03 14:07:13 +00:00
|
|
|
bool is_data_size_valid_ : 1;
|
2007-11-29 20:10:17 +00:00
|
|
|
// Whether offset_ is valid.
|
2010-08-03 Ian Lance Taylor <iant@google.com>
PR 11805
* layout.h (enum Output_section_order): Define.
(class Layout): Update declarations.
* layout.cc (Layout::get_output_section): Add order parameter.
Remove is_interp, is_dynamic_linker_section, is_last_relro, and
is_first_non_relro parameters. Change all callers.
(Layout::choose_output_section): Likewise.
(Layout::add_output_section_data): Likewise.
(Layout::make_output_section): Likewise. Set order.
(Layout::default_section_order): New function.
(Layout::layout_eh_frame): Call add_output_section_to_nonload.
* output.cc (Output_section::Output_section): Initialize order_.
Don't initialize deleted fields.
(Output_segment::Output_segment): Don't initialize deleted
fields.
(Output_segment::add_output_section_to_load): New function
replacing add_output_section. Change all callers to call this or
add_output_section_to_nonload.
(Output_segment::add_output_section_to_nonload): New function.
(Output_segment::remove_output_section): Rewrite.
(Output_segment::add_initial_output_data): Likewise.
(Output_segment::has_any_data_sections): Likewise.
(Output_segment::is_first_section_relro): Likewise.
(Output_segment::maximum_alignment): Likewise.
(Output_segment::has_dynamic_reloc): New function replacing
dynamic_reloc_count. Change all callers.
(Output_segment::has_dynamic_reloc_list): New function replacing
dynamic_reloc_count_list. Change all callers.
(Output_segment::set_section_addresses): Rewrite.
(Output_segment::set_offset): Rewrite.
(Output_segment::find_first_and_last_list): Remove.
(Output_segment::set_tls_offsets): Rewrite.
(Output_segment::first_section_load_address): Likewise.
(Output_segment::output_section_count): Likewise.
(Output_segment::section_with_lowest_load_address): Likewise.
(Output_segment::write_section_headers): Likewise.
(Output_segment::print_sections_to_map): Likewise.
* output.h (class Output_data): Remove dynamic_reloc_count_
field. Add has_dynamic_reloc_ field. Make bools into bitfields.
(Output_data::add_dynamic_reloc): Rewrite.
(Output_data::has_dynamic_reloc): New function.
(Output_data::dynamic_reloc_count): Remove.
(class Output_section): Add order_ field. Remvoe is_relro_local_,
is_last_relro_, is_first_non_relro_, is_interp_,
is_dynamic_linker_section_ fields. Add order and set_order
functions. Remove is_relro_local, set_is_relro_local,
is_last_relro, set_is_last_relro, is_first_non_relro,
set_is_first_non_relro functions, is_interp, set_is_interp,
is_dynamic_linker_section, and set_is_dynamic_linker_section
functions.
(class Output_segment): Change Output_data_list from std::list to
std:;vector. Add output_lists_ field. Remove output_data_ and
output_bss_ fields. Update declarations.
2010-08-03 14:07:13 +00:00
|
|
|
bool is_offset_valid_ : 1;
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 01:10:38 +00:00
|
|
|
// Whether data size is fixed.
|
2010-08-03 Ian Lance Taylor <iant@google.com>
PR 11805
* layout.h (enum Output_section_order): Define.
(class Layout): Update declarations.
* layout.cc (Layout::get_output_section): Add order parameter.
Remove is_interp, is_dynamic_linker_section, is_last_relro, and
is_first_non_relro parameters. Change all callers.
(Layout::choose_output_section): Likewise.
(Layout::add_output_section_data): Likewise.
(Layout::make_output_section): Likewise. Set order.
(Layout::default_section_order): New function.
(Layout::layout_eh_frame): Call add_output_section_to_nonload.
* output.cc (Output_section::Output_section): Initialize order_.
Don't initialize deleted fields.
(Output_segment::Output_segment): Don't initialize deleted
fields.
(Output_segment::add_output_section_to_load): New function
replacing add_output_section. Change all callers to call this or
add_output_section_to_nonload.
(Output_segment::add_output_section_to_nonload): New function.
(Output_segment::remove_output_section): Rewrite.
(Output_segment::add_initial_output_data): Likewise.
(Output_segment::has_any_data_sections): Likewise.
(Output_segment::is_first_section_relro): Likewise.
(Output_segment::maximum_alignment): Likewise.
(Output_segment::has_dynamic_reloc): New function replacing
dynamic_reloc_count. Change all callers.
(Output_segment::has_dynamic_reloc_list): New function replacing
dynamic_reloc_count_list. Change all callers.
(Output_segment::set_section_addresses): Rewrite.
(Output_segment::set_offset): Rewrite.
(Output_segment::find_first_and_last_list): Remove.
(Output_segment::set_tls_offsets): Rewrite.
(Output_segment::first_section_load_address): Likewise.
(Output_segment::output_section_count): Likewise.
(Output_segment::section_with_lowest_load_address): Likewise.
(Output_segment::write_section_headers): Likewise.
(Output_segment::print_sections_to_map): Likewise.
* output.h (class Output_data): Remove dynamic_reloc_count_
field. Add has_dynamic_reloc_ field. Make bools into bitfields.
(Output_data::add_dynamic_reloc): Rewrite.
(Output_data::has_dynamic_reloc): New function.
(Output_data::dynamic_reloc_count): Remove.
(class Output_section): Add order_ field. Remvoe is_relro_local_,
is_last_relro_, is_first_non_relro_, is_interp_,
is_dynamic_linker_section_ fields. Add order and set_order
functions. Remove is_relro_local, set_is_relro_local,
is_last_relro, set_is_last_relro, is_first_non_relro,
set_is_first_non_relro functions, is_interp, set_is_interp,
is_dynamic_linker_section, and set_is_dynamic_linker_section
functions.
(class Output_segment): Change Output_data_list from std::list to
std:;vector. Add output_lists_ field. Remove output_data_ and
output_bss_ fields. Update declarations.
2010-08-03 14:07:13 +00:00
|
|
|
bool is_data_size_fixed_ : 1;
|
|
|
|
// Whether any dynamic relocs have been applied to this section.
|
|
|
|
bool has_dynamic_reloc_ : 1;
|
2006-09-21 22:13:18 +00:00
|
|
|
};
|
|
|
|
|
2006-09-26 21:00:34 +00:00
|
|
|
// Output the section headers.
|
|
|
|
|
|
|
|
class Output_section_headers : public Output_data
|
|
|
|
{
|
|
|
|
public:
|
2007-09-26 07:01:35 +00:00
|
|
|
Output_section_headers(const Layout*,
|
2006-12-01 16:51:25 +00:00
|
|
|
const Layout::Segment_list*,
|
|
|
|
const Layout::Section_list*,
|
2008-02-06 08:13:50 +00:00
|
|
|
const Layout::Section_list*,
|
2008-04-19 18:30:58 +00:00
|
|
|
const Stringpool*,
|
|
|
|
const Output_section*);
|
2006-09-26 21:00:34 +00:00
|
|
|
|
2007-11-29 20:10:17 +00:00
|
|
|
protected:
|
2006-09-26 21:00:34 +00:00
|
|
|
// Write the data to the file.
|
|
|
|
void
|
2006-09-27 22:53:42 +00:00
|
|
|
do_write(Output_file*);
|
|
|
|
|
|
|
|
// Return the required alignment.
|
|
|
|
uint64_t
|
|
|
|
do_addralign() const
|
2007-11-09 07:00:15 +00:00
|
|
|
{ return Output_data::default_alignment(); }
|
2006-09-26 21:00:34 +00:00
|
|
|
|
2008-05-21 21:37:44 +00:00
|
|
|
// Write to a map file.
|
|
|
|
void
|
|
|
|
do_print_to_mapfile(Mapfile* mapfile) const
|
|
|
|
{ mapfile->print_output_data(this, _("** section headers")); }
|
|
|
|
|
2011-04-12 00:44:48 +00:00
|
|
|
// Update the data size.
|
|
|
|
void
|
|
|
|
update_data_size()
|
|
|
|
{ this->set_data_size(this->do_size()); }
|
|
|
|
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 01:10:38 +00:00
|
|
|
// Set final data size.
|
|
|
|
void
|
|
|
|
set_final_data_size()
|
|
|
|
{ this->set_data_size(this->do_size()); }
|
|
|
|
|
2006-09-26 21:00:34 +00:00
|
|
|
private:
|
2006-09-29 19:58:17 +00:00
|
|
|
// Write the data to the file with the right size and endianness.
|
|
|
|
template<int size, bool big_endian>
|
|
|
|
void
|
|
|
|
do_sized_write(Output_file*);
|
|
|
|
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 01:10:38 +00:00
|
|
|
// Compute data size.
|
|
|
|
off_t
|
|
|
|
do_size() const;
|
|
|
|
|
2006-12-01 16:51:25 +00:00
|
|
|
const Layout* layout_;
|
|
|
|
const Layout::Segment_list* segment_list_;
|
2008-02-06 08:13:50 +00:00
|
|
|
const Layout::Section_list* section_list_;
|
2006-12-01 16:51:25 +00:00
|
|
|
const Layout::Section_list* unattached_section_list_;
|
2006-09-29 19:58:17 +00:00
|
|
|
const Stringpool* secnamepool_;
|
2008-04-19 18:30:58 +00:00
|
|
|
const Output_section* shstrtab_section_;
|
2006-09-26 21:00:34 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
// Output the segment headers.
|
|
|
|
|
|
|
|
class Output_segment_headers : public Output_data
|
|
|
|
{
|
|
|
|
public:
|
2007-09-26 07:01:35 +00:00
|
|
|
Output_segment_headers(const Layout::Segment_list& segment_list);
|
2006-09-26 21:00:34 +00:00
|
|
|
|
2007-11-29 20:10:17 +00:00
|
|
|
protected:
|
2006-09-26 21:00:34 +00:00
|
|
|
// Write the data to the file.
|
|
|
|
void
|
2006-09-27 22:53:42 +00:00
|
|
|
do_write(Output_file*);
|
|
|
|
|
|
|
|
// Return the required alignment.
|
|
|
|
uint64_t
|
|
|
|
do_addralign() const
|
2007-11-09 07:00:15 +00:00
|
|
|
{ return Output_data::default_alignment(); }
|
2006-09-26 21:00:34 +00:00
|
|
|
|
2008-05-21 21:37:44 +00:00
|
|
|
// Write to a map file.
|
|
|
|
void
|
|
|
|
do_print_to_mapfile(Mapfile* mapfile) const
|
|
|
|
{ mapfile->print_output_data(this, _("** segment headers")); }
|
|
|
|
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 01:10:38 +00:00
|
|
|
// Set final data size.
|
|
|
|
void
|
|
|
|
set_final_data_size()
|
|
|
|
{ this->set_data_size(this->do_size()); }
|
|
|
|
|
2006-09-26 21:00:34 +00:00
|
|
|
private:
|
2006-09-29 19:58:17 +00:00
|
|
|
// Write the data to the file with the right size and endianness.
|
|
|
|
template<int size, bool big_endian>
|
|
|
|
void
|
|
|
|
do_sized_write(Output_file*);
|
|
|
|
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 01:10:38 +00:00
|
|
|
// Compute the current size.
|
|
|
|
off_t
|
|
|
|
do_size() const;
|
|
|
|
|
2006-09-26 21:00:34 +00:00
|
|
|
const Layout::Segment_list& segment_list_;
|
|
|
|
};
|
|
|
|
|
|
|
|
// Output the ELF file header.
|
|
|
|
|
|
|
|
class Output_file_header : public Output_data
|
|
|
|
{
|
|
|
|
public:
|
2007-09-26 07:01:35 +00:00
|
|
|
Output_file_header(const Target*,
|
2006-09-26 21:00:34 +00:00
|
|
|
const Symbol_table*,
|
2011-05-25 00:17:47 +00:00
|
|
|
const Output_segment_headers*);
|
2006-09-27 22:53:42 +00:00
|
|
|
|
|
|
|
// Add information about the section headers. We lay out the ELF
|
|
|
|
// file header before we create the section headers.
|
|
|
|
void set_section_info(const Output_section_headers*,
|
|
|
|
const Output_section* shstrtab);
|
2006-09-26 21:00:34 +00:00
|
|
|
|
2007-11-29 20:10:17 +00:00
|
|
|
protected:
|
2006-09-26 21:00:34 +00:00
|
|
|
// Write the data to the file.
|
|
|
|
void
|
2006-09-27 22:53:42 +00:00
|
|
|
do_write(Output_file*);
|
|
|
|
|
|
|
|
// Return the required alignment.
|
|
|
|
uint64_t
|
|
|
|
do_addralign() const
|
2007-11-09 07:00:15 +00:00
|
|
|
{ return Output_data::default_alignment(); }
|
2006-09-27 22:53:42 +00:00
|
|
|
|
2008-05-21 21:37:44 +00:00
|
|
|
// Write to a map file.
|
|
|
|
void
|
|
|
|
do_print_to_mapfile(Mapfile* mapfile) const
|
|
|
|
{ mapfile->print_output_data(this, _("** file header")); }
|
|
|
|
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 01:10:38 +00:00
|
|
|
// Set final data size.
|
|
|
|
void
|
|
|
|
set_final_data_size(void)
|
|
|
|
{ this->set_data_size(this->do_size()); }
|
|
|
|
|
2006-09-26 21:00:34 +00:00
|
|
|
private:
|
2006-09-29 19:58:17 +00:00
|
|
|
// Write the data to the file with the right size and endianness.
|
|
|
|
template<int size, bool big_endian>
|
|
|
|
void
|
|
|
|
do_sized_write(Output_file*);
|
|
|
|
|
2008-01-06 00:47:10 +00:00
|
|
|
// Return the value to use for the entry address.
|
|
|
|
template<int size>
|
|
|
|
typename elfcpp::Elf_types<size>::Elf_Addr
|
|
|
|
entry();
|
|
|
|
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 01:10:38 +00:00
|
|
|
// Compute the current data size.
|
|
|
|
off_t
|
|
|
|
do_size() const;
|
|
|
|
|
2006-09-26 21:00:34 +00:00
|
|
|
const Target* target_;
|
|
|
|
const Symbol_table* symtab_;
|
2006-09-29 19:58:17 +00:00
|
|
|
const Output_segment_headers* segment_header_;
|
2006-09-26 21:00:34 +00:00
|
|
|
const Output_section_headers* section_header_;
|
|
|
|
const Output_section* shstrtab_;
|
|
|
|
};
|
|
|
|
|
2006-11-03 18:26:11 +00:00
|
|
|
// Output sections are mainly comprised of input sections. However,
|
|
|
|
// there are cases where we have data to write out which is not in an
|
|
|
|
// input section. Output_section_data is used in such cases. This is
|
|
|
|
// an abstract base class.
|
|
|
|
|
|
|
|
class Output_section_data : public Output_data
|
|
|
|
{
|
|
|
|
public:
|
2009-12-14 19:53:05 +00:00
|
|
|
Output_section_data(off_t data_size, uint64_t addralign,
|
|
|
|
bool is_data_size_fixed)
|
|
|
|
: Output_data(), output_section_(NULL), addralign_(addralign)
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 01:10:38 +00:00
|
|
|
{
|
2009-12-14 19:53:05 +00:00
|
|
|
this->set_data_size(data_size);
|
|
|
|
if (is_data_size_fixed)
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 01:10:38 +00:00
|
|
|
this->fix_data_size();
|
|
|
|
}
|
2006-11-03 18:26:11 +00:00
|
|
|
|
2009-12-14 19:53:05 +00:00
|
|
|
Output_section_data(uint64_t addralign)
|
|
|
|
: Output_data(), output_section_(NULL), addralign_(addralign)
|
2006-11-03 18:26:11 +00:00
|
|
|
{ }
|
|
|
|
|
2006-12-01 16:51:25 +00:00
|
|
|
// Return the output section.
|
2010-08-19 22:50:16 +00:00
|
|
|
Output_section*
|
|
|
|
output_section()
|
|
|
|
{ return this->output_section_; }
|
|
|
|
|
2006-12-01 16:51:25 +00:00
|
|
|
const Output_section*
|
|
|
|
output_section() const
|
|
|
|
{ return this->output_section_; }
|
|
|
|
|
2006-11-03 18:26:11 +00:00
|
|
|
// Record the output section.
|
|
|
|
void
|
2006-12-01 16:51:25 +00:00
|
|
|
set_output_section(Output_section* os);
|
2006-11-03 18:26:11 +00:00
|
|
|
|
2007-05-16 17:42:48 +00:00
|
|
|
// Add an input section, for SHF_MERGE sections. This returns true
|
|
|
|
// if the section was handled.
|
|
|
|
bool
|
|
|
|
add_input_section(Relobj* object, unsigned int shndx)
|
|
|
|
{ return this->do_add_input_section(object, shndx); }
|
|
|
|
|
|
|
|
// Given an input OBJECT, an input section index SHNDX within that
|
|
|
|
// object, and an OFFSET relative to the start of that input
|
2007-11-09 07:00:15 +00:00
|
|
|
// section, return whether or not the corresponding offset within
|
|
|
|
// the output section is known. If this function returns true, it
|
|
|
|
// sets *POUTPUT to the output offset. The value -1 indicates that
|
|
|
|
// this input offset is being discarded.
|
2007-12-20 01:29:04 +00:00
|
|
|
bool
|
2007-12-18 00:48:04 +00:00
|
|
|
output_offset(const Relobj* object, unsigned int shndx,
|
2009-12-14 19:53:05 +00:00
|
|
|
section_offset_type offset,
|
2010-08-25 08:36:54 +00:00
|
|
|
section_offset_type* poutput) const
|
2009-12-14 19:53:05 +00:00
|
|
|
{ return this->do_output_offset(object, shndx, offset, poutput); }
|
2007-05-16 17:42:48 +00:00
|
|
|
|
2007-12-21 21:19:45 +00:00
|
|
|
// Return whether this is the merge section for the input section
|
|
|
|
// SHNDX in OBJECT. This should return true when output_offset
|
|
|
|
// would return true for some values of OFFSET.
|
|
|
|
bool
|
|
|
|
is_merge_section_for(const Relobj* object, unsigned int shndx) const
|
|
|
|
{ return this->do_is_merge_section_for(object, shndx); }
|
|
|
|
|
2007-12-01 06:34:12 +00:00
|
|
|
// Write the contents to a buffer. This is used for sections which
|
|
|
|
// require postprocessing, such as compression.
|
|
|
|
void
|
|
|
|
write_to_buffer(unsigned char* buffer)
|
|
|
|
{ this->do_write_to_buffer(buffer); }
|
|
|
|
|
2007-12-18 21:24:10 +00:00
|
|
|
// Print merge stats to stderr. This should only be called for
|
|
|
|
// SHF_MERGE sections.
|
|
|
|
void
|
|
|
|
print_merge_stats(const char* section_name)
|
|
|
|
{ this->do_print_merge_stats(section_name); }
|
|
|
|
|
2006-11-03 18:26:11 +00:00
|
|
|
protected:
|
|
|
|
// The child class must implement do_write.
|
|
|
|
|
2006-12-01 16:51:25 +00:00
|
|
|
// The child class may implement specific adjustments to the output
|
|
|
|
// section.
|
|
|
|
virtual void
|
|
|
|
do_adjust_output_section(Output_section*)
|
|
|
|
{ }
|
|
|
|
|
2007-05-16 17:42:48 +00:00
|
|
|
// May be implemented by child class. Return true if the section
|
|
|
|
// was handled.
|
|
|
|
virtual bool
|
|
|
|
do_add_input_section(Relobj*, unsigned int)
|
|
|
|
{ gold_unreachable(); }
|
|
|
|
|
2007-11-09 07:00:15 +00:00
|
|
|
// The child class may implement output_offset.
|
2007-05-16 17:42:48 +00:00
|
|
|
virtual bool
|
2007-12-18 00:48:04 +00:00
|
|
|
do_output_offset(const Relobj*, unsigned int, section_offset_type,
|
|
|
|
section_offset_type*) const
|
2007-05-16 17:42:48 +00:00
|
|
|
{ return false; }
|
|
|
|
|
2007-12-21 21:19:45 +00:00
|
|
|
// The child class may implement is_merge_section_for.
|
|
|
|
virtual bool
|
|
|
|
do_is_merge_section_for(const Relobj*, unsigned int) const
|
|
|
|
{ return false; }
|
|
|
|
|
2007-12-01 06:34:12 +00:00
|
|
|
// The child class may implement write_to_buffer. Most child
|
|
|
|
// classes can not appear in a compressed section, and they do not
|
|
|
|
// implement this.
|
|
|
|
virtual void
|
|
|
|
do_write_to_buffer(unsigned char*)
|
|
|
|
{ gold_unreachable(); }
|
|
|
|
|
2007-12-18 21:24:10 +00:00
|
|
|
// Print merge statistics.
|
|
|
|
virtual void
|
|
|
|
do_print_merge_stats(const char*)
|
|
|
|
{ gold_unreachable(); }
|
|
|
|
|
2006-11-03 18:26:11 +00:00
|
|
|
// Return the required alignment.
|
|
|
|
uint64_t
|
|
|
|
do_addralign() const
|
|
|
|
{ return this->addralign_; }
|
|
|
|
|
2008-02-09 01:22:17 +00:00
|
|
|
// Return the output section.
|
|
|
|
Output_section*
|
|
|
|
do_output_section()
|
|
|
|
{ return this->output_section_; }
|
|
|
|
|
2010-01-07 20:43:35 +00:00
|
|
|
const Output_section*
|
|
|
|
do_output_section() const
|
|
|
|
{ return this->output_section_; }
|
|
|
|
|
2006-11-03 18:26:11 +00:00
|
|
|
// Return the section index of the output section.
|
|
|
|
unsigned int
|
|
|
|
do_out_shndx() const;
|
|
|
|
|
2006-11-30 23:52:50 +00:00
|
|
|
// Set the alignment.
|
|
|
|
void
|
2008-04-11 22:55:13 +00:00
|
|
|
set_addralign(uint64_t addralign);
|
2006-11-30 23:52:50 +00:00
|
|
|
|
2006-11-03 18:26:11 +00:00
|
|
|
private:
|
|
|
|
// The output section for this section.
|
2008-02-09 01:22:17 +00:00
|
|
|
Output_section* output_section_;
|
2006-11-03 18:26:11 +00:00
|
|
|
// The required alignment.
|
|
|
|
uint64_t addralign_;
|
|
|
|
};
|
|
|
|
|
2007-11-29 20:10:17 +00:00
|
|
|
// Some Output_section_data classes build up their data step by step,
|
|
|
|
// rather than all at once. This class provides an interface for
|
|
|
|
// them.
|
|
|
|
|
|
|
|
class Output_section_data_build : public Output_section_data
|
|
|
|
{
|
|
|
|
public:
|
2009-12-14 19:53:05 +00:00
|
|
|
Output_section_data_build(uint64_t addralign)
|
|
|
|
: Output_section_data(addralign)
|
2007-11-29 20:10:17 +00:00
|
|
|
{ }
|
|
|
|
|
2011-05-23 23:27:11 +00:00
|
|
|
Output_section_data_build(off_t data_size, uint64_t addralign)
|
|
|
|
: Output_section_data(data_size, addralign, false)
|
|
|
|
{ }
|
|
|
|
|
2007-11-29 20:10:17 +00:00
|
|
|
// Set the current data size.
|
|
|
|
void
|
2009-12-14 19:53:05 +00:00
|
|
|
set_current_data_size(off_t data_size)
|
|
|
|
{ this->set_current_data_size_for_child(data_size); }
|
2007-11-29 20:10:17 +00:00
|
|
|
|
|
|
|
protected:
|
|
|
|
// Set the final data size.
|
|
|
|
virtual void
|
|
|
|
set_final_data_size()
|
|
|
|
{ this->set_data_size(this->current_data_size_for_child()); }
|
|
|
|
};
|
|
|
|
|
2006-11-14 19:21:05 +00:00
|
|
|
// A simple case of Output_data in which we have constant data to
|
|
|
|
// output.
|
2006-11-03 18:26:11 +00:00
|
|
|
|
2006-11-14 19:21:05 +00:00
|
|
|
class Output_data_const : public Output_section_data
|
2006-11-03 18:26:11 +00:00
|
|
|
{
|
|
|
|
public:
|
2009-12-14 19:53:05 +00:00
|
|
|
Output_data_const(const std::string& data, uint64_t addralign)
|
|
|
|
: Output_section_data(data.size(), addralign, true), data_(data)
|
2006-11-14 19:21:05 +00:00
|
|
|
{ }
|
|
|
|
|
2009-12-14 19:53:05 +00:00
|
|
|
Output_data_const(const char* p, off_t len, uint64_t addralign)
|
|
|
|
: Output_section_data(len, addralign, true), data_(p, len)
|
2006-11-14 19:21:05 +00:00
|
|
|
{ }
|
|
|
|
|
2009-12-14 19:53:05 +00:00
|
|
|
Output_data_const(const unsigned char* p, off_t len, uint64_t addralign)
|
|
|
|
: Output_section_data(len, addralign, true),
|
2006-11-14 19:21:05 +00:00
|
|
|
data_(reinterpret_cast<const char*>(p), len)
|
|
|
|
{ }
|
|
|
|
|
2007-11-29 20:10:17 +00:00
|
|
|
protected:
|
2006-11-29 17:56:40 +00:00
|
|
|
// Write the data to the output file.
|
2006-11-14 19:21:05 +00:00
|
|
|
void
|
2006-11-29 17:56:40 +00:00
|
|
|
do_write(Output_file*);
|
2006-11-14 19:21:05 +00:00
|
|
|
|
2007-12-01 06:34:12 +00:00
|
|
|
// Write the data to a buffer.
|
|
|
|
void
|
|
|
|
do_write_to_buffer(unsigned char* buffer)
|
|
|
|
{ memcpy(buffer, this->data_.data(), this->data_.size()); }
|
|
|
|
|
2008-05-21 21:37:44 +00:00
|
|
|
// Write to a map file.
|
|
|
|
void
|
|
|
|
do_print_to_mapfile(Mapfile* mapfile) const
|
|
|
|
{ mapfile->print_output_data(this, _("** fill")); }
|
|
|
|
|
2006-11-14 19:21:05 +00:00
|
|
|
private:
|
|
|
|
std::string data_;
|
|
|
|
};
|
|
|
|
|
2006-11-29 17:56:40 +00:00
|
|
|
// Another version of Output_data with constant data, in which the
|
|
|
|
// buffer is allocated by the caller.
|
2006-11-14 19:21:05 +00:00
|
|
|
|
2006-11-29 17:56:40 +00:00
|
|
|
class Output_data_const_buffer : public Output_section_data
|
2006-11-14 19:21:05 +00:00
|
|
|
{
|
|
|
|
public:
|
2006-11-29 17:56:40 +00:00
|
|
|
Output_data_const_buffer(const unsigned char* p, off_t len,
|
2009-12-14 19:53:05 +00:00
|
|
|
uint64_t addralign, const char* map_name)
|
|
|
|
: Output_section_data(len, addralign, true),
|
2008-05-21 21:37:44 +00:00
|
|
|
p_(p), map_name_(map_name)
|
2006-11-29 17:56:40 +00:00
|
|
|
{ }
|
|
|
|
|
2007-11-29 20:10:17 +00:00
|
|
|
protected:
|
2006-11-29 17:56:40 +00:00
|
|
|
// Write the data the output file.
|
|
|
|
void
|
|
|
|
do_write(Output_file*);
|
|
|
|
|
2007-12-01 06:34:12 +00:00
|
|
|
// Write the data to a buffer.
|
|
|
|
void
|
|
|
|
do_write_to_buffer(unsigned char* buffer)
|
|
|
|
{ memcpy(buffer, this->p_, this->data_size()); }
|
|
|
|
|
2008-05-21 21:37:44 +00:00
|
|
|
// Write to a map file.
|
|
|
|
void
|
|
|
|
do_print_to_mapfile(Mapfile* mapfile) const
|
|
|
|
{ mapfile->print_output_data(this, _(this->map_name_)); }
|
|
|
|
|
2006-11-29 17:56:40 +00:00
|
|
|
private:
|
2008-05-21 21:37:44 +00:00
|
|
|
// The data to output.
|
2006-11-29 17:56:40 +00:00
|
|
|
const unsigned char* p_;
|
2008-05-21 21:37:44 +00:00
|
|
|
// Name to use in a map file. Maps are a rarely used feature, but
|
|
|
|
// the space usage is minor as aren't very many of these objects.
|
|
|
|
const char* map_name_;
|
2006-11-29 17:56:40 +00:00
|
|
|
};
|
|
|
|
|
2007-11-29 20:10:17 +00:00
|
|
|
// A place holder for a fixed amount of data written out via some
|
|
|
|
// other mechanism.
|
2006-11-29 17:56:40 +00:00
|
|
|
|
2007-11-29 20:10:17 +00:00
|
|
|
class Output_data_fixed_space : public Output_section_data
|
2006-11-29 17:56:40 +00:00
|
|
|
{
|
|
|
|
public:
|
2009-12-14 19:53:05 +00:00
|
|
|
Output_data_fixed_space(off_t data_size, uint64_t addralign,
|
2008-05-21 21:37:44 +00:00
|
|
|
const char* map_name)
|
2009-12-14 19:53:05 +00:00
|
|
|
: Output_section_data(data_size, addralign, true),
|
2008-05-21 21:37:44 +00:00
|
|
|
map_name_(map_name)
|
2006-11-29 17:56:40 +00:00
|
|
|
{ }
|
|
|
|
|
2007-11-29 20:10:17 +00:00
|
|
|
protected:
|
|
|
|
// Write out the data--the actual data must be written out
|
|
|
|
// elsewhere.
|
|
|
|
void
|
|
|
|
do_write(Output_file*)
|
2006-11-03 18:26:11 +00:00
|
|
|
{ }
|
2008-05-21 21:37:44 +00:00
|
|
|
|
|
|
|
// Write to a map file.
|
|
|
|
void
|
|
|
|
do_print_to_mapfile(Mapfile* mapfile) const
|
|
|
|
{ mapfile->print_output_data(this, _(this->map_name_)); }
|
|
|
|
|
|
|
|
private:
|
|
|
|
// Name to use in a map file. Maps are a rarely used feature, but
|
|
|
|
// the space usage is minor as aren't very many of these objects.
|
|
|
|
const char* map_name_;
|
2007-11-29 20:10:17 +00:00
|
|
|
};
|
2006-11-03 18:26:11 +00:00
|
|
|
|
2007-11-29 20:10:17 +00:00
|
|
|
// A place holder for variable sized data written out via some other
|
|
|
|
// mechanism.
|
|
|
|
|
|
|
|
class Output_data_space : public Output_section_data_build
|
|
|
|
{
|
|
|
|
public:
|
2009-12-14 19:53:05 +00:00
|
|
|
explicit Output_data_space(uint64_t addralign, const char* map_name)
|
|
|
|
: Output_section_data_build(addralign),
|
2008-05-21 21:37:44 +00:00
|
|
|
map_name_(map_name)
|
2007-11-29 20:10:17 +00:00
|
|
|
{ }
|
2006-11-03 18:26:11 +00:00
|
|
|
|
2011-05-23 23:27:11 +00:00
|
|
|
explicit Output_data_space(off_t data_size, uint64_t addralign,
|
|
|
|
const char* map_name)
|
|
|
|
: Output_section_data_build(data_size, addralign),
|
|
|
|
map_name_(map_name)
|
|
|
|
{ }
|
|
|
|
|
2006-11-30 23:52:50 +00:00
|
|
|
// Set the alignment.
|
|
|
|
void
|
|
|
|
set_space_alignment(uint64_t align)
|
|
|
|
{ this->set_addralign(align); }
|
|
|
|
|
2007-11-29 20:10:17 +00:00
|
|
|
protected:
|
|
|
|
// Write out the data--the actual data must be written out
|
|
|
|
// elsewhere.
|
2006-11-03 18:26:11 +00:00
|
|
|
void
|
|
|
|
do_write(Output_file*)
|
|
|
|
{ }
|
2008-05-21 21:37:44 +00:00
|
|
|
|
|
|
|
// Write to a map file.
|
|
|
|
void
|
|
|
|
do_print_to_mapfile(Mapfile* mapfile) const
|
|
|
|
{ mapfile->print_output_data(this, _(this->map_name_)); }
|
|
|
|
|
|
|
|
private:
|
|
|
|
// Name to use in a map file. Maps are a rarely used feature, but
|
|
|
|
// the space usage is minor as aren't very many of these objects.
|
|
|
|
const char* map_name_;
|
|
|
|
};
|
|
|
|
|
|
|
|
// Fill fixed space with zeroes. This is just like
|
|
|
|
// Output_data_fixed_space, except that the map name is known.
|
|
|
|
|
|
|
|
class Output_data_zero_fill : public Output_section_data
|
|
|
|
{
|
|
|
|
public:
|
2009-12-14 19:53:05 +00:00
|
|
|
Output_data_zero_fill(off_t data_size, uint64_t addralign)
|
|
|
|
: Output_section_data(data_size, addralign, true)
|
2008-05-21 21:37:44 +00:00
|
|
|
{ }
|
|
|
|
|
|
|
|
protected:
|
|
|
|
// There is no data to write out.
|
|
|
|
void
|
|
|
|
do_write(Output_file*)
|
|
|
|
{ }
|
|
|
|
|
|
|
|
// Write to a map file.
|
|
|
|
void
|
|
|
|
do_print_to_mapfile(Mapfile* mapfile) const
|
|
|
|
{ mapfile->print_output_data(this, "** zero fill"); }
|
2006-11-03 18:26:11 +00:00
|
|
|
};
|
|
|
|
|
2006-11-29 17:56:40 +00:00
|
|
|
// A string table which goes into an output section.
|
|
|
|
|
|
|
|
class Output_data_strtab : public Output_section_data
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
Output_data_strtab(Stringpool* strtab)
|
|
|
|
: Output_section_data(1), strtab_(strtab)
|
|
|
|
{ }
|
|
|
|
|
2007-11-29 20:10:17 +00:00
|
|
|
protected:
|
2011-04-12 00:44:48 +00:00
|
|
|
// This is called to update the section size prior to assigning
|
|
|
|
// the address and file offset.
|
|
|
|
void
|
|
|
|
update_data_size()
|
|
|
|
{ this->set_final_data_size(); }
|
|
|
|
|
2006-11-29 17:56:40 +00:00
|
|
|
// This is called to set the address and file offset. Here we make
|
|
|
|
// sure that the Stringpool is finalized.
|
|
|
|
void
|
2007-11-29 20:10:17 +00:00
|
|
|
set_final_data_size();
|
2006-11-29 17:56:40 +00:00
|
|
|
|
|
|
|
// Write out the data.
|
|
|
|
void
|
|
|
|
do_write(Output_file*);
|
|
|
|
|
2007-12-01 06:34:12 +00:00
|
|
|
// Write the data to a buffer.
|
|
|
|
void
|
|
|
|
do_write_to_buffer(unsigned char* buffer)
|
|
|
|
{ this->strtab_->write_to_buffer(buffer, this->data_size()); }
|
|
|
|
|
2008-05-21 21:37:44 +00:00
|
|
|
// Write to a map file.
|
|
|
|
void
|
|
|
|
do_print_to_mapfile(Mapfile* mapfile) const
|
|
|
|
{ mapfile->print_output_data(this, _("** string table")); }
|
|
|
|
|
2006-11-29 17:56:40 +00:00
|
|
|
private:
|
|
|
|
Stringpool* strtab_;
|
|
|
|
};
|
|
|
|
|
2006-11-16 00:38:25 +00:00
|
|
|
// This POD class is used to represent a single reloc in the output
|
|
|
|
// file. This could be a private class within Output_data_reloc, but
|
|
|
|
// the templatization is complex enough that I broke it out into a
|
|
|
|
// separate class. The class is templatized on either elfcpp::SHT_REL
|
|
|
|
// or elfcpp::SHT_RELA, and also on whether this is a dynamic
|
|
|
|
// relocation or an ordinary relocation.
|
|
|
|
|
2008-02-12 00:28:48 +00:00
|
|
|
// A relocation can be against a global symbol, a local symbol, a
|
|
|
|
// local section symbol, an output section, or the undefined symbol at
|
|
|
|
// index 0. We represent the latter by using a NULL global symbol.
|
2006-11-16 00:38:25 +00:00
|
|
|
|
|
|
|
template<int sh_type, bool dynamic, int size, bool big_endian>
|
|
|
|
class Output_reloc;
|
|
|
|
|
|
|
|
template<bool dynamic, int size, bool big_endian>
|
|
|
|
class Output_reloc<elfcpp::SHT_REL, dynamic, size, big_endian>
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
typedef typename elfcpp::Elf_types<size>::Elf_Addr Address;
|
2008-04-07 22:46:17 +00:00
|
|
|
typedef typename elfcpp::Elf_types<size>::Elf_Addr Addend;
|
2006-11-16 00:38:25 +00:00
|
|
|
|
2008-09-29 21:10:26 +00:00
|
|
|
static const Address invalid_address = static_cast<Address>(0) - 1;
|
|
|
|
|
2006-11-16 00:38:25 +00:00
|
|
|
// An uninitialized entry. We need this because we want to put
|
|
|
|
// instances of this class into an STL container.
|
|
|
|
Output_reloc()
|
|
|
|
: local_sym_index_(INVALID_CODE)
|
|
|
|
{ }
|
|
|
|
|
2008-02-12 00:28:48 +00:00
|
|
|
// We have a bunch of different constructors. They come in pairs
|
|
|
|
// depending on how the address of the relocation is specified. It
|
|
|
|
// can either be an offset in an Output_data or an offset in an
|
|
|
|
// input section.
|
|
|
|
|
2006-11-16 00:38:25 +00:00
|
|
|
// A reloc against a global symbol.
|
2006-11-30 23:52:50 +00:00
|
|
|
|
2006-11-29 17:56:40 +00:00
|
|
|
Output_reloc(Symbol* gsym, unsigned int type, Output_data* od,
|
2010-02-13 00:01:20 +00:00
|
|
|
Address address, bool is_relative, bool is_symbolless);
|
2006-11-30 23:52:50 +00:00
|
|
|
|
2008-07-10 23:01:20 +00:00
|
|
|
Output_reloc(Symbol* gsym, unsigned int type,
|
|
|
|
Sized_relobj<size, big_endian>* relobj,
|
2010-02-13 00:01:20 +00:00
|
|
|
unsigned int shndx, Address address, bool is_relative,
|
|
|
|
bool is_symbolless);
|
2006-11-16 00:38:25 +00:00
|
|
|
|
2008-02-12 00:28:48 +00:00
|
|
|
// A reloc against a local symbol or local section symbol.
|
2006-11-30 23:52:50 +00:00
|
|
|
|
|
|
|
Output_reloc(Sized_relobj<size, big_endian>* relobj,
|
2007-12-06 05:55:50 +00:00
|
|
|
unsigned int local_sym_index, unsigned int type,
|
2008-02-12 00:28:48 +00:00
|
|
|
Output_data* od, Address address, bool is_relative,
|
2010-02-13 00:01:20 +00:00
|
|
|
bool is_symbolless, bool is_section_symbol);
|
2006-11-30 23:52:50 +00:00
|
|
|
|
|
|
|
Output_reloc(Sized_relobj<size, big_endian>* relobj,
|
2007-12-06 05:55:50 +00:00
|
|
|
unsigned int local_sym_index, unsigned int type,
|
2008-02-12 00:28:48 +00:00
|
|
|
unsigned int shndx, Address address, bool is_relative,
|
2010-02-13 00:01:20 +00:00
|
|
|
bool is_symbolless, bool is_section_symbol);
|
2006-11-16 00:38:25 +00:00
|
|
|
|
|
|
|
// A reloc against the STT_SECTION symbol of an output section.
|
2006-11-30 23:52:50 +00:00
|
|
|
|
2006-11-29 17:56:40 +00:00
|
|
|
Output_reloc(Output_section* os, unsigned int type, Output_data* od,
|
2007-12-06 05:55:50 +00:00
|
|
|
Address address);
|
2006-11-30 23:52:50 +00:00
|
|
|
|
2008-07-10 23:01:20 +00:00
|
|
|
Output_reloc(Output_section* os, unsigned int type,
|
|
|
|
Sized_relobj<size, big_endian>* relobj,
|
2007-12-06 05:55:50 +00:00
|
|
|
unsigned int shndx, Address address);
|
2006-11-16 00:38:25 +00:00
|
|
|
|
2010-01-08 19:33:18 +00:00
|
|
|
// An absolute relocation with no symbol.
|
|
|
|
|
|
|
|
Output_reloc(unsigned int type, Output_data* od, Address address);
|
|
|
|
|
|
|
|
Output_reloc(unsigned int type, Sized_relobj<size, big_endian>* relobj,
|
|
|
|
unsigned int shndx, Address address);
|
|
|
|
|
|
|
|
// A target specific relocation. The target will be called to get
|
|
|
|
// the symbol index, passing ARG. The type and offset will be set
|
|
|
|
// as for other relocation types.
|
|
|
|
|
|
|
|
Output_reloc(unsigned int type, void* arg, Output_data* od,
|
|
|
|
Address address);
|
|
|
|
|
|
|
|
Output_reloc(unsigned int type, void* arg,
|
|
|
|
Sized_relobj<size, big_endian>* relobj,
|
|
|
|
unsigned int shndx, Address address);
|
|
|
|
|
|
|
|
// Return the reloc type.
|
|
|
|
unsigned int
|
|
|
|
type() const
|
|
|
|
{ return this->type_; }
|
|
|
|
|
|
|
|
// Return whether this is a RELATIVE relocation.
|
2007-12-07 19:32:59 +00:00
|
|
|
bool
|
|
|
|
is_relative() const
|
|
|
|
{ return this->is_relative_; }
|
|
|
|
|
2010-02-13 00:01:20 +00:00
|
|
|
// Return whether this is a relocation which should not use
|
|
|
|
// a symbol, but which obtains its addend from a symbol.
|
|
|
|
bool
|
|
|
|
is_symbolless() const
|
|
|
|
{ return this->is_symbolless_; }
|
|
|
|
|
2008-02-12 00:28:48 +00:00
|
|
|
// Return whether this is against a local section symbol.
|
|
|
|
bool
|
|
|
|
is_local_section_symbol() const
|
|
|
|
{
|
|
|
|
return (this->local_sym_index_ != GSYM_CODE
|
|
|
|
&& this->local_sym_index_ != SECTION_CODE
|
|
|
|
&& this->local_sym_index_ != INVALID_CODE
|
2010-01-08 19:33:18 +00:00
|
|
|
&& this->local_sym_index_ != TARGET_CODE
|
2008-02-12 00:28:48 +00:00
|
|
|
&& this->is_section_symbol_);
|
|
|
|
}
|
|
|
|
|
2010-01-08 19:33:18 +00:00
|
|
|
// Return whether this is a target specific relocation.
|
|
|
|
bool
|
|
|
|
is_target_specific() const
|
|
|
|
{ return this->local_sym_index_ == TARGET_CODE; }
|
|
|
|
|
|
|
|
// Return the argument to pass to the target for a target specific
|
|
|
|
// relocation.
|
|
|
|
void*
|
|
|
|
target_arg() const
|
|
|
|
{
|
|
|
|
gold_assert(this->local_sym_index_ == TARGET_CODE);
|
|
|
|
return this->u1_.arg;
|
|
|
|
}
|
|
|
|
|
2008-02-12 00:28:48 +00:00
|
|
|
// For a local section symbol, return the offset of the input
|
2008-04-07 22:46:17 +00:00
|
|
|
// section within the output section. ADDEND is the addend being
|
|
|
|
// applied to the input section.
|
2008-07-10 23:01:20 +00:00
|
|
|
Address
|
2008-04-07 22:46:17 +00:00
|
|
|
local_section_offset(Addend addend) const;
|
2008-02-12 00:28:48 +00:00
|
|
|
|
2008-03-16 23:51:19 +00:00
|
|
|
// Get the value of the symbol referred to by a Rel relocation when
|
|
|
|
// we are adding the given ADDEND.
|
2007-12-07 19:32:59 +00:00
|
|
|
Address
|
2008-04-07 22:46:17 +00:00
|
|
|
symbol_value(Addend addend) const;
|
2007-12-07 19:32:59 +00:00
|
|
|
|
2011-05-24 21:41:10 +00:00
|
|
|
// If this relocation is against an input section, return the
|
|
|
|
// relocatable object containing the input section.
|
|
|
|
Sized_relobj<size, big_endian>*
|
|
|
|
get_relobj() const
|
|
|
|
{
|
|
|
|
if (this->shndx_ == INVALID_CODE)
|
|
|
|
return NULL;
|
|
|
|
return this->u2_.relobj;
|
|
|
|
}
|
|
|
|
|
2006-11-16 00:38:25 +00:00
|
|
|
// Write the reloc entry to an output view.
|
|
|
|
void
|
|
|
|
write(unsigned char* pov) const;
|
|
|
|
|
|
|
|
// Write the offset and info fields to Write_rel.
|
|
|
|
template<typename Write_rel>
|
|
|
|
void write_rel(Write_rel*) const;
|
|
|
|
|
2008-05-06 05:03:15 +00:00
|
|
|
// This is used when sorting dynamic relocs. Return -1 to sort this
|
|
|
|
// reloc before R2, 0 to sort the same as R2, 1 to sort after R2.
|
|
|
|
int
|
|
|
|
compare(const Output_reloc<elfcpp::SHT_REL, dynamic, size, big_endian>& r2)
|
|
|
|
const;
|
|
|
|
|
|
|
|
// Return whether this reloc should be sorted before the argument
|
|
|
|
// when sorting dynamic relocs.
|
|
|
|
bool
|
|
|
|
sort_before(const Output_reloc<elfcpp::SHT_REL, dynamic, size, big_endian>&
|
|
|
|
r2) const
|
|
|
|
{ return this->compare(r2) < 0; }
|
|
|
|
|
2006-11-16 00:38:25 +00:00
|
|
|
private:
|
2008-02-12 00:28:48 +00:00
|
|
|
// Record that we need a dynamic symbol index.
|
|
|
|
void
|
|
|
|
set_needs_dynsym_index();
|
|
|
|
|
|
|
|
// Return the symbol index.
|
2006-11-16 00:38:25 +00:00
|
|
|
unsigned int
|
|
|
|
get_symbol_index() const;
|
|
|
|
|
2008-05-06 05:03:15 +00:00
|
|
|
// Return the output address.
|
2008-05-16 15:27:49 +00:00
|
|
|
Address
|
2008-05-06 05:03:15 +00:00
|
|
|
get_address() const;
|
|
|
|
|
2006-11-16 00:38:25 +00:00
|
|
|
// Codes for local_sym_index_.
|
|
|
|
enum
|
|
|
|
{
|
|
|
|
// Global symbol.
|
|
|
|
GSYM_CODE = -1U,
|
|
|
|
// Output section.
|
|
|
|
SECTION_CODE = -2U,
|
2010-01-08 19:33:18 +00:00
|
|
|
// Target specific.
|
|
|
|
TARGET_CODE = -3U,
|
2006-11-16 00:38:25 +00:00
|
|
|
// Invalid uninitialized entry.
|
2010-01-08 19:33:18 +00:00
|
|
|
INVALID_CODE = -4U
|
2006-11-16 00:38:25 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
union
|
|
|
|
{
|
2008-02-12 00:28:48 +00:00
|
|
|
// For a local symbol or local section symbol
|
|
|
|
// (this->local_sym_index_ >= 0), the object. We will never
|
|
|
|
// generate a relocation against a local symbol in a dynamic
|
|
|
|
// object; that doesn't make sense. And our callers will always
|
|
|
|
// be templatized, so we use Sized_relobj here.
|
2006-11-30 23:52:50 +00:00
|
|
|
Sized_relobj<size, big_endian>* relobj;
|
2008-02-12 00:28:48 +00:00
|
|
|
// For a global symbol (this->local_sym_index_ == GSYM_CODE, the
|
|
|
|
// symbol. If this is NULL, it indicates a relocation against the
|
|
|
|
// undefined 0 symbol.
|
2006-11-16 00:38:25 +00:00
|
|
|
Symbol* gsym;
|
2008-02-12 00:28:48 +00:00
|
|
|
// For a relocation against an output section
|
|
|
|
// (this->local_sym_index_ == SECTION_CODE), the output section.
|
2006-11-16 00:38:25 +00:00
|
|
|
Output_section* os;
|
2010-01-08 19:33:18 +00:00
|
|
|
// For a target specific relocation, an argument to pass to the
|
|
|
|
// target.
|
|
|
|
void* arg;
|
2006-11-30 23:52:50 +00:00
|
|
|
} u1_;
|
|
|
|
union
|
|
|
|
{
|
2008-02-12 00:28:48 +00:00
|
|
|
// If this->shndx_ is not INVALID CODE, the object which holds the
|
|
|
|
// input section being used to specify the reloc address.
|
2008-07-10 23:01:20 +00:00
|
|
|
Sized_relobj<size, big_endian>* relobj;
|
2008-02-12 00:28:48 +00:00
|
|
|
// If this->shndx_ is INVALID_CODE, the output data being used to
|
2006-11-30 23:52:50 +00:00
|
|
|
// specify the reloc address. This may be NULL if the reloc
|
|
|
|
// address is absolute.
|
|
|
|
Output_data* od;
|
|
|
|
} u2_;
|
|
|
|
// The address offset within the input section or the Output_data.
|
|
|
|
Address address_;
|
2008-02-12 00:28:48 +00:00
|
|
|
// This is GSYM_CODE for a global symbol, or SECTION_CODE for a
|
2010-01-08 19:33:18 +00:00
|
|
|
// relocation against an output section, or TARGET_CODE for a target
|
|
|
|
// specific relocation, or INVALID_CODE for an uninitialized value.
|
|
|
|
// Otherwise, for a local symbol (this->is_section_symbol_ is
|
|
|
|
// false), the local symbol index. For a local section symbol
|
|
|
|
// (this->is_section_symbol_ is true), the section index in the
|
|
|
|
// input file.
|
2006-11-16 00:38:25 +00:00
|
|
|
unsigned int local_sym_index_;
|
2006-11-29 17:56:40 +00:00
|
|
|
// The reloc type--a processor specific code.
|
2010-02-13 00:01:20 +00:00
|
|
|
unsigned int type_ : 29;
|
2007-12-07 19:32:59 +00:00
|
|
|
// True if the relocation is a RELATIVE relocation.
|
|
|
|
bool is_relative_ : 1;
|
2010-02-13 00:01:20 +00:00
|
|
|
// True if the relocation is one which should not use
|
|
|
|
// a symbol, but which obtains its addend from a symbol.
|
|
|
|
bool is_symbolless_ : 1;
|
2008-02-12 00:28:48 +00:00
|
|
|
// True if the relocation is against a section symbol.
|
|
|
|
bool is_section_symbol_ : 1;
|
2006-11-30 23:52:50 +00:00
|
|
|
// If the reloc address is an input section in an object, the
|
|
|
|
// section index. This is INVALID_CODE if the reloc address is
|
|
|
|
// specified in some other way.
|
|
|
|
unsigned int shndx_;
|
2006-11-16 00:38:25 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
// The SHT_RELA version of Output_reloc<>. This is just derived from
|
|
|
|
// the SHT_REL version of Output_reloc, but it adds an addend.
|
|
|
|
|
|
|
|
template<bool dynamic, int size, bool big_endian>
|
|
|
|
class Output_reloc<elfcpp::SHT_RELA, dynamic, size, big_endian>
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
typedef typename elfcpp::Elf_types<size>::Elf_Addr Address;
|
|
|
|
typedef typename elfcpp::Elf_types<size>::Elf_Addr Addend;
|
|
|
|
|
|
|
|
// An uninitialized entry.
|
|
|
|
Output_reloc()
|
|
|
|
: rel_()
|
|
|
|
{ }
|
|
|
|
|
|
|
|
// A reloc against a global symbol.
|
2006-11-30 23:52:50 +00:00
|
|
|
|
2006-11-29 17:56:40 +00:00
|
|
|
Output_reloc(Symbol* gsym, unsigned int type, Output_data* od,
|
2010-02-13 00:01:20 +00:00
|
|
|
Address address, Addend addend, bool is_relative,
|
|
|
|
bool is_symbolless)
|
|
|
|
: rel_(gsym, type, od, address, is_relative, is_symbolless),
|
|
|
|
addend_(addend)
|
2006-11-16 00:38:25 +00:00
|
|
|
{ }
|
|
|
|
|
2008-07-10 23:01:20 +00:00
|
|
|
Output_reloc(Symbol* gsym, unsigned int type,
|
|
|
|
Sized_relobj<size, big_endian>* relobj,
|
2009-12-14 19:53:05 +00:00
|
|
|
unsigned int shndx, Address address, Addend addend,
|
2010-02-13 00:01:20 +00:00
|
|
|
bool is_relative, bool is_symbolless)
|
|
|
|
: rel_(gsym, type, relobj, shndx, address, is_relative,
|
|
|
|
is_symbolless), addend_(addend)
|
2006-11-30 23:52:50 +00:00
|
|
|
{ }
|
|
|
|
|
2006-11-16 00:38:25 +00:00
|
|
|
// A reloc against a local symbol.
|
2006-11-30 23:52:50 +00:00
|
|
|
|
|
|
|
Output_reloc(Sized_relobj<size, big_endian>* relobj,
|
2007-12-07 19:32:59 +00:00
|
|
|
unsigned int local_sym_index, unsigned int type,
|
2009-12-14 19:53:05 +00:00
|
|
|
Output_data* od, Address address,
|
2010-02-13 00:01:20 +00:00
|
|
|
Addend addend, bool is_relative,
|
|
|
|
bool is_symbolless, bool is_section_symbol)
|
2009-12-14 19:53:05 +00:00
|
|
|
: rel_(relobj, local_sym_index, type, od, address, is_relative,
|
2010-02-13 00:01:20 +00:00
|
|
|
is_symbolless, is_section_symbol),
|
2007-12-07 19:32:59 +00:00
|
|
|
addend_(addend)
|
2006-11-30 23:52:50 +00:00
|
|
|
{ }
|
|
|
|
|
|
|
|
Output_reloc(Sized_relobj<size, big_endian>* relobj,
|
2007-12-07 19:32:59 +00:00
|
|
|
unsigned int local_sym_index, unsigned int type,
|
2009-12-14 19:53:05 +00:00
|
|
|
unsigned int shndx, Address address,
|
2010-02-13 00:01:20 +00:00
|
|
|
Addend addend, bool is_relative,
|
|
|
|
bool is_symbolless, bool is_section_symbol)
|
2009-12-14 19:53:05 +00:00
|
|
|
: rel_(relobj, local_sym_index, type, shndx, address, is_relative,
|
2010-02-13 00:01:20 +00:00
|
|
|
is_symbolless, is_section_symbol),
|
2006-11-30 23:52:50 +00:00
|
|
|
addend_(addend)
|
2006-11-16 00:38:25 +00:00
|
|
|
{ }
|
|
|
|
|
|
|
|
// A reloc against the STT_SECTION symbol of an output section.
|
2006-11-30 23:52:50 +00:00
|
|
|
|
2006-11-29 17:56:40 +00:00
|
|
|
Output_reloc(Output_section* os, unsigned int type, Output_data* od,
|
2009-12-14 19:53:05 +00:00
|
|
|
Address address, Addend addend)
|
|
|
|
: rel_(os, type, od, address), addend_(addend)
|
2006-11-16 00:38:25 +00:00
|
|
|
{ }
|
|
|
|
|
2008-07-10 23:01:20 +00:00
|
|
|
Output_reloc(Output_section* os, unsigned int type,
|
|
|
|
Sized_relobj<size, big_endian>* relobj,
|
2009-12-14 19:53:05 +00:00
|
|
|
unsigned int shndx, Address address, Addend addend)
|
|
|
|
: rel_(os, type, relobj, shndx, address), addend_(addend)
|
2006-11-30 23:52:50 +00:00
|
|
|
{ }
|
|
|
|
|
2010-01-08 19:33:18 +00:00
|
|
|
// An absolute relocation with no symbol.
|
|
|
|
|
|
|
|
Output_reloc(unsigned int type, Output_data* od, Address address,
|
|
|
|
Addend addend)
|
|
|
|
: rel_(type, od, address), addend_(addend)
|
|
|
|
{ }
|
|
|
|
|
|
|
|
Output_reloc(unsigned int type, Sized_relobj<size, big_endian>* relobj,
|
|
|
|
unsigned int shndx, Address address, Addend addend)
|
|
|
|
: rel_(type, relobj, shndx, address), addend_(addend)
|
|
|
|
{ }
|
|
|
|
|
|
|
|
// A target specific relocation. The target will be called to get
|
|
|
|
// the symbol index and the addend, passing ARG. The type and
|
|
|
|
// offset will be set as for other relocation types.
|
|
|
|
|
|
|
|
Output_reloc(unsigned int type, void* arg, Output_data* od,
|
|
|
|
Address address, Addend addend)
|
|
|
|
: rel_(type, arg, od, address), addend_(addend)
|
|
|
|
{ }
|
|
|
|
|
|
|
|
Output_reloc(unsigned int type, void* arg,
|
|
|
|
Sized_relobj<size, big_endian>* relobj,
|
|
|
|
unsigned int shndx, Address address, Addend addend)
|
|
|
|
: rel_(type, arg, relobj, shndx, address), addend_(addend)
|
|
|
|
{ }
|
|
|
|
|
|
|
|
// Return whether this is a RELATIVE relocation.
|
2010-01-07 21:09:31 +00:00
|
|
|
bool
|
|
|
|
is_relative() const
|
|
|
|
{ return this->rel_.is_relative(); }
|
|
|
|
|
2010-02-13 00:01:20 +00:00
|
|
|
// Return whether this is a relocation which should not use
|
|
|
|
// a symbol, but which obtains its addend from a symbol.
|
|
|
|
bool
|
|
|
|
is_symbolless() const
|
|
|
|
{ return this->rel_.is_symbolless(); }
|
|
|
|
|
2011-05-24 21:41:10 +00:00
|
|
|
// If this relocation is against an input section, return the
|
|
|
|
// relocatable object containing the input section.
|
|
|
|
Sized_relobj<size, big_endian>*
|
|
|
|
get_relobj() const
|
|
|
|
{ return this->rel_.get_relobj(); }
|
|
|
|
|
2006-11-16 00:38:25 +00:00
|
|
|
// Write the reloc entry to an output view.
|
|
|
|
void
|
|
|
|
write(unsigned char* pov) const;
|
|
|
|
|
2008-05-06 05:03:15 +00:00
|
|
|
// Return whether this reloc should be sorted before the argument
|
|
|
|
// when sorting dynamic relocs.
|
|
|
|
bool
|
|
|
|
sort_before(const Output_reloc<elfcpp::SHT_RELA, dynamic, size, big_endian>&
|
|
|
|
r2) const
|
|
|
|
{
|
|
|
|
int i = this->rel_.compare(r2.rel_);
|
|
|
|
if (i < 0)
|
|
|
|
return true;
|
2008-05-06 05:54:21 +00:00
|
|
|
else if (i > 0)
|
|
|
|
return false;
|
2008-05-06 05:03:15 +00:00
|
|
|
else
|
|
|
|
return this->addend_ < r2.addend_;
|
|
|
|
}
|
|
|
|
|
2006-11-16 00:38:25 +00:00
|
|
|
private:
|
|
|
|
// The basic reloc.
|
|
|
|
Output_reloc<elfcpp::SHT_REL, dynamic, size, big_endian> rel_;
|
|
|
|
// The addend.
|
|
|
|
Addend addend_;
|
|
|
|
};
|
|
|
|
|
2010-01-07 21:09:31 +00:00
|
|
|
// Output_data_reloc_generic is a non-template base class for
|
|
|
|
// Output_data_reloc_base. This gives the generic code a way to hold
|
|
|
|
// a pointer to a reloc section.
|
|
|
|
|
|
|
|
class Output_data_reloc_generic : public Output_section_data_build
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
Output_data_reloc_generic(int size, bool sort_relocs)
|
|
|
|
: Output_section_data_build(Output_data::default_alignment_for_size(size)),
|
|
|
|
relative_reloc_count_(0), sort_relocs_(sort_relocs)
|
|
|
|
{ }
|
|
|
|
|
|
|
|
// Return the number of relative relocs in this section.
|
|
|
|
size_t
|
|
|
|
relative_reloc_count() const
|
|
|
|
{ return this->relative_reloc_count_; }
|
|
|
|
|
|
|
|
// Whether we should sort the relocs.
|
|
|
|
bool
|
|
|
|
sort_relocs() const
|
|
|
|
{ return this->sort_relocs_; }
|
|
|
|
|
|
|
|
protected:
|
|
|
|
// Note that we've added another relative reloc.
|
|
|
|
void
|
|
|
|
bump_relative_reloc_count()
|
|
|
|
{ ++this->relative_reloc_count_; }
|
|
|
|
|
|
|
|
private:
|
|
|
|
// The number of relative relocs added to this section. This is to
|
|
|
|
// support DT_RELCOUNT.
|
|
|
|
size_t relative_reloc_count_;
|
|
|
|
// Whether to sort the relocations when writing them out, to make
|
|
|
|
// the dynamic linker more efficient.
|
|
|
|
bool sort_relocs_;
|
|
|
|
};
|
|
|
|
|
2006-11-16 00:38:25 +00:00
|
|
|
// Output_data_reloc is used to manage a section containing relocs.
|
|
|
|
// SH_TYPE is either elfcpp::SHT_REL or elfcpp::SHT_RELA. DYNAMIC
|
|
|
|
// indicates whether this is a dynamic relocation or a normal
|
|
|
|
// relocation. Output_data_reloc_base is a base class.
|
|
|
|
// Output_data_reloc is the real class, which we specialize based on
|
|
|
|
// the reloc type.
|
|
|
|
|
|
|
|
template<int sh_type, bool dynamic, int size, bool big_endian>
|
2010-01-07 21:09:31 +00:00
|
|
|
class Output_data_reloc_base : public Output_data_reloc_generic
|
2006-11-16 00:38:25 +00:00
|
|
|
{
|
|
|
|
public:
|
|
|
|
typedef Output_reloc<sh_type, dynamic, size, big_endian> Output_reloc_type;
|
|
|
|
typedef typename Output_reloc_type::Address Address;
|
|
|
|
static const int reloc_size =
|
|
|
|
Reloc_types<sh_type, size, big_endian>::reloc_size;
|
|
|
|
|
|
|
|
// Construct the section.
|
2008-05-06 05:03:15 +00:00
|
|
|
Output_data_reloc_base(bool sort_relocs)
|
2010-01-07 21:09:31 +00:00
|
|
|
: Output_data_reloc_generic(size, sort_relocs)
|
2006-11-16 00:38:25 +00:00
|
|
|
{ }
|
|
|
|
|
2007-11-29 20:10:17 +00:00
|
|
|
protected:
|
2006-11-16 00:38:25 +00:00
|
|
|
// Write out the data.
|
|
|
|
void
|
|
|
|
do_write(Output_file*);
|
|
|
|
|
2006-12-01 16:51:25 +00:00
|
|
|
// Set the entry size and the link.
|
|
|
|
void
|
2010-08-25 08:36:54 +00:00
|
|
|
do_adjust_output_section(Output_section* os);
|
2006-12-01 16:51:25 +00:00
|
|
|
|
2008-05-21 21:37:44 +00:00
|
|
|
// Write to a map file.
|
|
|
|
void
|
|
|
|
do_print_to_mapfile(Mapfile* mapfile) const
|
|
|
|
{
|
|
|
|
mapfile->print_output_data(this,
|
|
|
|
(dynamic
|
|
|
|
? _("** dynamic relocs")
|
|
|
|
: _("** relocs")));
|
|
|
|
}
|
|
|
|
|
2006-11-16 00:38:25 +00:00
|
|
|
// Add a relocation entry.
|
|
|
|
void
|
2010-08-25 08:36:54 +00:00
|
|
|
add(Output_data* od, const Output_reloc_type& reloc)
|
2006-11-16 00:38:25 +00:00
|
|
|
{
|
|
|
|
this->relocs_.push_back(reloc);
|
2007-11-29 20:10:17 +00:00
|
|
|
this->set_current_data_size(this->relocs_.size() * reloc_size);
|
2007-11-15 23:46:46 +00:00
|
|
|
od->add_dynamic_reloc();
|
2010-01-07 21:09:31 +00:00
|
|
|
if (reloc.is_relative())
|
|
|
|
this->bump_relative_reloc_count();
|
2011-05-24 21:41:10 +00:00
|
|
|
Sized_relobj<size, big_endian>* relobj = reloc.get_relobj();
|
|
|
|
if (relobj != NULL)
|
|
|
|
relobj->add_dyn_reloc(this->relocs_.size() - 1);
|
2006-11-16 00:38:25 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
private:
|
|
|
|
typedef std::vector<Output_reloc_type> Relocs;
|
|
|
|
|
2008-05-06 05:03:15 +00:00
|
|
|
// The class used to sort the relocations.
|
|
|
|
struct Sort_relocs_comparison
|
|
|
|
{
|
|
|
|
bool
|
|
|
|
operator()(const Output_reloc_type& r1, const Output_reloc_type& r2) const
|
|
|
|
{ return r1.sort_before(r2); }
|
|
|
|
};
|
|
|
|
|
|
|
|
// The relocations in this section.
|
2006-11-16 00:38:25 +00:00
|
|
|
Relocs relocs_;
|
|
|
|
};
|
|
|
|
|
|
|
|
// The class which callers actually create.
|
|
|
|
|
|
|
|
template<int sh_type, bool dynamic, int size, bool big_endian>
|
|
|
|
class Output_data_reloc;
|
|
|
|
|
|
|
|
// The SHT_REL version of Output_data_reloc.
|
|
|
|
|
|
|
|
template<bool dynamic, int size, bool big_endian>
|
|
|
|
class Output_data_reloc<elfcpp::SHT_REL, dynamic, size, big_endian>
|
|
|
|
: public Output_data_reloc_base<elfcpp::SHT_REL, dynamic, size, big_endian>
|
|
|
|
{
|
2008-02-12 00:28:48 +00:00
|
|
|
private:
|
2006-11-16 00:38:25 +00:00
|
|
|
typedef Output_data_reloc_base<elfcpp::SHT_REL, dynamic, size,
|
|
|
|
big_endian> Base;
|
|
|
|
|
|
|
|
public:
|
|
|
|
typedef typename Base::Output_reloc_type Output_reloc_type;
|
|
|
|
typedef typename Output_reloc_type::Address Address;
|
|
|
|
|
2008-05-06 05:03:15 +00:00
|
|
|
Output_data_reloc(bool sr)
|
|
|
|
: Output_data_reloc_base<elfcpp::SHT_REL, dynamic, size, big_endian>(sr)
|
2006-11-16 00:38:25 +00:00
|
|
|
{ }
|
|
|
|
|
|
|
|
// Add a reloc against a global symbol.
|
2006-11-30 23:52:50 +00:00
|
|
|
|
2006-11-16 00:38:25 +00:00
|
|
|
void
|
2009-12-14 19:53:05 +00:00
|
|
|
add_global(Symbol* gsym, unsigned int type, Output_data* od, Address address)
|
2010-02-13 00:01:20 +00:00
|
|
|
{ this->add(od, Output_reloc_type(gsym, type, od, address, false, false)); }
|
2006-11-16 00:38:25 +00:00
|
|
|
|
2006-11-30 23:52:50 +00:00
|
|
|
void
|
2008-07-10 23:01:20 +00:00
|
|
|
add_global(Symbol* gsym, unsigned int type, Output_data* od,
|
|
|
|
Sized_relobj<size, big_endian>* relobj,
|
2009-12-14 19:53:05 +00:00
|
|
|
unsigned int shndx, Address address)
|
|
|
|
{ this->add(od, Output_reloc_type(gsym, type, relobj, shndx, address,
|
2010-02-13 00:01:20 +00:00
|
|
|
false, false)); }
|
2007-12-07 19:32:59 +00:00
|
|
|
|
2008-04-16 22:54:29 +00:00
|
|
|
// These are to simplify the Copy_relocs class.
|
|
|
|
|
|
|
|
void
|
2009-12-14 19:53:05 +00:00
|
|
|
add_global(Symbol* gsym, unsigned int type, Output_data* od, Address address,
|
2008-04-16 22:54:29 +00:00
|
|
|
Address addend)
|
|
|
|
{
|
|
|
|
gold_assert(addend == 0);
|
2009-12-14 19:53:05 +00:00
|
|
|
this->add_global(gsym, type, od, address);
|
2008-04-16 22:54:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2008-07-10 23:01:20 +00:00
|
|
|
add_global(Symbol* gsym, unsigned int type, Output_data* od,
|
|
|
|
Sized_relobj<size, big_endian>* relobj,
|
2009-12-14 19:53:05 +00:00
|
|
|
unsigned int shndx, Address address, Address addend)
|
2008-04-16 22:54:29 +00:00
|
|
|
{
|
|
|
|
gold_assert(addend == 0);
|
2009-12-14 19:53:05 +00:00
|
|
|
this->add_global(gsym, type, od, relobj, shndx, address);
|
2008-04-16 22:54:29 +00:00
|
|
|
}
|
|
|
|
|
2007-12-07 19:32:59 +00:00
|
|
|
// Add a RELATIVE reloc against a global symbol. The final relocation
|
|
|
|
// will not reference the symbol.
|
|
|
|
|
|
|
|
void
|
|
|
|
add_global_relative(Symbol* gsym, unsigned int type, Output_data* od,
|
2009-12-14 19:53:05 +00:00
|
|
|
Address address)
|
2010-02-13 00:01:20 +00:00
|
|
|
{ this->add(od, Output_reloc_type(gsym, type, od, address, true, true)); }
|
2007-12-07 19:32:59 +00:00
|
|
|
|
|
|
|
void
|
|
|
|
add_global_relative(Symbol* gsym, unsigned int type, Output_data* od,
|
2008-07-10 23:01:20 +00:00
|
|
|
Sized_relobj<size, big_endian>* relobj,
|
2009-12-14 19:53:05 +00:00
|
|
|
unsigned int shndx, Address address)
|
2008-02-12 00:28:48 +00:00
|
|
|
{
|
2009-12-14 19:53:05 +00:00
|
|
|
this->add(od, Output_reloc_type(gsym, type, relobj, shndx, address,
|
2010-02-13 00:01:20 +00:00
|
|
|
true, true));
|
|
|
|
}
|
|
|
|
|
|
|
|
// Add a global relocation which does not use a symbol for the relocation,
|
|
|
|
// but which gets its addend from a symbol.
|
|
|
|
|
|
|
|
void
|
|
|
|
add_symbolless_global_addend(Symbol* gsym, unsigned int type,
|
|
|
|
Output_data* od, Address address)
|
|
|
|
{ this->add(od, Output_reloc_type(gsym, type, od, address, false, true)); }
|
|
|
|
|
|
|
|
void
|
|
|
|
add_symbolless_global_addend(Symbol* gsym, unsigned int type,
|
|
|
|
Output_data* od,
|
|
|
|
Sized_relobj<size, big_endian>* relobj,
|
|
|
|
unsigned int shndx, Address address)
|
|
|
|
{
|
|
|
|
this->add(od, Output_reloc_type(gsym, type, relobj, shndx, address,
|
|
|
|
false, true));
|
2008-02-12 00:28:48 +00:00
|
|
|
}
|
2006-11-30 23:52:50 +00:00
|
|
|
|
2006-11-16 00:38:25 +00:00
|
|
|
// Add a reloc against a local symbol.
|
2006-11-30 23:52:50 +00:00
|
|
|
|
2006-11-16 00:38:25 +00:00
|
|
|
void
|
2006-11-30 23:52:50 +00:00
|
|
|
add_local(Sized_relobj<size, big_endian>* relobj,
|
2006-11-29 17:56:40 +00:00
|
|
|
unsigned int local_sym_index, unsigned int type,
|
2009-12-14 19:53:05 +00:00
|
|
|
Output_data* od, Address address)
|
2008-02-12 00:28:48 +00:00
|
|
|
{
|
|
|
|
this->add(od, Output_reloc_type(relobj, local_sym_index, type, od,
|
2010-02-13 00:01:20 +00:00
|
|
|
address, false, false, false));
|
2008-02-12 00:28:48 +00:00
|
|
|
}
|
2006-11-30 23:52:50 +00:00
|
|
|
|
|
|
|
void
|
|
|
|
add_local(Sized_relobj<size, big_endian>* relobj,
|
|
|
|
unsigned int local_sym_index, unsigned int type,
|
2009-12-14 19:53:05 +00:00
|
|
|
Output_data* od, unsigned int shndx, Address address)
|
2008-02-12 00:28:48 +00:00
|
|
|
{
|
|
|
|
this->add(od, Output_reloc_type(relobj, local_sym_index, type, shndx,
|
2010-02-13 00:01:20 +00:00
|
|
|
address, false, false, false));
|
2008-02-12 00:28:48 +00:00
|
|
|
}
|
2007-12-07 19:32:59 +00:00
|
|
|
|
|
|
|
// Add a RELATIVE reloc against a local symbol.
|
2006-11-30 23:52:50 +00:00
|
|
|
|
2007-12-07 19:32:59 +00:00
|
|
|
void
|
|
|
|
add_local_relative(Sized_relobj<size, big_endian>* relobj,
|
|
|
|
unsigned int local_sym_index, unsigned int type,
|
2009-12-14 19:53:05 +00:00
|
|
|
Output_data* od, Address address)
|
2008-02-12 00:28:48 +00:00
|
|
|
{
|
|
|
|
this->add(od, Output_reloc_type(relobj, local_sym_index, type, od,
|
2010-02-13 00:01:20 +00:00
|
|
|
address, true, true, false));
|
2008-02-12 00:28:48 +00:00
|
|
|
}
|
2007-12-07 19:32:59 +00:00
|
|
|
|
|
|
|
void
|
|
|
|
add_local_relative(Sized_relobj<size, big_endian>* relobj,
|
|
|
|
unsigned int local_sym_index, unsigned int type,
|
2009-12-14 19:53:05 +00:00
|
|
|
Output_data* od, unsigned int shndx, Address address)
|
2008-02-12 00:28:48 +00:00
|
|
|
{
|
|
|
|
this->add(od, Output_reloc_type(relobj, local_sym_index, type, shndx,
|
2010-02-13 00:01:20 +00:00
|
|
|
address, true, true, false));
|
|
|
|
}
|
|
|
|
|
|
|
|
// Add a local relocation which does not use a symbol for the relocation,
|
|
|
|
// but which gets its addend from a symbol.
|
|
|
|
|
|
|
|
void
|
|
|
|
add_symbolless_local_addend(Sized_relobj<size, big_endian>* relobj,
|
|
|
|
unsigned int local_sym_index, unsigned int type,
|
|
|
|
Output_data* od, Address address)
|
|
|
|
{
|
|
|
|
this->add(od, Output_reloc_type(relobj, local_sym_index, type, od,
|
|
|
|
address, false, true, false));
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
add_symbolless_local_addend(Sized_relobj<size, big_endian>* relobj,
|
|
|
|
unsigned int local_sym_index, unsigned int type,
|
|
|
|
Output_data* od, unsigned int shndx,
|
|
|
|
Address address)
|
|
|
|
{
|
|
|
|
this->add(od, Output_reloc_type(relobj, local_sym_index, type, shndx,
|
|
|
|
address, false, true, false));
|
2008-02-12 00:28:48 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Add a reloc against a local section symbol. This will be
|
|
|
|
// converted into a reloc against the STT_SECTION symbol of the
|
|
|
|
// output section.
|
|
|
|
|
|
|
|
void
|
|
|
|
add_local_section(Sized_relobj<size, big_endian>* relobj,
|
|
|
|
unsigned int input_shndx, unsigned int type,
|
2009-12-14 19:53:05 +00:00
|
|
|
Output_data* od, Address address)
|
2008-02-12 00:28:48 +00:00
|
|
|
{
|
|
|
|
this->add(od, Output_reloc_type(relobj, input_shndx, type, od,
|
2010-02-13 00:01:20 +00:00
|
|
|
address, false, false, true));
|
2008-02-12 00:28:48 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
add_local_section(Sized_relobj<size, big_endian>* relobj,
|
|
|
|
unsigned int input_shndx, unsigned int type,
|
2009-12-14 19:53:05 +00:00
|
|
|
Output_data* od, unsigned int shndx, Address address)
|
2008-02-12 00:28:48 +00:00
|
|
|
{
|
|
|
|
this->add(od, Output_reloc_type(relobj, input_shndx, type, shndx,
|
2010-02-13 00:01:20 +00:00
|
|
|
address, false, false, true));
|
2008-02-12 00:28:48 +00:00
|
|
|
}
|
2006-11-16 00:38:25 +00:00
|
|
|
|
|
|
|
// A reloc against the STT_SECTION symbol of an output section.
|
2007-11-15 23:46:46 +00:00
|
|
|
// OS is the Output_section that the relocation refers to; OD is
|
|
|
|
// the Output_data object being relocated.
|
2006-11-30 23:52:50 +00:00
|
|
|
|
2006-11-16 00:38:25 +00:00
|
|
|
void
|
2006-11-29 17:56:40 +00:00
|
|
|
add_output_section(Output_section* os, unsigned int type,
|
2009-12-14 19:53:05 +00:00
|
|
|
Output_data* od, Address address)
|
|
|
|
{ this->add(od, Output_reloc_type(os, type, od, address)); }
|
2006-11-30 23:52:50 +00:00
|
|
|
|
|
|
|
void
|
2007-11-15 23:46:46 +00:00
|
|
|
add_output_section(Output_section* os, unsigned int type, Output_data* od,
|
2008-07-10 23:01:20 +00:00
|
|
|
Sized_relobj<size, big_endian>* relobj,
|
2009-12-14 19:53:05 +00:00
|
|
|
unsigned int shndx, Address address)
|
|
|
|
{ this->add(od, Output_reloc_type(os, type, relobj, shndx, address)); }
|
2010-01-08 19:33:18 +00:00
|
|
|
|
|
|
|
// Add an absolute relocation.
|
|
|
|
|
|
|
|
void
|
|
|
|
add_absolute(unsigned int type, Output_data* od, Address address)
|
|
|
|
{ this->add(od, Output_reloc_type(type, od, address)); }
|
|
|
|
|
|
|
|
void
|
|
|
|
add_absolute(unsigned int type, Output_data* od,
|
|
|
|
Sized_relobj<size, big_endian>* relobj,
|
|
|
|
unsigned int shndx, Address address)
|
|
|
|
{ this->add(od, Output_reloc_type(type, relobj, shndx, address)); }
|
|
|
|
|
|
|
|
// Add a target specific relocation. A target which calls this must
|
|
|
|
// define the reloc_symbol_index and reloc_addend virtual functions.
|
|
|
|
|
|
|
|
void
|
|
|
|
add_target_specific(unsigned int type, void* arg, Output_data* od,
|
|
|
|
Address address)
|
|
|
|
{ this->add(od, Output_reloc_type(type, arg, od, address)); }
|
|
|
|
|
|
|
|
void
|
|
|
|
add_target_specific(unsigned int type, void* arg, Output_data* od,
|
|
|
|
Sized_relobj<size, big_endian>* relobj,
|
|
|
|
unsigned int shndx, Address address)
|
|
|
|
{ this->add(od, Output_reloc_type(type, arg, relobj, shndx, address)); }
|
2006-11-16 00:38:25 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
// The SHT_RELA version of Output_data_reloc.
|
|
|
|
|
|
|
|
template<bool dynamic, int size, bool big_endian>
|
|
|
|
class Output_data_reloc<elfcpp::SHT_RELA, dynamic, size, big_endian>
|
|
|
|
: public Output_data_reloc_base<elfcpp::SHT_RELA, dynamic, size, big_endian>
|
|
|
|
{
|
2008-02-12 00:28:48 +00:00
|
|
|
private:
|
2006-11-16 00:38:25 +00:00
|
|
|
typedef Output_data_reloc_base<elfcpp::SHT_RELA, dynamic, size,
|
|
|
|
big_endian> Base;
|
|
|
|
|
|
|
|
public:
|
|
|
|
typedef typename Base::Output_reloc_type Output_reloc_type;
|
|
|
|
typedef typename Output_reloc_type::Address Address;
|
|
|
|
typedef typename Output_reloc_type::Addend Addend;
|
|
|
|
|
2008-05-06 05:03:15 +00:00
|
|
|
Output_data_reloc(bool sr)
|
|
|
|
: Output_data_reloc_base<elfcpp::SHT_RELA, dynamic, size, big_endian>(sr)
|
2006-11-16 00:38:25 +00:00
|
|
|
{ }
|
|
|
|
|
|
|
|
// Add a reloc against a global symbol.
|
2006-11-30 23:52:50 +00:00
|
|
|
|
2006-11-16 00:38:25 +00:00
|
|
|
void
|
2006-11-29 17:56:40 +00:00
|
|
|
add_global(Symbol* gsym, unsigned int type, Output_data* od,
|
2009-12-14 19:53:05 +00:00
|
|
|
Address address, Addend addend)
|
|
|
|
{ this->add(od, Output_reloc_type(gsym, type, od, address, addend,
|
2010-02-13 00:01:20 +00:00
|
|
|
false, false)); }
|
2006-11-16 00:38:25 +00:00
|
|
|
|
2006-11-30 23:52:50 +00:00
|
|
|
void
|
2008-07-10 23:01:20 +00:00
|
|
|
add_global(Symbol* gsym, unsigned int type, Output_data* od,
|
|
|
|
Sized_relobj<size, big_endian>* relobj,
|
2009-12-14 19:53:05 +00:00
|
|
|
unsigned int shndx, Address address,
|
2007-11-15 23:46:46 +00:00
|
|
|
Addend addend)
|
2009-12-14 19:53:05 +00:00
|
|
|
{ this->add(od, Output_reloc_type(gsym, type, relobj, shndx, address,
|
2010-02-13 00:01:20 +00:00
|
|
|
addend, false, false)); }
|
2007-12-07 19:32:59 +00:00
|
|
|
|
|
|
|
// Add a RELATIVE reloc against a global symbol. The final output
|
|
|
|
// relocation will not reference the symbol, but we must keep the symbol
|
|
|
|
// information long enough to set the addend of the relocation correctly
|
|
|
|
// when it is written.
|
|
|
|
|
|
|
|
void
|
|
|
|
add_global_relative(Symbol* gsym, unsigned int type, Output_data* od,
|
2009-12-14 19:53:05 +00:00
|
|
|
Address address, Addend addend)
|
2010-02-13 00:01:20 +00:00
|
|
|
{ this->add(od, Output_reloc_type(gsym, type, od, address, addend, true,
|
|
|
|
true)); }
|
2007-12-07 19:32:59 +00:00
|
|
|
|
|
|
|
void
|
|
|
|
add_global_relative(Symbol* gsym, unsigned int type, Output_data* od,
|
2008-07-10 23:01:20 +00:00
|
|
|
Sized_relobj<size, big_endian>* relobj,
|
2009-12-14 19:53:05 +00:00
|
|
|
unsigned int shndx, Address address, Addend addend)
|
|
|
|
{ this->add(od, Output_reloc_type(gsym, type, relobj, shndx, address,
|
2010-02-13 00:01:20 +00:00
|
|
|
addend, true, true)); }
|
|
|
|
|
|
|
|
// Add a global relocation which does not use a symbol for the relocation,
|
|
|
|
// but which gets its addend from a symbol.
|
|
|
|
|
|
|
|
void
|
|
|
|
add_symbolless_global_addend(Symbol* gsym, unsigned int type, Output_data* od,
|
|
|
|
Address address, Addend addend)
|
|
|
|
{ this->add(od, Output_reloc_type(gsym, type, od, address, addend,
|
|
|
|
false, true)); }
|
|
|
|
|
|
|
|
void
|
|
|
|
add_symbolless_global_addend(Symbol* gsym, unsigned int type,
|
|
|
|
Output_data* od,
|
|
|
|
Sized_relobj<size, big_endian>* relobj,
|
|
|
|
unsigned int shndx, Address address, Addend addend)
|
|
|
|
{ this->add(od, Output_reloc_type(gsym, type, relobj, shndx, address,
|
|
|
|
addend, false, true)); }
|
2006-11-30 23:52:50 +00:00
|
|
|
|
2006-11-16 00:38:25 +00:00
|
|
|
// Add a reloc against a local symbol.
|
2006-11-30 23:52:50 +00:00
|
|
|
|
2006-11-16 00:38:25 +00:00
|
|
|
void
|
2006-11-30 23:52:50 +00:00
|
|
|
add_local(Sized_relobj<size, big_endian>* relobj,
|
2006-11-16 00:38:25 +00:00
|
|
|
unsigned int local_sym_index, unsigned int type,
|
2009-12-14 19:53:05 +00:00
|
|
|
Output_data* od, Address address, Addend addend)
|
2006-11-16 00:38:25 +00:00
|
|
|
{
|
2009-12-14 19:53:05 +00:00
|
|
|
this->add(od, Output_reloc_type(relobj, local_sym_index, type, od, address,
|
2010-02-13 00:01:20 +00:00
|
|
|
addend, false, false, false));
|
2006-11-30 23:52:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
add_local(Sized_relobj<size, big_endian>* relobj,
|
|
|
|
unsigned int local_sym_index, unsigned int type,
|
2009-12-14 19:53:05 +00:00
|
|
|
Output_data* od, unsigned int shndx, Address address,
|
2007-11-15 23:46:46 +00:00
|
|
|
Addend addend)
|
2006-11-30 23:52:50 +00:00
|
|
|
{
|
2007-11-15 23:46:46 +00:00
|
|
|
this->add(od, Output_reloc_type(relobj, local_sym_index, type, shndx,
|
2010-02-13 00:01:20 +00:00
|
|
|
address, addend, false, false, false));
|
2007-12-07 19:32:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Add a RELATIVE reloc against a local symbol.
|
|
|
|
|
|
|
|
void
|
|
|
|
add_local_relative(Sized_relobj<size, big_endian>* relobj,
|
|
|
|
unsigned int local_sym_index, unsigned int type,
|
2009-12-14 19:53:05 +00:00
|
|
|
Output_data* od, Address address, Addend addend)
|
2007-12-07 19:32:59 +00:00
|
|
|
{
|
2009-12-14 19:53:05 +00:00
|
|
|
this->add(od, Output_reloc_type(relobj, local_sym_index, type, od, address,
|
2010-02-13 00:01:20 +00:00
|
|
|
addend, true, true, false));
|
2007-12-07 19:32:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
add_local_relative(Sized_relobj<size, big_endian>* relobj,
|
|
|
|
unsigned int local_sym_index, unsigned int type,
|
2009-12-14 19:53:05 +00:00
|
|
|
Output_data* od, unsigned int shndx, Address address,
|
2007-12-07 19:32:59 +00:00
|
|
|
Addend addend)
|
|
|
|
{
|
|
|
|
this->add(od, Output_reloc_type(relobj, local_sym_index, type, shndx,
|
2010-02-13 00:01:20 +00:00
|
|
|
address, addend, true, true, false));
|
|
|
|
}
|
|
|
|
|
|
|
|
// Add a local relocation which does not use a symbol for the relocation,
|
|
|
|
// but which gets it's addend from a symbol.
|
|
|
|
|
|
|
|
void
|
|
|
|
add_symbolless_local_addend(Sized_relobj<size, big_endian>* relobj,
|
|
|
|
unsigned int local_sym_index, unsigned int type,
|
|
|
|
Output_data* od, Address address, Addend addend)
|
|
|
|
{
|
|
|
|
this->add(od, Output_reloc_type(relobj, local_sym_index, type, od, address,
|
|
|
|
addend, false, true, false));
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
add_symbolless_local_addend(Sized_relobj<size, big_endian>* relobj,
|
|
|
|
unsigned int local_sym_index, unsigned int type,
|
|
|
|
Output_data* od, unsigned int shndx,
|
|
|
|
Address address, Addend addend)
|
|
|
|
{
|
|
|
|
this->add(od, Output_reloc_type(relobj, local_sym_index, type, shndx,
|
|
|
|
address, addend, false, true, false));
|
2008-02-12 00:28:48 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Add a reloc against a local section symbol. This will be
|
|
|
|
// converted into a reloc against the STT_SECTION symbol of the
|
|
|
|
// output section.
|
|
|
|
|
|
|
|
void
|
|
|
|
add_local_section(Sized_relobj<size, big_endian>* relobj,
|
|
|
|
unsigned int input_shndx, unsigned int type,
|
2009-12-14 19:53:05 +00:00
|
|
|
Output_data* od, Address address, Addend addend)
|
2008-02-12 00:28:48 +00:00
|
|
|
{
|
2009-12-14 19:53:05 +00:00
|
|
|
this->add(od, Output_reloc_type(relobj, input_shndx, type, od, address,
|
2010-02-13 00:01:20 +00:00
|
|
|
addend, false, false, true));
|
2008-02-12 00:28:48 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
add_local_section(Sized_relobj<size, big_endian>* relobj,
|
2011-05-24 21:41:10 +00:00
|
|
|
unsigned int input_shndx, unsigned int type,
|
|
|
|
Output_data* od, unsigned int shndx, Address address,
|
|
|
|
Addend addend)
|
2008-02-12 00:28:48 +00:00
|
|
|
{
|
|
|
|
this->add(od, Output_reloc_type(relobj, input_shndx, type, shndx,
|
2010-02-13 00:01:20 +00:00
|
|
|
address, addend, false, false, true));
|
2006-11-16 00:38:25 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// A reloc against the STT_SECTION symbol of an output section.
|
2006-11-30 23:52:50 +00:00
|
|
|
|
2006-11-16 00:38:25 +00:00
|
|
|
void
|
2006-11-29 17:56:40 +00:00
|
|
|
add_output_section(Output_section* os, unsigned int type, Output_data* od,
|
2009-12-14 19:53:05 +00:00
|
|
|
Address address, Addend addend)
|
2010-12-23 19:56:14 +00:00
|
|
|
{ this->add(od, Output_reloc_type(os, type, od, address, addend)); }
|
2006-11-30 23:52:50 +00:00
|
|
|
|
|
|
|
void
|
2010-12-23 19:56:14 +00:00
|
|
|
add_output_section(Output_section* os, unsigned int type, Output_data* od,
|
2008-07-10 23:01:20 +00:00
|
|
|
Sized_relobj<size, big_endian>* relobj,
|
2009-12-14 19:53:05 +00:00
|
|
|
unsigned int shndx, Address address, Addend addend)
|
2010-12-23 19:56:14 +00:00
|
|
|
{ this->add(od, Output_reloc_type(os, type, relobj, shndx, address,
|
2007-11-15 23:46:46 +00:00
|
|
|
addend)); }
|
2010-01-08 19:33:18 +00:00
|
|
|
|
|
|
|
// Add an absolute relocation.
|
|
|
|
|
|
|
|
void
|
|
|
|
add_absolute(unsigned int type, Output_data* od, Address address,
|
|
|
|
Addend addend)
|
|
|
|
{ this->add(od, Output_reloc_type(type, od, address, addend)); }
|
|
|
|
|
|
|
|
void
|
|
|
|
add_absolute(unsigned int type, Output_data* od,
|
|
|
|
Sized_relobj<size, big_endian>* relobj,
|
|
|
|
unsigned int shndx, Address address, Addend addend)
|
|
|
|
{ this->add(od, Output_reloc_type(type, relobj, shndx, address, addend)); }
|
|
|
|
|
|
|
|
// Add a target specific relocation. A target which calls this must
|
|
|
|
// define the reloc_symbol_index and reloc_addend virtual functions.
|
|
|
|
|
|
|
|
void
|
|
|
|
add_target_specific(unsigned int type, void* arg, Output_data* od,
|
|
|
|
Address address, Addend addend)
|
|
|
|
{ this->add(od, Output_reloc_type(type, arg, od, address, addend)); }
|
|
|
|
|
|
|
|
void
|
|
|
|
add_target_specific(unsigned int type, void* arg, Output_data* od,
|
|
|
|
Sized_relobj<size, big_endian>* relobj,
|
|
|
|
unsigned int shndx, Address address, Addend addend)
|
|
|
|
{
|
|
|
|
this->add(od, Output_reloc_type(type, arg, relobj, shndx, address,
|
|
|
|
addend));
|
|
|
|
}
|
2006-11-16 00:38:25 +00:00
|
|
|
};
|
|
|
|
|
2008-02-06 08:13:50 +00:00
|
|
|
// Output_relocatable_relocs represents a relocation section in a
|
|
|
|
// relocatable link. The actual data is written out in the target
|
|
|
|
// hook relocate_for_relocatable. This just saves space for it.
|
|
|
|
|
|
|
|
template<int sh_type, int size, bool big_endian>
|
|
|
|
class Output_relocatable_relocs : public Output_section_data
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
Output_relocatable_relocs(Relocatable_relocs* rr)
|
|
|
|
: Output_section_data(Output_data::default_alignment_for_size(size)),
|
|
|
|
rr_(rr)
|
|
|
|
{ }
|
|
|
|
|
|
|
|
void
|
|
|
|
set_final_data_size();
|
|
|
|
|
|
|
|
// Write out the data. There is nothing to do here.
|
|
|
|
void
|
|
|
|
do_write(Output_file*)
|
|
|
|
{ }
|
|
|
|
|
2008-05-21 21:37:44 +00:00
|
|
|
// Write to a map file.
|
|
|
|
void
|
|
|
|
do_print_to_mapfile(Mapfile* mapfile) const
|
|
|
|
{ mapfile->print_output_data(this, _("** relocs")); }
|
|
|
|
|
2008-02-06 08:13:50 +00:00
|
|
|
private:
|
|
|
|
// The relocs associated with this input section.
|
|
|
|
Relocatable_relocs* rr_;
|
|
|
|
};
|
|
|
|
|
|
|
|
// Handle a GROUP section.
|
|
|
|
|
|
|
|
template<int size, bool big_endian>
|
|
|
|
class Output_data_group : public Output_section_data
|
|
|
|
{
|
|
|
|
public:
|
2008-05-05 19:16:43 +00:00
|
|
|
// The constructor clears *INPUT_SHNDXES.
|
2011-05-24 21:41:10 +00:00
|
|
|
Output_data_group(Sized_relobj_file<size, big_endian>* relobj,
|
2008-02-06 08:13:50 +00:00
|
|
|
section_size_type entry_count,
|
2008-05-05 19:16:43 +00:00
|
|
|
elfcpp::Elf_Word flags,
|
|
|
|
std::vector<unsigned int>* input_shndxes);
|
2008-02-06 08:13:50 +00:00
|
|
|
|
|
|
|
void
|
|
|
|
do_write(Output_file*);
|
|
|
|
|
2008-05-21 21:37:44 +00:00
|
|
|
// Write to a map file.
|
|
|
|
void
|
|
|
|
do_print_to_mapfile(Mapfile* mapfile) const
|
|
|
|
{ mapfile->print_output_data(this, _("** group")); }
|
|
|
|
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 01:10:38 +00:00
|
|
|
// Set final data size.
|
|
|
|
void
|
|
|
|
set_final_data_size()
|
|
|
|
{ this->set_data_size((this->input_shndxes_.size() + 1) * 4); }
|
|
|
|
|
2008-02-06 08:13:50 +00:00
|
|
|
private:
|
|
|
|
// The input object.
|
2011-05-24 21:41:10 +00:00
|
|
|
Sized_relobj_file<size, big_endian>* relobj_;
|
2008-02-06 08:13:50 +00:00
|
|
|
// The group flag word.
|
|
|
|
elfcpp::Elf_Word flags_;
|
|
|
|
// The section indexes of the input sections in this group.
|
2008-05-05 19:16:43 +00:00
|
|
|
std::vector<unsigned int> input_shndxes_;
|
2008-02-06 08:13:50 +00:00
|
|
|
};
|
|
|
|
|
2006-11-14 19:21:05 +00:00
|
|
|
// Output_data_got is used to manage a GOT. Each entry in the GOT is
|
|
|
|
// for one symbol--either a global symbol or a local symbol in an
|
2006-11-03 18:26:11 +00:00
|
|
|
// object. The target specific code adds entries to the GOT as
|
2006-11-14 19:21:05 +00:00
|
|
|
// needed.
|
2006-11-03 18:26:11 +00:00
|
|
|
|
|
|
|
template<int size, bool big_endian>
|
2007-11-29 20:10:17 +00:00
|
|
|
class Output_data_got : public Output_section_data_build
|
2006-11-03 18:26:11 +00:00
|
|
|
{
|
|
|
|
public:
|
|
|
|
typedef typename elfcpp::Elf_types<size>::Elf_Addr Valtype;
|
2007-12-06 05:55:50 +00:00
|
|
|
typedef Output_data_reloc<elfcpp::SHT_REL, true, size, big_endian> Rel_dyn;
|
|
|
|
typedef Output_data_reloc<elfcpp::SHT_RELA, true, size, big_endian> Rela_dyn;
|
2006-11-03 18:26:11 +00:00
|
|
|
|
2007-09-21 07:20:01 +00:00
|
|
|
Output_data_got()
|
2007-11-29 20:10:17 +00:00
|
|
|
: Output_section_data_build(Output_data::default_alignment_for_size(size)),
|
2011-05-23 23:27:11 +00:00
|
|
|
entries_(), free_list_()
|
2006-11-03 18:26:11 +00:00
|
|
|
{ }
|
|
|
|
|
2011-05-23 23:27:11 +00:00
|
|
|
Output_data_got(off_t data_size)
|
|
|
|
: Output_section_data_build(data_size,
|
|
|
|
Output_data::default_alignment_for_size(size)),
|
|
|
|
entries_(), free_list_()
|
|
|
|
{
|
|
|
|
// For an incremental update, we have an existing GOT section.
|
|
|
|
// Initialize the list of entries and the free list.
|
|
|
|
this->entries_.resize(data_size / (size / 8));
|
|
|
|
this->free_list_.init(data_size, false);
|
|
|
|
}
|
|
|
|
|
2006-11-14 19:21:05 +00:00
|
|
|
// Add an entry for a global symbol to the GOT. Return true if this
|
|
|
|
// is a new GOT entry, false if the symbol was already in the GOT.
|
|
|
|
bool
|
2008-03-25 18:37:16 +00:00
|
|
|
add_global(Symbol* gsym, unsigned int got_type);
|
2006-11-03 18:26:11 +00:00
|
|
|
|
2010-08-19 22:50:16 +00:00
|
|
|
// Like add_global, but use the PLT offset of the global symbol if
|
|
|
|
// it has one.
|
|
|
|
bool
|
|
|
|
add_global_plt(Symbol* gsym, unsigned int got_type);
|
|
|
|
|
2007-12-06 05:55:50 +00:00
|
|
|
// Add an entry for a global symbol to the GOT, and add a dynamic
|
|
|
|
// relocation of type R_TYPE for the GOT entry.
|
|
|
|
void
|
2008-03-25 18:37:16 +00:00
|
|
|
add_global_with_rel(Symbol* gsym, unsigned int got_type,
|
|
|
|
Rel_dyn* rel_dyn, unsigned int r_type);
|
2007-12-06 05:55:50 +00:00
|
|
|
|
|
|
|
void
|
2008-03-25 18:37:16 +00:00
|
|
|
add_global_with_rela(Symbol* gsym, unsigned int got_type,
|
|
|
|
Rela_dyn* rela_dyn, unsigned int r_type);
|
|
|
|
|
|
|
|
// Add a pair of entries for a global symbol to the GOT, and add
|
|
|
|
// dynamic relocations of type R_TYPE_1 and R_TYPE_2, respectively.
|
|
|
|
void
|
|
|
|
add_global_pair_with_rel(Symbol* gsym, unsigned int got_type,
|
|
|
|
Rel_dyn* rel_dyn, unsigned int r_type_1,
|
|
|
|
unsigned int r_type_2);
|
|
|
|
|
|
|
|
void
|
|
|
|
add_global_pair_with_rela(Symbol* gsym, unsigned int got_type,
|
|
|
|
Rela_dyn* rela_dyn, unsigned int r_type_1,
|
|
|
|
unsigned int r_type_2);
|
2007-12-06 05:55:50 +00:00
|
|
|
|
2007-10-08 07:22:21 +00:00
|
|
|
// Add an entry for a local symbol to the GOT. This returns true if
|
|
|
|
// this is a new GOT entry, false if the symbol already has a GOT
|
|
|
|
// entry.
|
|
|
|
bool
|
2011-05-24 21:41:10 +00:00
|
|
|
add_local(Sized_relobj_file<size, big_endian>* object, unsigned int sym_index,
|
2008-03-25 18:37:16 +00:00
|
|
|
unsigned int got_type);
|
2006-11-03 18:26:11 +00:00
|
|
|
|
2010-08-19 22:50:16 +00:00
|
|
|
// Like add_local, but use the PLT offset of the local symbol if it
|
|
|
|
// has one.
|
|
|
|
bool
|
2011-05-24 21:41:10 +00:00
|
|
|
add_local_plt(Sized_relobj_file<size, big_endian>* object,
|
|
|
|
unsigned int sym_index,
|
2010-08-19 22:50:16 +00:00
|
|
|
unsigned int got_type);
|
|
|
|
|
2008-03-25 18:37:16 +00:00
|
|
|
// Add an entry for a local symbol to the GOT, and add a dynamic
|
2007-12-06 05:55:50 +00:00
|
|
|
// relocation of type R_TYPE for the GOT entry.
|
|
|
|
void
|
2011-05-24 21:41:10 +00:00
|
|
|
add_local_with_rel(Sized_relobj_file<size, big_endian>* object,
|
2008-03-25 18:37:16 +00:00
|
|
|
unsigned int sym_index, unsigned int got_type,
|
|
|
|
Rel_dyn* rel_dyn, unsigned int r_type);
|
2007-12-06 05:55:50 +00:00
|
|
|
|
|
|
|
void
|
2011-05-24 21:41:10 +00:00
|
|
|
add_local_with_rela(Sized_relobj_file<size, big_endian>* object,
|
2008-03-25 18:37:16 +00:00
|
|
|
unsigned int sym_index, unsigned int got_type,
|
|
|
|
Rela_dyn* rela_dyn, unsigned int r_type);
|
2007-11-14 22:31:02 +00:00
|
|
|
|
2008-03-25 18:37:16 +00:00
|
|
|
// Add a pair of entries for a local symbol to the GOT, and add
|
|
|
|
// dynamic relocations of type R_TYPE_1 and R_TYPE_2, respectively.
|
2007-12-06 05:55:50 +00:00
|
|
|
void
|
2011-05-24 21:41:10 +00:00
|
|
|
add_local_pair_with_rel(Sized_relobj_file<size, big_endian>* object,
|
2008-03-25 18:37:16 +00:00
|
|
|
unsigned int sym_index, unsigned int shndx,
|
|
|
|
unsigned int got_type, Rel_dyn* rel_dyn,
|
|
|
|
unsigned int r_type_1, unsigned int r_type_2);
|
2007-12-06 05:55:50 +00:00
|
|
|
|
|
|
|
void
|
2011-05-24 21:41:10 +00:00
|
|
|
add_local_pair_with_rela(Sized_relobj_file<size, big_endian>* object,
|
2008-03-25 18:37:16 +00:00
|
|
|
unsigned int sym_index, unsigned int shndx,
|
|
|
|
unsigned int got_type, Rela_dyn* rela_dyn,
|
|
|
|
unsigned int r_type_1, unsigned int r_type_2);
|
2007-12-06 05:55:50 +00:00
|
|
|
|
2006-11-03 18:26:11 +00:00
|
|
|
// Add a constant to the GOT. This returns the offset of the new
|
|
|
|
// entry from the start of the GOT.
|
|
|
|
unsigned int
|
|
|
|
add_constant(Valtype constant)
|
|
|
|
{
|
2011-05-23 23:27:11 +00:00
|
|
|
unsigned int got_offset = this->add_got_entry(Got_entry(constant));
|
|
|
|
return got_offset;
|
2006-11-03 18:26:11 +00:00
|
|
|
}
|
|
|
|
|
2011-05-24 21:41:10 +00:00
|
|
|
// Reserve a slot in the GOT.
|
|
|
|
void
|
|
|
|
reserve_slot(unsigned int i)
|
|
|
|
{ this->free_list_.remove(i * size / 8, (i + 1) * size / 8); }
|
|
|
|
|
|
|
|
// Reserve a slot in the GOT for a local symbol.
|
2011-05-23 23:27:11 +00:00
|
|
|
void
|
2011-05-24 21:41:10 +00:00
|
|
|
reserve_local(unsigned int i, Sized_relobj<size, big_endian>* object,
|
|
|
|
unsigned int sym_index, unsigned int got_type);
|
2011-05-23 23:27:11 +00:00
|
|
|
|
|
|
|
// Reserve a slot in the GOT for a global symbol.
|
|
|
|
void
|
2011-05-24 21:41:10 +00:00
|
|
|
reserve_global(unsigned int i, Symbol* gsym, unsigned int got_type);
|
2011-05-23 23:27:11 +00:00
|
|
|
|
2007-11-29 20:10:17 +00:00
|
|
|
protected:
|
2006-11-03 18:26:11 +00:00
|
|
|
// Write out the GOT table.
|
|
|
|
void
|
|
|
|
do_write(Output_file*);
|
|
|
|
|
2008-05-21 21:37:44 +00:00
|
|
|
// Write to a map file.
|
|
|
|
void
|
|
|
|
do_print_to_mapfile(Mapfile* mapfile) const
|
|
|
|
{ mapfile->print_output_data(this, _("** GOT")); }
|
|
|
|
|
2006-11-03 18:26:11 +00:00
|
|
|
private:
|
|
|
|
// This POD class holds a single GOT entry.
|
|
|
|
class Got_entry
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
// Create a zero entry.
|
|
|
|
Got_entry()
|
2011-05-23 23:27:11 +00:00
|
|
|
: local_sym_index_(RESERVED_CODE), use_plt_offset_(false)
|
2006-11-03 18:26:11 +00:00
|
|
|
{ this->u_.constant = 0; }
|
|
|
|
|
|
|
|
// Create a global symbol entry.
|
2010-08-19 22:50:16 +00:00
|
|
|
Got_entry(Symbol* gsym, bool use_plt_offset)
|
|
|
|
: local_sym_index_(GSYM_CODE), use_plt_offset_(use_plt_offset)
|
2006-11-03 18:26:11 +00:00
|
|
|
{ this->u_.gsym = gsym; }
|
|
|
|
|
|
|
|
// Create a local symbol entry.
|
2011-05-24 21:41:10 +00:00
|
|
|
Got_entry(Sized_relobj_file<size, big_endian>* object,
|
2010-08-19 22:50:16 +00:00
|
|
|
unsigned int local_sym_index, bool use_plt_offset)
|
|
|
|
: local_sym_index_(local_sym_index), use_plt_offset_(use_plt_offset)
|
2006-11-03 18:26:11 +00:00
|
|
|
{
|
2006-11-29 17:56:40 +00:00
|
|
|
gold_assert(local_sym_index != GSYM_CODE
|
2010-08-19 22:50:16 +00:00
|
|
|
&& local_sym_index != CONSTANT_CODE
|
2011-05-23 23:27:11 +00:00
|
|
|
&& local_sym_index != RESERVED_CODE
|
2010-08-19 22:50:16 +00:00
|
|
|
&& local_sym_index == this->local_sym_index_);
|
2006-11-03 18:26:11 +00:00
|
|
|
this->u_.object = object;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Create a constant entry. The constant is a host value--it will
|
|
|
|
// be swapped, if necessary, when it is written out.
|
2006-11-29 17:56:40 +00:00
|
|
|
explicit Got_entry(Valtype constant)
|
2010-08-19 22:50:16 +00:00
|
|
|
: local_sym_index_(CONSTANT_CODE), use_plt_offset_(false)
|
2006-11-03 18:26:11 +00:00
|
|
|
{ this->u_.constant = constant; }
|
|
|
|
|
|
|
|
// Write the GOT entry to an output view.
|
|
|
|
void
|
2007-09-21 07:20:01 +00:00
|
|
|
write(unsigned char* pov) const;
|
2006-11-03 18:26:11 +00:00
|
|
|
|
|
|
|
private:
|
|
|
|
enum
|
|
|
|
{
|
2010-08-19 22:50:16 +00:00
|
|
|
GSYM_CODE = 0x7fffffff,
|
2011-05-23 23:27:11 +00:00
|
|
|
CONSTANT_CODE = 0x7ffffffe,
|
|
|
|
RESERVED_CODE = 0x7ffffffd
|
2006-11-03 18:26:11 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
union
|
|
|
|
{
|
|
|
|
// For a local symbol, the object.
|
2011-05-24 21:41:10 +00:00
|
|
|
Sized_relobj_file<size, big_endian>* object;
|
2006-11-03 18:26:11 +00:00
|
|
|
// For a global symbol, the symbol.
|
|
|
|
Symbol* gsym;
|
|
|
|
// For a constant, the constant.
|
|
|
|
Valtype constant;
|
|
|
|
} u_;
|
2006-11-16 00:38:25 +00:00
|
|
|
// For a local symbol, the local symbol index. This is GSYM_CODE
|
|
|
|
// for a global symbol, or CONSTANT_CODE for a constant.
|
2010-08-19 22:50:16 +00:00
|
|
|
unsigned int local_sym_index_ : 31;
|
|
|
|
// Whether to use the PLT offset of the symbol if it has one.
|
|
|
|
bool use_plt_offset_ : 1;
|
2006-11-03 18:26:11 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
typedef std::vector<Got_entry> Got_entries;
|
|
|
|
|
2011-05-23 23:27:11 +00:00
|
|
|
// Create a new GOT entry and return its offset.
|
|
|
|
unsigned int
|
|
|
|
add_got_entry(Got_entry got_entry);
|
|
|
|
|
|
|
|
// Create a pair of new GOT entries and return the offset of the first.
|
|
|
|
unsigned int
|
|
|
|
add_got_entry_pair(Got_entry got_entry_1, Got_entry got_entry_2);
|
|
|
|
|
2006-11-03 18:26:11 +00:00
|
|
|
// Return the offset into the GOT of GOT entry I.
|
|
|
|
unsigned int
|
|
|
|
got_offset(unsigned int i) const
|
|
|
|
{ return i * (size / 8); }
|
|
|
|
|
|
|
|
// Return the offset into the GOT of the last entry added.
|
|
|
|
unsigned int
|
|
|
|
last_got_offset() const
|
|
|
|
{ return this->got_offset(this->entries_.size() - 1); }
|
|
|
|
|
|
|
|
// Set the size of the section.
|
|
|
|
void
|
|
|
|
set_got_size()
|
2007-11-29 20:10:17 +00:00
|
|
|
{ this->set_current_data_size(this->got_offset(this->entries_.size())); }
|
2006-11-03 18:26:11 +00:00
|
|
|
|
|
|
|
// The list of GOT entries.
|
|
|
|
Got_entries entries_;
|
2011-05-23 23:27:11 +00:00
|
|
|
|
|
|
|
// List of available regions within the section, for incremental
|
|
|
|
// update links.
|
|
|
|
Free_list free_list_;
|
2006-11-03 18:26:11 +00:00
|
|
|
};
|
|
|
|
|
2006-11-29 17:56:40 +00:00
|
|
|
// Output_data_dynamic is used to hold the data in SHT_DYNAMIC
|
|
|
|
// section.
|
|
|
|
|
|
|
|
class Output_data_dynamic : public Output_section_data
|
|
|
|
{
|
|
|
|
public:
|
2007-09-26 07:01:35 +00:00
|
|
|
Output_data_dynamic(Stringpool* pool)
|
2007-11-09 07:00:15 +00:00
|
|
|
: Output_section_data(Output_data::default_alignment()),
|
2007-09-26 07:01:35 +00:00
|
|
|
entries_(), pool_(pool)
|
2006-11-29 17:56:40 +00:00
|
|
|
{ }
|
|
|
|
|
|
|
|
// Add a new dynamic entry with a fixed numeric value.
|
|
|
|
void
|
|
|
|
add_constant(elfcpp::DT tag, unsigned int val)
|
|
|
|
{ this->add_entry(Dynamic_entry(tag, val)); }
|
|
|
|
|
2006-12-01 16:51:25 +00:00
|
|
|
// Add a new dynamic entry with the address of output data.
|
2006-11-29 17:56:40 +00:00
|
|
|
void
|
2006-12-01 16:51:25 +00:00
|
|
|
add_section_address(elfcpp::DT tag, const Output_data* od)
|
|
|
|
{ this->add_entry(Dynamic_entry(tag, od, false)); }
|
2006-11-29 17:56:40 +00:00
|
|
|
|
2008-04-11 21:24:30 +00:00
|
|
|
// Add a new dynamic entry with the address of output data
|
|
|
|
// plus a constant offset.
|
|
|
|
void
|
|
|
|
add_section_plus_offset(elfcpp::DT tag, const Output_data* od,
|
2009-12-14 19:53:05 +00:00
|
|
|
unsigned int offset)
|
|
|
|
{ this->add_entry(Dynamic_entry(tag, od, offset)); }
|
2008-04-11 21:24:30 +00:00
|
|
|
|
2006-12-01 16:51:25 +00:00
|
|
|
// Add a new dynamic entry with the size of output data.
|
2006-11-29 17:56:40 +00:00
|
|
|
void
|
2006-12-01 16:51:25 +00:00
|
|
|
add_section_size(elfcpp::DT tag, const Output_data* od)
|
|
|
|
{ this->add_entry(Dynamic_entry(tag, od, true)); }
|
2006-11-29 17:56:40 +00:00
|
|
|
|
2010-02-09 20:29:44 +00:00
|
|
|
// Add a new dynamic entry with the total size of two output datas.
|
|
|
|
void
|
|
|
|
add_section_size(elfcpp::DT tag, const Output_data* od,
|
|
|
|
const Output_data* od2)
|
|
|
|
{ this->add_entry(Dynamic_entry(tag, od, od2)); }
|
|
|
|
|
2006-11-29 17:56:40 +00:00
|
|
|
// Add a new dynamic entry with the address of a symbol.
|
|
|
|
void
|
2006-12-01 16:51:25 +00:00
|
|
|
add_symbol(elfcpp::DT tag, const Symbol* sym)
|
2006-11-29 17:56:40 +00:00
|
|
|
{ this->add_entry(Dynamic_entry(tag, sym)); }
|
|
|
|
|
|
|
|
// Add a new dynamic entry with a string.
|
|
|
|
void
|
|
|
|
add_string(elfcpp::DT tag, const char* str)
|
2007-10-12 06:06:34 +00:00
|
|
|
{ this->add_entry(Dynamic_entry(tag, this->pool_->add(str, true, NULL))); }
|
2006-11-29 17:56:40 +00:00
|
|
|
|
2007-08-21 20:37:32 +00:00
|
|
|
void
|
|
|
|
add_string(elfcpp::DT tag, const std::string& str)
|
|
|
|
{ this->add_string(tag, str.c_str()); }
|
|
|
|
|
2007-11-29 20:10:17 +00:00
|
|
|
protected:
|
|
|
|
// Adjust the output section to set the entry size.
|
|
|
|
void
|
|
|
|
do_adjust_output_section(Output_section*);
|
|
|
|
|
2006-11-29 17:56:40 +00:00
|
|
|
// Set the final data size.
|
|
|
|
void
|
2007-11-29 20:10:17 +00:00
|
|
|
set_final_data_size();
|
2006-11-29 17:56:40 +00:00
|
|
|
|
|
|
|
// Write out the dynamic entries.
|
|
|
|
void
|
|
|
|
do_write(Output_file*);
|
|
|
|
|
2008-05-21 21:37:44 +00:00
|
|
|
// Write to a map file.
|
|
|
|
void
|
|
|
|
do_print_to_mapfile(Mapfile* mapfile) const
|
|
|
|
{ mapfile->print_output_data(this, _("** dynamic")); }
|
|
|
|
|
2006-11-29 17:56:40 +00:00
|
|
|
private:
|
|
|
|
// This POD class holds a single dynamic entry.
|
|
|
|
class Dynamic_entry
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
// Create an entry with a fixed numeric value.
|
2009-12-14 19:53:05 +00:00
|
|
|
Dynamic_entry(elfcpp::DT tag, unsigned int val)
|
|
|
|
: tag_(tag), offset_(DYNAMIC_NUMBER)
|
2006-11-29 17:56:40 +00:00
|
|
|
{ this->u_.val = val; }
|
|
|
|
|
|
|
|
// Create an entry with the size or address of a section.
|
2009-12-14 19:53:05 +00:00
|
|
|
Dynamic_entry(elfcpp::DT tag, const Output_data* od, bool section_size)
|
|
|
|
: tag_(tag),
|
2008-04-11 21:24:30 +00:00
|
|
|
offset_(section_size
|
|
|
|
? DYNAMIC_SECTION_SIZE
|
|
|
|
: DYNAMIC_SECTION_ADDRESS)
|
2010-02-09 20:29:44 +00:00
|
|
|
{
|
|
|
|
this->u_.od = od;
|
|
|
|
this->od2 = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Create an entry with the size of two sections.
|
|
|
|
Dynamic_entry(elfcpp::DT tag, const Output_data* od, const Output_data* od2)
|
|
|
|
: tag_(tag),
|
|
|
|
offset_(DYNAMIC_SECTION_SIZE)
|
|
|
|
{
|
|
|
|
this->u_.od = od;
|
|
|
|
this->od2 = od2;
|
|
|
|
}
|
2008-04-11 21:24:30 +00:00
|
|
|
|
|
|
|
// Create an entry with the address of a section plus a constant offset.
|
2009-12-14 19:53:05 +00:00
|
|
|
Dynamic_entry(elfcpp::DT tag, const Output_data* od, unsigned int offset)
|
|
|
|
: tag_(tag),
|
2008-04-11 21:24:30 +00:00
|
|
|
offset_(offset)
|
2006-12-01 16:51:25 +00:00
|
|
|
{ this->u_.od = od; }
|
2006-11-29 17:56:40 +00:00
|
|
|
|
|
|
|
// Create an entry with the address of a symbol.
|
2009-12-14 19:53:05 +00:00
|
|
|
Dynamic_entry(elfcpp::DT tag, const Symbol* sym)
|
|
|
|
: tag_(tag), offset_(DYNAMIC_SYMBOL)
|
2006-11-29 17:56:40 +00:00
|
|
|
{ this->u_.sym = sym; }
|
|
|
|
|
|
|
|
// Create an entry with a string.
|
2009-12-14 19:53:05 +00:00
|
|
|
Dynamic_entry(elfcpp::DT tag, const char* str)
|
|
|
|
: tag_(tag), offset_(DYNAMIC_STRING)
|
2006-11-29 17:56:40 +00:00
|
|
|
{ this->u_.str = str; }
|
|
|
|
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 01:10:38 +00:00
|
|
|
// Return the tag of this entry.
|
|
|
|
elfcpp::DT
|
|
|
|
tag() const
|
|
|
|
{ return this->tag_; }
|
|
|
|
|
2006-11-29 17:56:40 +00:00
|
|
|
// Write the dynamic entry to an output view.
|
|
|
|
template<int size, bool big_endian>
|
|
|
|
void
|
2008-02-29 19:19:17 +00:00
|
|
|
write(unsigned char* pov, const Stringpool*) const;
|
2006-11-29 17:56:40 +00:00
|
|
|
|
|
|
|
private:
|
2008-04-11 21:24:30 +00:00
|
|
|
// Classification is encoded in the OFFSET field.
|
2006-11-29 17:56:40 +00:00
|
|
|
enum Classification
|
|
|
|
{
|
|
|
|
// Section address.
|
2008-04-11 21:24:30 +00:00
|
|
|
DYNAMIC_SECTION_ADDRESS = 0,
|
|
|
|
// Number.
|
|
|
|
DYNAMIC_NUMBER = -1U,
|
2006-11-29 17:56:40 +00:00
|
|
|
// Section size.
|
2008-04-11 21:24:30 +00:00
|
|
|
DYNAMIC_SECTION_SIZE = -2U,
|
2006-11-29 17:56:40 +00:00
|
|
|
// Symbol adress.
|
2008-04-11 21:24:30 +00:00
|
|
|
DYNAMIC_SYMBOL = -3U,
|
2006-11-29 17:56:40 +00:00
|
|
|
// String.
|
2008-04-11 21:24:30 +00:00
|
|
|
DYNAMIC_STRING = -4U
|
|
|
|
// Any other value indicates a section address plus OFFSET.
|
2006-11-29 17:56:40 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
union
|
|
|
|
{
|
|
|
|
// For DYNAMIC_NUMBER.
|
|
|
|
unsigned int val;
|
2008-04-11 21:24:30 +00:00
|
|
|
// For DYNAMIC_SECTION_SIZE and section address plus OFFSET.
|
2006-12-01 16:51:25 +00:00
|
|
|
const Output_data* od;
|
2006-11-29 17:56:40 +00:00
|
|
|
// For DYNAMIC_SYMBOL.
|
2006-12-01 16:51:25 +00:00
|
|
|
const Symbol* sym;
|
2006-11-29 17:56:40 +00:00
|
|
|
// For DYNAMIC_STRING.
|
|
|
|
const char* str;
|
|
|
|
} u_;
|
2010-02-09 20:29:44 +00:00
|
|
|
// For DYNAMIC_SYMBOL with two sections.
|
|
|
|
const Output_data* od2;
|
2006-11-29 17:56:40 +00:00
|
|
|
// The dynamic tag.
|
|
|
|
elfcpp::DT tag_;
|
2008-04-11 21:24:30 +00:00
|
|
|
// The type of entry (Classification) or offset within a section.
|
|
|
|
unsigned int offset_;
|
2006-11-29 17:56:40 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
// Add an entry to the list.
|
|
|
|
void
|
|
|
|
add_entry(const Dynamic_entry& entry)
|
|
|
|
{ this->entries_.push_back(entry); }
|
|
|
|
|
|
|
|
// Sized version of write function.
|
|
|
|
template<int size, bool big_endian>
|
|
|
|
void
|
|
|
|
sized_write(Output_file* of);
|
|
|
|
|
|
|
|
// The type of the list of entries.
|
|
|
|
typedef std::vector<Dynamic_entry> Dynamic_entries;
|
|
|
|
|
|
|
|
// The entries.
|
|
|
|
Dynamic_entries entries_;
|
|
|
|
// The pool used for strings.
|
|
|
|
Stringpool* pool_;
|
|
|
|
};
|
|
|
|
|
2008-04-19 18:30:58 +00:00
|
|
|
// Output_symtab_xindex is used to handle SHT_SYMTAB_SHNDX sections,
|
|
|
|
// which may be required if the object file has more than
|
|
|
|
// SHN_LORESERVE sections.
|
|
|
|
|
|
|
|
class Output_symtab_xindex : public Output_section_data
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
Output_symtab_xindex(size_t symcount)
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 01:10:38 +00:00
|
|
|
: Output_section_data(symcount * 4, 4, true),
|
2008-04-19 18:30:58 +00:00
|
|
|
entries_()
|
|
|
|
{ }
|
|
|
|
|
|
|
|
// Add an entry: symbol number SYMNDX has section SHNDX.
|
|
|
|
void
|
|
|
|
add(unsigned int symndx, unsigned int shndx)
|
|
|
|
{ this->entries_.push_back(std::make_pair(symndx, shndx)); }
|
|
|
|
|
|
|
|
protected:
|
|
|
|
void
|
|
|
|
do_write(Output_file*);
|
|
|
|
|
2008-05-21 21:37:44 +00:00
|
|
|
// Write to a map file.
|
|
|
|
void
|
|
|
|
do_print_to_mapfile(Mapfile* mapfile) const
|
|
|
|
{ mapfile->print_output_data(this, _("** symtab xindex")); }
|
|
|
|
|
2008-04-19 18:30:58 +00:00
|
|
|
private:
|
|
|
|
template<bool big_endian>
|
|
|
|
void
|
|
|
|
endian_do_write(unsigned char*);
|
|
|
|
|
|
|
|
// It is likely that most symbols will not require entries. Rather
|
|
|
|
// than keep a vector for all symbols, we keep pairs of symbol index
|
|
|
|
// and section index.
|
|
|
|
typedef std::vector<std::pair<unsigned int, unsigned int> > Xindex_entries;
|
|
|
|
|
|
|
|
// The entries we need.
|
|
|
|
Xindex_entries entries_;
|
|
|
|
};
|
|
|
|
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 01:10:38 +00:00
|
|
|
// A relaxed input section.
|
2009-10-09 Doug Kwan <dougkwan@google.com>
* layout.cc (Layout::make_output_section): Call target hook to make
ordinary output section.
(Layout::finalize): Adjust parameter list of call the
Target::may_relax().
* layout.h (class Layout::section_list): New method.
* merge.h (Output_merge_base::entsize): Change visibility to public.
(Output_merge_base::is_string, Output_merge_base::do_is_string):
New methods.
(Output_merge_string::do_is_string): New method.
* object.cc (Sized_relobj::do_setup): renamed from
Sized_relobj::set_up.
* object.h (Sized_relobj::adjust_shndx,
Sized_relobj::initializ_input_to_output_maps,
Sized_relobj::free_input_to_output_maps): Change visibilities to
protected.
(Sized_relobj::setup): Virtualize.
(Sized_relobj::do_setup): New method declaration.
(Sized_relobj::invalidate_section_offset,
Sized_relobj::do_invalidate_section_offset): New method decfinitions.
(Sized_relobj::elf_file, Sized_relobj::local_values): New methods.
* options.cc (parse_int): New function.
* options.h (parse_int): New declaration.
(DEFINE_int): New macro.
(stub_group_size): New option.
* output.cc (Output_section::Output_section): Initialize memebers
merge_section_map_, merge_section_by_properties_map_,
relaxed_input_section_map_, is_relaxed_input_section_map_valid_.
(Output_section::add_input_section): Handled deferred code-fill
generation and remove an old comment.
(Output_section::add_relaxed_input_section): New method definition.
(Output_section::add_merge_input_section): Use merge section by
properties map to speed to search. Update merge section maps
as appropriate.
(Output_section::build_relaxation_map): New method definition.
(Output_section::convert_input_sections_in_list_to_relaxed_sections):
Same.
(Output_section::relax_input_section): Renamed to
Output_section::convert_input_sections_to_relaxed_sections and change
interface to take a vector of pointers to relaxed sections.
(Output_section::find_merge_section,
Output_section::find_relaxed_input_section): New method definitions.
(Output_section::is_input_address_mapped,
Output_section::output_offset, Output_section::output_address):
Use output section data maps to speed up searching.
(Output_section::find_starting_output_address): Add comments.
(Output_section::do_write,
Output_section::write_to_postprocessing_buffer): Do code-fill
generation as appropriate.
(Output_section::get_input_sections): Invalidate relaxed input section
map.
(Output_section::restore_states): Adjust type of checkpoint .
Invalidate relaxed input section map.
* output.h (Output_merge_base): New class declaration.
(Input_section_specifier): New class defintion.
(class Output_relaxed_input_section) Change base class to
Output_section_data_build.
(Output_relaxed_input_section::Output_relaxed_input_section): Adjust
base class initializer.
(Output_section::add_relaxed_input_section): New method declaration.
(Output_section::Input_section): Change visibility to protected.
(Output_section::Input_section::relobj,
Output_section::Input_section::shndx): Handle relaxed input sections.
Output_section::input_sections) Change visibility to protected. Also
define overload to return a non-const pointer.
(Output_section::Merge_section_properties): New class defintion.
(Output_section::Merge_section_by_properties_map,
Output_section::Output_section_data_by_input_section_map,
Output_section::Relaxation_map): New types.
(Output_section::relax_input_section): Rename method to
Output_section::convert_input_sections_to_relaxed_sections and change
interface to take a vector of relaxed section pointers.
(Output_section::find_merge_section,
Output_section::find_relaxed_input_section,
Output_section::build_relaxation_map,
Output_section::convert_input_sections_in_list_to_relaxed_sections):
New method declarations.
(Output_section::merge_section_map_
Output_section::merge_section_by_properties_map_,
Output_section::relaxed_input_section_map_,
Output_section::is_relaxed_input_section_map_valid_,
Output_section::generate_code_fills_at_write_): New data members.
* script-sections.cc
(Output_section_element_input::set_section_addresses): Call
current_data_size and addralign methods of relaxed input sections.
(Orphan_output_section::set_section_addresses): Call current_data_size
and addralign methods of relaxed input sections.
* symtab.cc (Symbol_table::compute_final_value): Extract template
from the body of Symbol_table::sized_finalize_symbol.
(Symbol_table::sized_finalized_symbol): Call
Symbol_table::compute_final_value.
* symtab.h (Symbol_table::Compute_final_value_status): New enum type.
(Symbol_table::compute_final_value): New templated method declaration.
* target.cc (Target::do_make_output_section): New method defintion.
* target.h (Target::make_output_section): New method declaration.
(Target::relax): Add more parameters for input objects, symbol table
and layout. Adjust call to do_relax.
(Target::do_make_output_section): New method declaration.
(Target::do_relax): Add parameters for input objects, symbol table
and layout.
2009-10-09 23:18:19 +00:00
|
|
|
class Output_relaxed_input_section : public Output_section_data_build
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 01:10:38 +00:00
|
|
|
{
|
|
|
|
public:
|
|
|
|
// We would like to call relobj->section_addralign(shndx) to get the
|
|
|
|
// alignment but we do not want the constructor to fail. So callers
|
|
|
|
// are repsonsible for ensuring that.
|
2009-12-14 19:53:05 +00:00
|
|
|
Output_relaxed_input_section(Relobj* relobj, unsigned int shndx,
|
|
|
|
uint64_t addralign)
|
|
|
|
: Output_section_data_build(addralign), relobj_(relobj), shndx_(shndx)
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 01:10:38 +00:00
|
|
|
{ }
|
|
|
|
|
|
|
|
// Return the Relobj of this relaxed input section.
|
|
|
|
Relobj*
|
|
|
|
relobj() const
|
|
|
|
{ return this->relobj_; }
|
|
|
|
|
|
|
|
// Return the section index of this relaxed input section.
|
|
|
|
unsigned int
|
|
|
|
shndx() const
|
|
|
|
{ return this->shndx_; }
|
|
|
|
|
|
|
|
private:
|
|
|
|
Relobj* relobj_;
|
|
|
|
unsigned int shndx_;
|
|
|
|
};
|
|
|
|
|
2010-05-23 Doug Kwan <dougkwan@google.com>
* arm.cc (Arm_input_section::do_output_offset): Use convert_types
instead of a cast.
(Target_arm::apply_cortex_a8_workaround): Rewrite a conditional branch
with a direct branch, not a conditional branch, to a stub.
* merge.cc (Output_merge_base::record_input_section): New method
defintion.
(Output_merge_data::do_add_input_section): Record input section if
keeps-input-sections flag is set.
(Output_merge_string::do_add_input_section): Ditto.
* merge.h (Output_merge_base::Output_merge_base): Initialize new data
members KEEPS_INPUT_SECTIONS_, FIRST_RELOBJ_, FIRST_SHNDX_ and
INPUT_SECTIONS_.
(Output_merge_base::keeps_input_sections,
Output_merge_base::set_keeps_input_sections,
Output_merge_base::first_relobj, Output_merge_base::first_shndx): New
method definitions.
(Output_merge_base::Input_sections): New type declaration.
(Output_merge_base::input_sections_begin,
Output_merge_base::input_sections_end,
Output_merge_base::do_set_keeps_input_sections): New method definitions.
(Output_merge_base::bool keeps_input_sections_,
Output_merge_base::first_relobj_, Output_merge_base::first_shndx_,
Output_merge_base::input_sections_): New data members.
(Output_merge_data::do_set_keeps_input_sections): New method
defintion.
(Output_merge_string::do_set_keeps_input_sections): Ditto.
* output.cc (Output_section::Input_section::relobj): Move method
defintion from class declaration to here and handle merge sections.
(Output_section::Input_section::shndx): Ditto.
(Output_section::Output_section): Remove initializations of removed
data members and initialize new data member LOOKUP_MAPS_.
(Output_section::add_input_section): Set keeps-input-sections flag
for a newly created merge output section as appropriate. Adjust code
to use Output_section_lookup_maps class.
(Output_section::add_relaxed_input_section): Adjst code for lookup
maps code refactoring.
(Output_section::add_merge_input_section): Add a new parameter
KEEPS_INPUT_SECTION. Adjust code to use Output_section_lookup_maps
class. If adding input section to a newly created merge output
section fails, remove the new merge section.
(Output_section::convert_input_sections_in_list_to_relaxed_input_sections):
Adjust code for use of the Output_section_lookup_maps class.
(Output_section::find_merge_section): Ditto.
(Output_section::build_lookup_maps): New method defintion.
(Output_section::find_relaxed_input_section): Adjust code to use
Output_section_lookup_maps class.
(Output_section::get_input_sections): Export merge sections. Adjust
code to use Output_section_lookup_maps class.
(Output_section:::add_script_input_section): Adjust code to use
Output_section_lookup_maps class. Update lookup maps for merge
sections also.
(Output_section::discard_states): Use Output_section_lookup_maps.
(Output_section::restore_states): Same.
* output.h (Merge_section_properties): Move class defintion out of
Output_section.
(Output_section_lookup_maps): New class.
(Output_section::Input_section::is_merge_section): New method
defintion.
(Output_section::Input_section::relobj): Move defintion out of class
defintion. Declare method only.
(Output_section::Input_section::shndx): Ditto.
(Output_section::Input_section::output_merge_base): New method defintion.
(Output_section::Input_section::u2_.pomb): New union field.
(Output_section::Merge_section_by_properties_map,
Output_section::Output_section_data_by_input_section_map,
Output_section::Ouptut_relaxed_input_section_by_input_section_map):
Remove types.
(Output_section::add_merge_input_section): Add new parameter
KEEPS_INPUT_SECTIONS.
(Output_section::build_lookup_maps): New method declaration.
(Output_section::merge_section_map_,
Output_section::merge_section_by_properties_map_,
Output_section::relaxed_input_section_map_,
Output_section::is_relaxed_input_section_map_valid_): Remove data
members.
(Output_section::lookup_maps_): New data member.
2010-05-23 07:43:39 +00:00
|
|
|
// This class describes properties of merge data sections. It is used
|
|
|
|
// as a key type for maps.
|
|
|
|
class Merge_section_properties
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
Merge_section_properties(bool is_string, uint64_t entsize,
|
|
|
|
uint64_t addralign)
|
|
|
|
: is_string_(is_string), entsize_(entsize), addralign_(addralign)
|
|
|
|
{ }
|
|
|
|
|
|
|
|
// Whether this equals to another Merge_section_properties MSP.
|
|
|
|
bool
|
|
|
|
eq(const Merge_section_properties& msp) const
|
|
|
|
{
|
|
|
|
return ((this->is_string_ == msp.is_string_)
|
|
|
|
&& (this->entsize_ == msp.entsize_)
|
|
|
|
&& (this->addralign_ == msp.addralign_));
|
|
|
|
}
|
|
|
|
|
|
|
|
// Compute a hash value for this using 64-bit FNV-1a hash.
|
|
|
|
size_t
|
|
|
|
hash_value() const
|
|
|
|
{
|
|
|
|
uint64_t h = 14695981039346656037ULL; // FNV offset basis.
|
|
|
|
uint64_t prime = 1099511628211ULL;
|
|
|
|
h = (h ^ static_cast<uint64_t>(this->is_string_)) * prime;
|
|
|
|
h = (h ^ static_cast<uint64_t>(this->entsize_)) * prime;
|
|
|
|
h = (h ^ static_cast<uint64_t>(this->addralign_)) * prime;
|
|
|
|
return h;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Functors for associative containers.
|
|
|
|
struct equal_to
|
|
|
|
{
|
|
|
|
bool
|
|
|
|
operator()(const Merge_section_properties& msp1,
|
|
|
|
const Merge_section_properties& msp2) const
|
|
|
|
{ return msp1.eq(msp2); }
|
|
|
|
};
|
|
|
|
|
|
|
|
struct hash
|
|
|
|
{
|
|
|
|
size_t
|
|
|
|
operator()(const Merge_section_properties& msp) const
|
|
|
|
{ return msp.hash_value(); }
|
|
|
|
};
|
|
|
|
|
|
|
|
private:
|
|
|
|
// Whether this merge data section is for strings.
|
|
|
|
bool is_string_;
|
|
|
|
// Entsize of this merge data section.
|
|
|
|
uint64_t entsize_;
|
|
|
|
// Address alignment.
|
|
|
|
uint64_t addralign_;
|
|
|
|
};
|
|
|
|
|
|
|
|
// This class is used to speed up look up of special input sections in an
|
|
|
|
// Output_section.
|
|
|
|
|
|
|
|
class Output_section_lookup_maps
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
Output_section_lookup_maps()
|
|
|
|
: is_valid_(true), merge_sections_by_properties_(),
|
|
|
|
merge_sections_by_id_(), relaxed_input_sections_by_id_()
|
|
|
|
{ }
|
|
|
|
|
|
|
|
// Whether the maps are valid.
|
|
|
|
bool
|
|
|
|
is_valid() const
|
|
|
|
{ return this->is_valid_; }
|
|
|
|
|
|
|
|
// Invalidate the maps.
|
|
|
|
void
|
|
|
|
invalidate()
|
|
|
|
{ this->is_valid_ = false; }
|
|
|
|
|
|
|
|
// Clear the maps.
|
|
|
|
void
|
|
|
|
clear()
|
|
|
|
{
|
|
|
|
this->merge_sections_by_properties_.clear();
|
|
|
|
this->merge_sections_by_id_.clear();
|
|
|
|
this->relaxed_input_sections_by_id_.clear();
|
|
|
|
// A cleared map is valid.
|
|
|
|
this->is_valid_ = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Find a merge section by merge section properties. Return NULL if none
|
|
|
|
// is found.
|
|
|
|
Output_merge_base*
|
|
|
|
find_merge_section(const Merge_section_properties& msp) const
|
|
|
|
{
|
|
|
|
gold_assert(this->is_valid_);
|
|
|
|
Merge_sections_by_properties::const_iterator p =
|
|
|
|
this->merge_sections_by_properties_.find(msp);
|
|
|
|
return p != this->merge_sections_by_properties_.end() ? p->second : NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Find a merge section by section ID of a merge input section. Return NULL
|
|
|
|
// if none is found.
|
|
|
|
Output_merge_base*
|
|
|
|
find_merge_section(const Object* object, unsigned int shndx) const
|
|
|
|
{
|
|
|
|
gold_assert(this->is_valid_);
|
|
|
|
Merge_sections_by_id::const_iterator p =
|
|
|
|
this->merge_sections_by_id_.find(Const_section_id(object, shndx));
|
|
|
|
return p != this->merge_sections_by_id_.end() ? p->second : NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Add a merge section pointed by POMB with properties MSP.
|
|
|
|
void
|
|
|
|
add_merge_section(const Merge_section_properties& msp,
|
|
|
|
Output_merge_base* pomb)
|
|
|
|
{
|
|
|
|
std::pair<Merge_section_properties, Output_merge_base*> value(msp, pomb);
|
|
|
|
std::pair<Merge_sections_by_properties::iterator, bool> result =
|
|
|
|
this->merge_sections_by_properties_.insert(value);
|
2010-07-13 12:04:03 +00:00
|
|
|
gold_assert(result.second);
|
2010-05-23 Doug Kwan <dougkwan@google.com>
* arm.cc (Arm_input_section::do_output_offset): Use convert_types
instead of a cast.
(Target_arm::apply_cortex_a8_workaround): Rewrite a conditional branch
with a direct branch, not a conditional branch, to a stub.
* merge.cc (Output_merge_base::record_input_section): New method
defintion.
(Output_merge_data::do_add_input_section): Record input section if
keeps-input-sections flag is set.
(Output_merge_string::do_add_input_section): Ditto.
* merge.h (Output_merge_base::Output_merge_base): Initialize new data
members KEEPS_INPUT_SECTIONS_, FIRST_RELOBJ_, FIRST_SHNDX_ and
INPUT_SECTIONS_.
(Output_merge_base::keeps_input_sections,
Output_merge_base::set_keeps_input_sections,
Output_merge_base::first_relobj, Output_merge_base::first_shndx): New
method definitions.
(Output_merge_base::Input_sections): New type declaration.
(Output_merge_base::input_sections_begin,
Output_merge_base::input_sections_end,
Output_merge_base::do_set_keeps_input_sections): New method definitions.
(Output_merge_base::bool keeps_input_sections_,
Output_merge_base::first_relobj_, Output_merge_base::first_shndx_,
Output_merge_base::input_sections_): New data members.
(Output_merge_data::do_set_keeps_input_sections): New method
defintion.
(Output_merge_string::do_set_keeps_input_sections): Ditto.
* output.cc (Output_section::Input_section::relobj): Move method
defintion from class declaration to here and handle merge sections.
(Output_section::Input_section::shndx): Ditto.
(Output_section::Output_section): Remove initializations of removed
data members and initialize new data member LOOKUP_MAPS_.
(Output_section::add_input_section): Set keeps-input-sections flag
for a newly created merge output section as appropriate. Adjust code
to use Output_section_lookup_maps class.
(Output_section::add_relaxed_input_section): Adjst code for lookup
maps code refactoring.
(Output_section::add_merge_input_section): Add a new parameter
KEEPS_INPUT_SECTION. Adjust code to use Output_section_lookup_maps
class. If adding input section to a newly created merge output
section fails, remove the new merge section.
(Output_section::convert_input_sections_in_list_to_relaxed_input_sections):
Adjust code for use of the Output_section_lookup_maps class.
(Output_section::find_merge_section): Ditto.
(Output_section::build_lookup_maps): New method defintion.
(Output_section::find_relaxed_input_section): Adjust code to use
Output_section_lookup_maps class.
(Output_section::get_input_sections): Export merge sections. Adjust
code to use Output_section_lookup_maps class.
(Output_section:::add_script_input_section): Adjust code to use
Output_section_lookup_maps class. Update lookup maps for merge
sections also.
(Output_section::discard_states): Use Output_section_lookup_maps.
(Output_section::restore_states): Same.
* output.h (Merge_section_properties): Move class defintion out of
Output_section.
(Output_section_lookup_maps): New class.
(Output_section::Input_section::is_merge_section): New method
defintion.
(Output_section::Input_section::relobj): Move defintion out of class
defintion. Declare method only.
(Output_section::Input_section::shndx): Ditto.
(Output_section::Input_section::output_merge_base): New method defintion.
(Output_section::Input_section::u2_.pomb): New union field.
(Output_section::Merge_section_by_properties_map,
Output_section::Output_section_data_by_input_section_map,
Output_section::Ouptut_relaxed_input_section_by_input_section_map):
Remove types.
(Output_section::add_merge_input_section): Add new parameter
KEEPS_INPUT_SECTIONS.
(Output_section::build_lookup_maps): New method declaration.
(Output_section::merge_section_map_,
Output_section::merge_section_by_properties_map_,
Output_section::relaxed_input_section_map_,
Output_section::is_relaxed_input_section_map_valid_): Remove data
members.
(Output_section::lookup_maps_): New data member.
2010-05-23 07:43:39 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Add a mapping from a merged input section in OBJECT with index SHNDX
|
|
|
|
// to a merge output section pointed by POMB.
|
|
|
|
void
|
|
|
|
add_merge_input_section(const Object* object, unsigned int shndx,
|
|
|
|
Output_merge_base* pomb)
|
|
|
|
{
|
|
|
|
Const_section_id csid(object, shndx);
|
|
|
|
std::pair<Const_section_id, Output_merge_base*> value(csid, pomb);
|
|
|
|
std::pair<Merge_sections_by_id::iterator, bool> result =
|
|
|
|
this->merge_sections_by_id_.insert(value);
|
2010-07-13 12:04:03 +00:00
|
|
|
gold_assert(result.second);
|
2010-05-23 Doug Kwan <dougkwan@google.com>
* arm.cc (Arm_input_section::do_output_offset): Use convert_types
instead of a cast.
(Target_arm::apply_cortex_a8_workaround): Rewrite a conditional branch
with a direct branch, not a conditional branch, to a stub.
* merge.cc (Output_merge_base::record_input_section): New method
defintion.
(Output_merge_data::do_add_input_section): Record input section if
keeps-input-sections flag is set.
(Output_merge_string::do_add_input_section): Ditto.
* merge.h (Output_merge_base::Output_merge_base): Initialize new data
members KEEPS_INPUT_SECTIONS_, FIRST_RELOBJ_, FIRST_SHNDX_ and
INPUT_SECTIONS_.
(Output_merge_base::keeps_input_sections,
Output_merge_base::set_keeps_input_sections,
Output_merge_base::first_relobj, Output_merge_base::first_shndx): New
method definitions.
(Output_merge_base::Input_sections): New type declaration.
(Output_merge_base::input_sections_begin,
Output_merge_base::input_sections_end,
Output_merge_base::do_set_keeps_input_sections): New method definitions.
(Output_merge_base::bool keeps_input_sections_,
Output_merge_base::first_relobj_, Output_merge_base::first_shndx_,
Output_merge_base::input_sections_): New data members.
(Output_merge_data::do_set_keeps_input_sections): New method
defintion.
(Output_merge_string::do_set_keeps_input_sections): Ditto.
* output.cc (Output_section::Input_section::relobj): Move method
defintion from class declaration to here and handle merge sections.
(Output_section::Input_section::shndx): Ditto.
(Output_section::Output_section): Remove initializations of removed
data members and initialize new data member LOOKUP_MAPS_.
(Output_section::add_input_section): Set keeps-input-sections flag
for a newly created merge output section as appropriate. Adjust code
to use Output_section_lookup_maps class.
(Output_section::add_relaxed_input_section): Adjst code for lookup
maps code refactoring.
(Output_section::add_merge_input_section): Add a new parameter
KEEPS_INPUT_SECTION. Adjust code to use Output_section_lookup_maps
class. If adding input section to a newly created merge output
section fails, remove the new merge section.
(Output_section::convert_input_sections_in_list_to_relaxed_input_sections):
Adjust code for use of the Output_section_lookup_maps class.
(Output_section::find_merge_section): Ditto.
(Output_section::build_lookup_maps): New method defintion.
(Output_section::find_relaxed_input_section): Adjust code to use
Output_section_lookup_maps class.
(Output_section::get_input_sections): Export merge sections. Adjust
code to use Output_section_lookup_maps class.
(Output_section:::add_script_input_section): Adjust code to use
Output_section_lookup_maps class. Update lookup maps for merge
sections also.
(Output_section::discard_states): Use Output_section_lookup_maps.
(Output_section::restore_states): Same.
* output.h (Merge_section_properties): Move class defintion out of
Output_section.
(Output_section_lookup_maps): New class.
(Output_section::Input_section::is_merge_section): New method
defintion.
(Output_section::Input_section::relobj): Move defintion out of class
defintion. Declare method only.
(Output_section::Input_section::shndx): Ditto.
(Output_section::Input_section::output_merge_base): New method defintion.
(Output_section::Input_section::u2_.pomb): New union field.
(Output_section::Merge_section_by_properties_map,
Output_section::Output_section_data_by_input_section_map,
Output_section::Ouptut_relaxed_input_section_by_input_section_map):
Remove types.
(Output_section::add_merge_input_section): Add new parameter
KEEPS_INPUT_SECTIONS.
(Output_section::build_lookup_maps): New method declaration.
(Output_section::merge_section_map_,
Output_section::merge_section_by_properties_map_,
Output_section::relaxed_input_section_map_,
Output_section::is_relaxed_input_section_map_valid_): Remove data
members.
(Output_section::lookup_maps_): New data member.
2010-05-23 07:43:39 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Find a relaxed input section of OBJECT with index SHNDX.
|
|
|
|
Output_relaxed_input_section*
|
|
|
|
find_relaxed_input_section(const Object* object, unsigned int shndx) const
|
|
|
|
{
|
|
|
|
gold_assert(this->is_valid_);
|
|
|
|
Relaxed_input_sections_by_id::const_iterator p =
|
|
|
|
this->relaxed_input_sections_by_id_.find(Const_section_id(object, shndx));
|
|
|
|
return p != this->relaxed_input_sections_by_id_.end() ? p->second : NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Add a relaxed input section pointed by POMB and whose original input
|
|
|
|
// section is in OBJECT with index SHNDX.
|
|
|
|
void
|
|
|
|
add_relaxed_input_section(const Relobj* relobj, unsigned int shndx,
|
|
|
|
Output_relaxed_input_section* poris)
|
|
|
|
{
|
|
|
|
Const_section_id csid(relobj, shndx);
|
|
|
|
std::pair<Const_section_id, Output_relaxed_input_section*>
|
|
|
|
value(csid, poris);
|
|
|
|
std::pair<Relaxed_input_sections_by_id::iterator, bool> result =
|
|
|
|
this->relaxed_input_sections_by_id_.insert(value);
|
2010-07-13 12:04:03 +00:00
|
|
|
gold_assert(result.second);
|
2010-05-23 Doug Kwan <dougkwan@google.com>
* arm.cc (Arm_input_section::do_output_offset): Use convert_types
instead of a cast.
(Target_arm::apply_cortex_a8_workaround): Rewrite a conditional branch
with a direct branch, not a conditional branch, to a stub.
* merge.cc (Output_merge_base::record_input_section): New method
defintion.
(Output_merge_data::do_add_input_section): Record input section if
keeps-input-sections flag is set.
(Output_merge_string::do_add_input_section): Ditto.
* merge.h (Output_merge_base::Output_merge_base): Initialize new data
members KEEPS_INPUT_SECTIONS_, FIRST_RELOBJ_, FIRST_SHNDX_ and
INPUT_SECTIONS_.
(Output_merge_base::keeps_input_sections,
Output_merge_base::set_keeps_input_sections,
Output_merge_base::first_relobj, Output_merge_base::first_shndx): New
method definitions.
(Output_merge_base::Input_sections): New type declaration.
(Output_merge_base::input_sections_begin,
Output_merge_base::input_sections_end,
Output_merge_base::do_set_keeps_input_sections): New method definitions.
(Output_merge_base::bool keeps_input_sections_,
Output_merge_base::first_relobj_, Output_merge_base::first_shndx_,
Output_merge_base::input_sections_): New data members.
(Output_merge_data::do_set_keeps_input_sections): New method
defintion.
(Output_merge_string::do_set_keeps_input_sections): Ditto.
* output.cc (Output_section::Input_section::relobj): Move method
defintion from class declaration to here and handle merge sections.
(Output_section::Input_section::shndx): Ditto.
(Output_section::Output_section): Remove initializations of removed
data members and initialize new data member LOOKUP_MAPS_.
(Output_section::add_input_section): Set keeps-input-sections flag
for a newly created merge output section as appropriate. Adjust code
to use Output_section_lookup_maps class.
(Output_section::add_relaxed_input_section): Adjst code for lookup
maps code refactoring.
(Output_section::add_merge_input_section): Add a new parameter
KEEPS_INPUT_SECTION. Adjust code to use Output_section_lookup_maps
class. If adding input section to a newly created merge output
section fails, remove the new merge section.
(Output_section::convert_input_sections_in_list_to_relaxed_input_sections):
Adjust code for use of the Output_section_lookup_maps class.
(Output_section::find_merge_section): Ditto.
(Output_section::build_lookup_maps): New method defintion.
(Output_section::find_relaxed_input_section): Adjust code to use
Output_section_lookup_maps class.
(Output_section::get_input_sections): Export merge sections. Adjust
code to use Output_section_lookup_maps class.
(Output_section:::add_script_input_section): Adjust code to use
Output_section_lookup_maps class. Update lookup maps for merge
sections also.
(Output_section::discard_states): Use Output_section_lookup_maps.
(Output_section::restore_states): Same.
* output.h (Merge_section_properties): Move class defintion out of
Output_section.
(Output_section_lookup_maps): New class.
(Output_section::Input_section::is_merge_section): New method
defintion.
(Output_section::Input_section::relobj): Move defintion out of class
defintion. Declare method only.
(Output_section::Input_section::shndx): Ditto.
(Output_section::Input_section::output_merge_base): New method defintion.
(Output_section::Input_section::u2_.pomb): New union field.
(Output_section::Merge_section_by_properties_map,
Output_section::Output_section_data_by_input_section_map,
Output_section::Ouptut_relaxed_input_section_by_input_section_map):
Remove types.
(Output_section::add_merge_input_section): Add new parameter
KEEPS_INPUT_SECTIONS.
(Output_section::build_lookup_maps): New method declaration.
(Output_section::merge_section_map_,
Output_section::merge_section_by_properties_map_,
Output_section::relaxed_input_section_map_,
Output_section::is_relaxed_input_section_map_valid_): Remove data
members.
(Output_section::lookup_maps_): New data member.
2010-05-23 07:43:39 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
private:
|
|
|
|
typedef Unordered_map<Const_section_id, Output_merge_base*,
|
|
|
|
Const_section_id_hash>
|
|
|
|
Merge_sections_by_id;
|
|
|
|
|
|
|
|
typedef Unordered_map<Merge_section_properties, Output_merge_base*,
|
|
|
|
Merge_section_properties::hash,
|
|
|
|
Merge_section_properties::equal_to>
|
|
|
|
Merge_sections_by_properties;
|
|
|
|
|
|
|
|
typedef Unordered_map<Const_section_id, Output_relaxed_input_section*,
|
|
|
|
Const_section_id_hash>
|
|
|
|
Relaxed_input_sections_by_id;
|
|
|
|
|
|
|
|
// Whether this is valid
|
|
|
|
bool is_valid_;
|
|
|
|
// Merge sections by merge section properties.
|
|
|
|
Merge_sections_by_properties merge_sections_by_properties_;
|
|
|
|
// Merge sections by section IDs.
|
|
|
|
Merge_sections_by_id merge_sections_by_id_;
|
|
|
|
// Relaxed sections by section IDs.
|
|
|
|
Relaxed_input_sections_by_id relaxed_input_sections_by_id_;
|
|
|
|
};
|
|
|
|
|
2006-09-21 22:13:18 +00:00
|
|
|
// An output section. We don't expect to have too many output
|
|
|
|
// sections, so we don't bother to do a template on the size.
|
|
|
|
|
2006-09-26 21:00:34 +00:00
|
|
|
class Output_section : public Output_data
|
2006-09-21 22:13:18 +00:00
|
|
|
{
|
|
|
|
public:
|
|
|
|
// Create an output section, giving the name, type, and flags.
|
2007-12-01 06:34:12 +00:00
|
|
|
Output_section(const char* name, elfcpp::Elf_Word, elfcpp::Elf_Xword);
|
2006-09-26 21:00:34 +00:00
|
|
|
virtual ~Output_section();
|
2006-09-21 22:13:18 +00:00
|
|
|
|
2006-11-03 18:26:11 +00:00
|
|
|
// Add a new input section SHNDX, named NAME, with header SHDR, from
|
2007-11-09 07:00:15 +00:00
|
|
|
// object OBJECT. RELOC_SHNDX is the index of a relocation section
|
2008-09-29 21:10:26 +00:00
|
|
|
// which applies to this section, or 0 if none, or -1 if more than
|
2008-02-04 05:43:05 +00:00
|
|
|
// one. HAVE_SECTIONS_SCRIPT is true if we have a SECTIONS clause
|
|
|
|
// in a linker script; in that case we need to keep track of input
|
|
|
|
// sections associated with an output section. Return the offset
|
|
|
|
// within the output section.
|
2006-09-21 22:13:18 +00:00
|
|
|
template<int size, bool big_endian>
|
|
|
|
off_t
|
2011-05-24 21:41:10 +00:00
|
|
|
add_input_section(Layout* layout, Sized_relobj_file<size, big_endian>* object,
|
2010-08-25 08:36:54 +00:00
|
|
|
unsigned int shndx, const char* name,
|
2007-11-09 07:00:15 +00:00
|
|
|
const elfcpp::Shdr<size, big_endian>& shdr,
|
2008-02-04 05:43:05 +00:00
|
|
|
unsigned int reloc_shndx, bool have_sections_script);
|
2006-09-21 22:13:18 +00:00
|
|
|
|
2007-05-16 17:42:48 +00:00
|
|
|
// Add generated data POSD to this output section.
|
2006-11-16 00:38:25 +00:00
|
|
|
void
|
2006-11-03 18:26:11 +00:00
|
|
|
add_output_section_data(Output_section_data* posd);
|
|
|
|
|
2010-10-29 20:49:20 +00:00
|
|
|
// Add a relaxed input section PORIS called NAME to this output section
|
|
|
|
// with LAYOUT.
|
2009-10-09 Doug Kwan <dougkwan@google.com>
* layout.cc (Layout::make_output_section): Call target hook to make
ordinary output section.
(Layout::finalize): Adjust parameter list of call the
Target::may_relax().
* layout.h (class Layout::section_list): New method.
* merge.h (Output_merge_base::entsize): Change visibility to public.
(Output_merge_base::is_string, Output_merge_base::do_is_string):
New methods.
(Output_merge_string::do_is_string): New method.
* object.cc (Sized_relobj::do_setup): renamed from
Sized_relobj::set_up.
* object.h (Sized_relobj::adjust_shndx,
Sized_relobj::initializ_input_to_output_maps,
Sized_relobj::free_input_to_output_maps): Change visibilities to
protected.
(Sized_relobj::setup): Virtualize.
(Sized_relobj::do_setup): New method declaration.
(Sized_relobj::invalidate_section_offset,
Sized_relobj::do_invalidate_section_offset): New method decfinitions.
(Sized_relobj::elf_file, Sized_relobj::local_values): New methods.
* options.cc (parse_int): New function.
* options.h (parse_int): New declaration.
(DEFINE_int): New macro.
(stub_group_size): New option.
* output.cc (Output_section::Output_section): Initialize memebers
merge_section_map_, merge_section_by_properties_map_,
relaxed_input_section_map_, is_relaxed_input_section_map_valid_.
(Output_section::add_input_section): Handled deferred code-fill
generation and remove an old comment.
(Output_section::add_relaxed_input_section): New method definition.
(Output_section::add_merge_input_section): Use merge section by
properties map to speed to search. Update merge section maps
as appropriate.
(Output_section::build_relaxation_map): New method definition.
(Output_section::convert_input_sections_in_list_to_relaxed_sections):
Same.
(Output_section::relax_input_section): Renamed to
Output_section::convert_input_sections_to_relaxed_sections and change
interface to take a vector of pointers to relaxed sections.
(Output_section::find_merge_section,
Output_section::find_relaxed_input_section): New method definitions.
(Output_section::is_input_address_mapped,
Output_section::output_offset, Output_section::output_address):
Use output section data maps to speed up searching.
(Output_section::find_starting_output_address): Add comments.
(Output_section::do_write,
Output_section::write_to_postprocessing_buffer): Do code-fill
generation as appropriate.
(Output_section::get_input_sections): Invalidate relaxed input section
map.
(Output_section::restore_states): Adjust type of checkpoint .
Invalidate relaxed input section map.
* output.h (Output_merge_base): New class declaration.
(Input_section_specifier): New class defintion.
(class Output_relaxed_input_section) Change base class to
Output_section_data_build.
(Output_relaxed_input_section::Output_relaxed_input_section): Adjust
base class initializer.
(Output_section::add_relaxed_input_section): New method declaration.
(Output_section::Input_section): Change visibility to protected.
(Output_section::Input_section::relobj,
Output_section::Input_section::shndx): Handle relaxed input sections.
Output_section::input_sections) Change visibility to protected. Also
define overload to return a non-const pointer.
(Output_section::Merge_section_properties): New class defintion.
(Output_section::Merge_section_by_properties_map,
Output_section::Output_section_data_by_input_section_map,
Output_section::Relaxation_map): New types.
(Output_section::relax_input_section): Rename method to
Output_section::convert_input_sections_to_relaxed_sections and change
interface to take a vector of relaxed section pointers.
(Output_section::find_merge_section,
Output_section::find_relaxed_input_section,
Output_section::build_relaxation_map,
Output_section::convert_input_sections_in_list_to_relaxed_sections):
New method declarations.
(Output_section::merge_section_map_
Output_section::merge_section_by_properties_map_,
Output_section::relaxed_input_section_map_,
Output_section::is_relaxed_input_section_map_valid_,
Output_section::generate_code_fills_at_write_): New data members.
* script-sections.cc
(Output_section_element_input::set_section_addresses): Call
current_data_size and addralign methods of relaxed input sections.
(Orphan_output_section::set_section_addresses): Call current_data_size
and addralign methods of relaxed input sections.
* symtab.cc (Symbol_table::compute_final_value): Extract template
from the body of Symbol_table::sized_finalize_symbol.
(Symbol_table::sized_finalized_symbol): Call
Symbol_table::compute_final_value.
* symtab.h (Symbol_table::Compute_final_value_status): New enum type.
(Symbol_table::compute_final_value): New templated method declaration.
* target.cc (Target::do_make_output_section): New method defintion.
* target.h (Target::make_output_section): New method declaration.
(Target::relax): Add more parameters for input objects, symbol table
and layout. Adjust call to do_relax.
(Target::do_make_output_section): New method declaration.
(Target::do_relax): Add parameters for input objects, symbol table
and layout.
2009-10-09 23:18:19 +00:00
|
|
|
void
|
2010-10-29 20:49:20 +00:00
|
|
|
add_relaxed_input_section(Layout* layout,
|
|
|
|
Output_relaxed_input_section* poris,
|
|
|
|
const std::string& name);
|
2009-10-09 Doug Kwan <dougkwan@google.com>
* layout.cc (Layout::make_output_section): Call target hook to make
ordinary output section.
(Layout::finalize): Adjust parameter list of call the
Target::may_relax().
* layout.h (class Layout::section_list): New method.
* merge.h (Output_merge_base::entsize): Change visibility to public.
(Output_merge_base::is_string, Output_merge_base::do_is_string):
New methods.
(Output_merge_string::do_is_string): New method.
* object.cc (Sized_relobj::do_setup): renamed from
Sized_relobj::set_up.
* object.h (Sized_relobj::adjust_shndx,
Sized_relobj::initializ_input_to_output_maps,
Sized_relobj::free_input_to_output_maps): Change visibilities to
protected.
(Sized_relobj::setup): Virtualize.
(Sized_relobj::do_setup): New method declaration.
(Sized_relobj::invalidate_section_offset,
Sized_relobj::do_invalidate_section_offset): New method decfinitions.
(Sized_relobj::elf_file, Sized_relobj::local_values): New methods.
* options.cc (parse_int): New function.
* options.h (parse_int): New declaration.
(DEFINE_int): New macro.
(stub_group_size): New option.
* output.cc (Output_section::Output_section): Initialize memebers
merge_section_map_, merge_section_by_properties_map_,
relaxed_input_section_map_, is_relaxed_input_section_map_valid_.
(Output_section::add_input_section): Handled deferred code-fill
generation and remove an old comment.
(Output_section::add_relaxed_input_section): New method definition.
(Output_section::add_merge_input_section): Use merge section by
properties map to speed to search. Update merge section maps
as appropriate.
(Output_section::build_relaxation_map): New method definition.
(Output_section::convert_input_sections_in_list_to_relaxed_sections):
Same.
(Output_section::relax_input_section): Renamed to
Output_section::convert_input_sections_to_relaxed_sections and change
interface to take a vector of pointers to relaxed sections.
(Output_section::find_merge_section,
Output_section::find_relaxed_input_section): New method definitions.
(Output_section::is_input_address_mapped,
Output_section::output_offset, Output_section::output_address):
Use output section data maps to speed up searching.
(Output_section::find_starting_output_address): Add comments.
(Output_section::do_write,
Output_section::write_to_postprocessing_buffer): Do code-fill
generation as appropriate.
(Output_section::get_input_sections): Invalidate relaxed input section
map.
(Output_section::restore_states): Adjust type of checkpoint .
Invalidate relaxed input section map.
* output.h (Output_merge_base): New class declaration.
(Input_section_specifier): New class defintion.
(class Output_relaxed_input_section) Change base class to
Output_section_data_build.
(Output_relaxed_input_section::Output_relaxed_input_section): Adjust
base class initializer.
(Output_section::add_relaxed_input_section): New method declaration.
(Output_section::Input_section): Change visibility to protected.
(Output_section::Input_section::relobj,
Output_section::Input_section::shndx): Handle relaxed input sections.
Output_section::input_sections) Change visibility to protected. Also
define overload to return a non-const pointer.
(Output_section::Merge_section_properties): New class defintion.
(Output_section::Merge_section_by_properties_map,
Output_section::Output_section_data_by_input_section_map,
Output_section::Relaxation_map): New types.
(Output_section::relax_input_section): Rename method to
Output_section::convert_input_sections_to_relaxed_sections and change
interface to take a vector of relaxed section pointers.
(Output_section::find_merge_section,
Output_section::find_relaxed_input_section,
Output_section::build_relaxation_map,
Output_section::convert_input_sections_in_list_to_relaxed_sections):
New method declarations.
(Output_section::merge_section_map_
Output_section::merge_section_by_properties_map_,
Output_section::relaxed_input_section_map_,
Output_section::is_relaxed_input_section_map_valid_,
Output_section::generate_code_fills_at_write_): New data members.
* script-sections.cc
(Output_section_element_input::set_section_addresses): Call
current_data_size and addralign methods of relaxed input sections.
(Orphan_output_section::set_section_addresses): Call current_data_size
and addralign methods of relaxed input sections.
* symtab.cc (Symbol_table::compute_final_value): Extract template
from the body of Symbol_table::sized_finalize_symbol.
(Symbol_table::sized_finalized_symbol): Call
Symbol_table::compute_final_value.
* symtab.h (Symbol_table::Compute_final_value_status): New enum type.
(Symbol_table::compute_final_value): New templated method declaration.
* target.cc (Target::do_make_output_section): New method defintion.
* target.h (Target::make_output_section): New method declaration.
(Target::relax): Add more parameters for input objects, symbol table
and layout. Adjust call to do_relax.
(Target::do_make_output_section): New method declaration.
(Target::do_relax): Add parameters for input objects, symbol table
and layout.
2009-10-09 23:18:19 +00:00
|
|
|
|
2006-09-21 22:13:18 +00:00
|
|
|
// Return the section name.
|
|
|
|
const char*
|
|
|
|
name() const
|
|
|
|
{ return this->name_; }
|
|
|
|
|
|
|
|
// Return the section type.
|
|
|
|
elfcpp::Elf_Word
|
|
|
|
type() const
|
|
|
|
{ return this->type_; }
|
|
|
|
|
|
|
|
// Return the section flags.
|
|
|
|
elfcpp::Elf_Xword
|
|
|
|
flags() const
|
|
|
|
{ return this->flags_; }
|
|
|
|
|
2008-04-15 04:06:41 +00:00
|
|
|
// Update the output section flags based on input section flags.
|
|
|
|
void
|
2009-06-24 19:48:51 +00:00
|
|
|
update_flags_for_input_section(elfcpp::Elf_Xword flags);
|
2008-04-15 04:06:41 +00:00
|
|
|
|
2006-11-29 17:56:40 +00:00
|
|
|
// Return the entsize field.
|
|
|
|
uint64_t
|
|
|
|
entsize() const
|
|
|
|
{ return this->entsize_; }
|
|
|
|
|
2006-09-29 19:58:17 +00:00
|
|
|
// Set the entsize field.
|
|
|
|
void
|
2006-12-01 16:51:25 +00:00
|
|
|
set_entsize(uint64_t v);
|
2006-09-29 19:58:17 +00:00
|
|
|
|
2008-02-04 05:43:05 +00:00
|
|
|
// Set the load address.
|
|
|
|
void
|
2009-12-14 19:53:05 +00:00
|
|
|
set_load_address(uint64_t load_address)
|
2008-02-04 05:43:05 +00:00
|
|
|
{
|
2009-12-14 19:53:05 +00:00
|
|
|
this->load_address_ = load_address;
|
2008-02-04 05:43:05 +00:00
|
|
|
this->has_load_address_ = true;
|
|
|
|
}
|
|
|
|
|
2006-12-01 16:51:25 +00:00
|
|
|
// Set the link field to the output section index of a section.
|
|
|
|
void
|
2006-12-06 00:02:36 +00:00
|
|
|
set_link_section(const Output_data* od)
|
2006-12-01 16:51:25 +00:00
|
|
|
{
|
|
|
|
gold_assert(this->link_ == 0
|
|
|
|
&& !this->should_link_to_symtab_
|
|
|
|
&& !this->should_link_to_dynsym_);
|
|
|
|
this->link_section_ = od;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Set the link field to a constant.
|
2006-09-29 19:58:17 +00:00
|
|
|
void
|
|
|
|
set_link(unsigned int v)
|
2006-12-01 16:51:25 +00:00
|
|
|
{
|
|
|
|
gold_assert(this->link_section_ == NULL
|
|
|
|
&& !this->should_link_to_symtab_
|
|
|
|
&& !this->should_link_to_dynsym_);
|
|
|
|
this->link_ = v;
|
|
|
|
}
|
2006-09-29 19:58:17 +00:00
|
|
|
|
2006-12-01 16:51:25 +00:00
|
|
|
// Record that this section should link to the normal symbol table.
|
|
|
|
void
|
|
|
|
set_should_link_to_symtab()
|
|
|
|
{
|
|
|
|
gold_assert(this->link_section_ == NULL
|
|
|
|
&& this->link_ == 0
|
|
|
|
&& !this->should_link_to_dynsym_);
|
|
|
|
this->should_link_to_symtab_ = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Record that this section should link to the dynamic symbol table.
|
|
|
|
void
|
|
|
|
set_should_link_to_dynsym()
|
|
|
|
{
|
|
|
|
gold_assert(this->link_section_ == NULL
|
|
|
|
&& this->link_ == 0
|
|
|
|
&& !this->should_link_to_symtab_);
|
|
|
|
this->should_link_to_dynsym_ = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Return the info field.
|
|
|
|
unsigned int
|
|
|
|
info() const
|
|
|
|
{
|
2008-02-06 19:32:32 +00:00
|
|
|
gold_assert(this->info_section_ == NULL
|
|
|
|
&& this->info_symndx_ == NULL);
|
2006-12-01 16:51:25 +00:00
|
|
|
return this->info_;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Set the info field to the output section index of a section.
|
|
|
|
void
|
2008-02-06 19:32:32 +00:00
|
|
|
set_info_section(const Output_section* os)
|
2006-12-01 16:51:25 +00:00
|
|
|
{
|
2008-02-06 19:32:32 +00:00
|
|
|
gold_assert((this->info_section_ == NULL
|
|
|
|
|| (this->info_section_ == os
|
|
|
|
&& this->info_uses_section_index_))
|
|
|
|
&& this->info_symndx_ == NULL
|
|
|
|
&& this->info_ == 0);
|
|
|
|
this->info_section_ = os;
|
|
|
|
this->info_uses_section_index_= true;
|
2006-12-01 16:51:25 +00:00
|
|
|
}
|
|
|
|
|
2008-02-06 08:13:50 +00:00
|
|
|
// Set the info field to the symbol table index of a symbol.
|
|
|
|
void
|
|
|
|
set_info_symndx(const Symbol* sym)
|
|
|
|
{
|
2008-02-06 19:32:32 +00:00
|
|
|
gold_assert(this->info_section_ == NULL
|
|
|
|
&& (this->info_symndx_ == NULL
|
|
|
|
|| this->info_symndx_ == sym)
|
|
|
|
&& this->info_ == 0);
|
2008-02-06 08:13:50 +00:00
|
|
|
this->info_symndx_ = sym;
|
|
|
|
}
|
|
|
|
|
2008-02-06 19:32:32 +00:00
|
|
|
// Set the info field to the symbol table index of a section symbol.
|
|
|
|
void
|
|
|
|
set_info_section_symndx(const Output_section* os)
|
|
|
|
{
|
|
|
|
gold_assert((this->info_section_ == NULL
|
|
|
|
|| (this->info_section_ == os
|
|
|
|
&& !this->info_uses_section_index_))
|
|
|
|
&& this->info_symndx_ == NULL
|
|
|
|
&& this->info_ == 0);
|
|
|
|
this->info_section_ = os;
|
|
|
|
this->info_uses_section_index_ = false;
|
|
|
|
}
|
|
|
|
|
2006-12-01 16:51:25 +00:00
|
|
|
// Set the info field to a constant.
|
2006-09-29 19:58:17 +00:00
|
|
|
void
|
|
|
|
set_info(unsigned int v)
|
2006-12-01 16:51:25 +00:00
|
|
|
{
|
2008-02-06 19:32:32 +00:00
|
|
|
gold_assert(this->info_section_ == NULL
|
|
|
|
&& this->info_symndx_ == NULL
|
|
|
|
&& (this->info_ == 0
|
|
|
|
|| this->info_ == v));
|
2006-12-01 16:51:25 +00:00
|
|
|
this->info_ = v;
|
|
|
|
}
|
2006-09-29 19:58:17 +00:00
|
|
|
|
|
|
|
// Set the addralign field.
|
|
|
|
void
|
|
|
|
set_addralign(uint64_t v)
|
|
|
|
{ this->addralign_ = v; }
|
|
|
|
|
2008-04-19 18:30:58 +00:00
|
|
|
// Whether the output section index has been set.
|
|
|
|
bool
|
|
|
|
has_out_shndx() const
|
|
|
|
{ return this->out_shndx_ != -1U; }
|
|
|
|
|
2006-11-16 00:38:25 +00:00
|
|
|
// Indicate that we need a symtab index.
|
|
|
|
void
|
|
|
|
set_needs_symtab_index()
|
|
|
|
{ this->needs_symtab_index_ = true; }
|
|
|
|
|
|
|
|
// Return whether we need a symtab index.
|
|
|
|
bool
|
|
|
|
needs_symtab_index() const
|
|
|
|
{ return this->needs_symtab_index_; }
|
|
|
|
|
|
|
|
// Get the symtab index.
|
|
|
|
unsigned int
|
|
|
|
symtab_index() const
|
|
|
|
{
|
2006-11-29 17:56:40 +00:00
|
|
|
gold_assert(this->symtab_index_ != 0);
|
2006-11-16 00:38:25 +00:00
|
|
|
return this->symtab_index_;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Set the symtab index.
|
|
|
|
void
|
|
|
|
set_symtab_index(unsigned int index)
|
|
|
|
{
|
2006-11-29 17:56:40 +00:00
|
|
|
gold_assert(index != 0);
|
2006-11-16 00:38:25 +00:00
|
|
|
this->symtab_index_ = index;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Indicate that we need a dynsym index.
|
|
|
|
void
|
|
|
|
set_needs_dynsym_index()
|
|
|
|
{ this->needs_dynsym_index_ = true; }
|
|
|
|
|
|
|
|
// Return whether we need a dynsym index.
|
|
|
|
bool
|
|
|
|
needs_dynsym_index() const
|
|
|
|
{ return this->needs_dynsym_index_; }
|
|
|
|
|
|
|
|
// Get the dynsym index.
|
|
|
|
unsigned int
|
|
|
|
dynsym_index() const
|
|
|
|
{
|
2006-11-29 17:56:40 +00:00
|
|
|
gold_assert(this->dynsym_index_ != 0);
|
2006-11-16 00:38:25 +00:00
|
|
|
return this->dynsym_index_;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Set the dynsym index.
|
|
|
|
void
|
|
|
|
set_dynsym_index(unsigned int index)
|
|
|
|
{
|
2006-11-29 17:56:40 +00:00
|
|
|
gold_assert(index != 0);
|
2006-11-16 00:38:25 +00:00
|
|
|
this->dynsym_index_ = index;
|
|
|
|
}
|
|
|
|
|
2008-03-28 22:42:34 +00:00
|
|
|
// Return whether the input sections sections attachd to this output
|
|
|
|
// section may require sorting. This is used to handle constructor
|
|
|
|
// priorities compatibly with GNU ld.
|
|
|
|
bool
|
|
|
|
may_sort_attached_input_sections() const
|
|
|
|
{ return this->may_sort_attached_input_sections_; }
|
|
|
|
|
|
|
|
// Record that the input sections attached to this output section
|
|
|
|
// may require sorting.
|
|
|
|
void
|
|
|
|
set_may_sort_attached_input_sections()
|
|
|
|
{ this->may_sort_attached_input_sections_ = true; }
|
|
|
|
|
2010-06-01 23:37:58 +00:00
|
|
|
// Returns true if input sections must be sorted according to the
|
|
|
|
// order in which their name appear in the --section-ordering-file.
|
|
|
|
bool
|
|
|
|
input_section_order_specified()
|
|
|
|
{ return this->input_section_order_specified_; }
|
|
|
|
|
|
|
|
// Record that input sections must be sorted as some of their names
|
|
|
|
// match the patterns specified through --section-ordering-file.
|
|
|
|
void
|
|
|
|
set_input_section_order_specified()
|
|
|
|
{ this->input_section_order_specified_ = true; }
|
|
|
|
|
2008-03-28 22:42:34 +00:00
|
|
|
// Return whether the input sections attached to this output section
|
|
|
|
// require sorting. This is used to handle constructor priorities
|
|
|
|
// compatibly with GNU ld.
|
|
|
|
bool
|
|
|
|
must_sort_attached_input_sections() const
|
|
|
|
{ return this->must_sort_attached_input_sections_; }
|
|
|
|
|
|
|
|
// Record that the input sections attached to this output section
|
|
|
|
// require sorting.
|
|
|
|
void
|
|
|
|
set_must_sort_attached_input_sections()
|
|
|
|
{ this->must_sort_attached_input_sections_ = true; }
|
|
|
|
|
2010-08-03 Ian Lance Taylor <iant@google.com>
PR 11805
* layout.h (enum Output_section_order): Define.
(class Layout): Update declarations.
* layout.cc (Layout::get_output_section): Add order parameter.
Remove is_interp, is_dynamic_linker_section, is_last_relro, and
is_first_non_relro parameters. Change all callers.
(Layout::choose_output_section): Likewise.
(Layout::add_output_section_data): Likewise.
(Layout::make_output_section): Likewise. Set order.
(Layout::default_section_order): New function.
(Layout::layout_eh_frame): Call add_output_section_to_nonload.
* output.cc (Output_section::Output_section): Initialize order_.
Don't initialize deleted fields.
(Output_segment::Output_segment): Don't initialize deleted
fields.
(Output_segment::add_output_section_to_load): New function
replacing add_output_section. Change all callers to call this or
add_output_section_to_nonload.
(Output_segment::add_output_section_to_nonload): New function.
(Output_segment::remove_output_section): Rewrite.
(Output_segment::add_initial_output_data): Likewise.
(Output_segment::has_any_data_sections): Likewise.
(Output_segment::is_first_section_relro): Likewise.
(Output_segment::maximum_alignment): Likewise.
(Output_segment::has_dynamic_reloc): New function replacing
dynamic_reloc_count. Change all callers.
(Output_segment::has_dynamic_reloc_list): New function replacing
dynamic_reloc_count_list. Change all callers.
(Output_segment::set_section_addresses): Rewrite.
(Output_segment::set_offset): Rewrite.
(Output_segment::find_first_and_last_list): Remove.
(Output_segment::set_tls_offsets): Rewrite.
(Output_segment::first_section_load_address): Likewise.
(Output_segment::output_section_count): Likewise.
(Output_segment::section_with_lowest_load_address): Likewise.
(Output_segment::write_section_headers): Likewise.
(Output_segment::print_sections_to_map): Likewise.
* output.h (class Output_data): Remove dynamic_reloc_count_
field. Add has_dynamic_reloc_ field. Make bools into bitfields.
(Output_data::add_dynamic_reloc): Rewrite.
(Output_data::has_dynamic_reloc): New function.
(Output_data::dynamic_reloc_count): Remove.
(class Output_section): Add order_ field. Remvoe is_relro_local_,
is_last_relro_, is_first_non_relro_, is_interp_,
is_dynamic_linker_section_ fields. Add order and set_order
functions. Remove is_relro_local, set_is_relro_local,
is_last_relro, set_is_last_relro, is_first_non_relro,
set_is_first_non_relro functions, is_interp, set_is_interp,
is_dynamic_linker_section, and set_is_dynamic_linker_section
functions.
(class Output_segment): Change Output_data_list from std::list to
std:;vector. Add output_lists_ field. Remove output_data_ and
output_bss_ fields. Update declarations.
2010-08-03 14:07:13 +00:00
|
|
|
// Get the order in which this section appears in the PT_LOAD output
|
|
|
|
// segment.
|
|
|
|
Output_section_order
|
|
|
|
order() const
|
|
|
|
{ return this->order_; }
|
|
|
|
|
|
|
|
// Set the order for this section.
|
|
|
|
void
|
|
|
|
set_order(Output_section_order order)
|
|
|
|
{ this->order_ = order; }
|
|
|
|
|
2008-05-20 04:00:47 +00:00
|
|
|
// Return whether this section holds relro data--data which has
|
|
|
|
// dynamic relocations but which may be marked read-only after the
|
|
|
|
// dynamic relocations have been completed.
|
|
|
|
bool
|
|
|
|
is_relro() const
|
|
|
|
{ return this->is_relro_; }
|
|
|
|
|
|
|
|
// Record that this section holds relro data.
|
|
|
|
void
|
|
|
|
set_is_relro()
|
|
|
|
{ this->is_relro_ = true; }
|
|
|
|
|
2008-08-13 07:37:46 +00:00
|
|
|
// Record that this section does not hold relro data.
|
|
|
|
void
|
|
|
|
clear_is_relro()
|
|
|
|
{ this->is_relro_ = false; }
|
|
|
|
|
2009-06-22 06:51:53 +00:00
|
|
|
// True if this is a small section: a section which holds small
|
|
|
|
// variables.
|
|
|
|
bool
|
|
|
|
is_small_section() const
|
|
|
|
{ return this->is_small_section_; }
|
|
|
|
|
|
|
|
// Record that this is a small section.
|
|
|
|
void
|
|
|
|
set_is_small_section()
|
|
|
|
{ this->is_small_section_ = true; }
|
|
|
|
|
|
|
|
// True if this is a large section: a section which holds large
|
|
|
|
// variables.
|
|
|
|
bool
|
|
|
|
is_large_section() const
|
|
|
|
{ return this->is_large_section_; }
|
|
|
|
|
|
|
|
// Record that this is a large section.
|
|
|
|
void
|
|
|
|
set_is_large_section()
|
|
|
|
{ this->is_large_section_ = true; }
|
|
|
|
|
|
|
|
// True if this is a large data (not BSS) section.
|
|
|
|
bool
|
|
|
|
is_large_data_section()
|
|
|
|
{ return this->is_large_section_ && this->type_ != elfcpp::SHT_NOBITS; }
|
|
|
|
|
2007-11-09 07:00:15 +00:00
|
|
|
// Return whether this section should be written after all the input
|
|
|
|
// sections are complete.
|
|
|
|
bool
|
|
|
|
after_input_sections() const
|
|
|
|
{ return this->after_input_sections_; }
|
|
|
|
|
|
|
|
// Record that this section should be written after all the input
|
|
|
|
// sections are complete.
|
|
|
|
void
|
|
|
|
set_after_input_sections()
|
|
|
|
{ this->after_input_sections_ = true; }
|
|
|
|
|
2007-11-29 20:10:17 +00:00
|
|
|
// Return whether this section requires postprocessing after all
|
|
|
|
// relocations have been applied.
|
|
|
|
bool
|
|
|
|
requires_postprocessing() const
|
|
|
|
{ return this->requires_postprocessing_; }
|
|
|
|
|
2007-12-01 06:34:12 +00:00
|
|
|
// If a section requires postprocessing, return the buffer to use.
|
|
|
|
unsigned char*
|
|
|
|
postprocessing_buffer() const
|
|
|
|
{
|
|
|
|
gold_assert(this->postprocessing_buffer_ != NULL);
|
|
|
|
return this->postprocessing_buffer_;
|
|
|
|
}
|
|
|
|
|
|
|
|
// If a section requires postprocessing, create the buffer to use.
|
2007-11-29 20:10:17 +00:00
|
|
|
void
|
2007-12-01 06:34:12 +00:00
|
|
|
create_postprocessing_buffer();
|
|
|
|
|
|
|
|
// If a section requires postprocessing, this is the size of the
|
|
|
|
// buffer to which relocations should be applied.
|
|
|
|
off_t
|
|
|
|
postprocessing_buffer_size() const
|
|
|
|
{ return this->current_data_size_for_child(); }
|
2007-11-29 20:10:17 +00:00
|
|
|
|
2008-02-06 19:32:32 +00:00
|
|
|
// Modify the section name. This is only permitted for an
|
|
|
|
// unallocated section, and only before the size has been finalized.
|
|
|
|
// Otherwise the name will not get into Layout::namepool_.
|
|
|
|
void
|
|
|
|
set_name(const char* newname)
|
|
|
|
{
|
|
|
|
gold_assert((this->flags_ & elfcpp::SHF_ALLOC) == 0);
|
|
|
|
gold_assert(!this->is_data_size_valid());
|
|
|
|
this->name_ = newname;
|
|
|
|
}
|
|
|
|
|
2007-11-09 07:00:15 +00:00
|
|
|
// Return whether the offset OFFSET in the input section SHNDX in
|
|
|
|
// object OBJECT is being included in the link.
|
|
|
|
bool
|
|
|
|
is_input_address_mapped(const Relobj* object, unsigned int shndx,
|
|
|
|
off_t offset) const;
|
|
|
|
|
|
|
|
// Return the offset within the output section of OFFSET relative to
|
|
|
|
// the start of input section SHNDX in object OBJECT.
|
2007-12-18 00:48:04 +00:00
|
|
|
section_offset_type
|
|
|
|
output_offset(const Relobj* object, unsigned int shndx,
|
|
|
|
section_offset_type offset) const;
|
2007-11-09 07:00:15 +00:00
|
|
|
|
2007-05-16 17:42:48 +00:00
|
|
|
// Return the output virtual address of OFFSET relative to the start
|
|
|
|
// of input section SHNDX in object OBJECT.
|
|
|
|
uint64_t
|
|
|
|
output_address(const Relobj* object, unsigned int shndx,
|
|
|
|
off_t offset) const;
|
|
|
|
|
2009-02-28 00:12:26 +00:00
|
|
|
// Look for the merged section for input section SHNDX in object
|
|
|
|
// OBJECT. If found, return true, and set *ADDR to the address of
|
|
|
|
// the start of the merged section. This is not necessary the
|
|
|
|
// output offset corresponding to input offset 0 in the section,
|
|
|
|
// since the section may be mapped arbitrarily.
|
|
|
|
bool
|
|
|
|
find_starting_output_address(const Relobj* object, unsigned int shndx,
|
|
|
|
uint64_t* addr) const;
|
2007-12-21 21:19:45 +00:00
|
|
|
|
2008-02-04 05:43:05 +00:00
|
|
|
// Record that this output section was found in the SECTIONS clause
|
|
|
|
// of a linker script.
|
|
|
|
void
|
|
|
|
set_found_in_sections_clause()
|
|
|
|
{ this->found_in_sections_clause_ = true; }
|
|
|
|
|
|
|
|
// Return whether this output section was found in the SECTIONS
|
|
|
|
// clause of a linker script.
|
|
|
|
bool
|
|
|
|
found_in_sections_clause() const
|
|
|
|
{ return this->found_in_sections_clause_; }
|
|
|
|
|
2007-11-29 20:10:17 +00:00
|
|
|
// Write the section header into *OPHDR.
|
|
|
|
template<int size, bool big_endian>
|
|
|
|
void
|
|
|
|
write_header(const Layout*, const Stringpool*,
|
|
|
|
elfcpp::Shdr_write<size, big_endian>*) const;
|
|
|
|
|
2008-02-04 05:43:05 +00:00
|
|
|
// The next few calls are for linker script support.
|
|
|
|
|
2006-11-03 18:26:11 +00:00
|
|
|
// In some cases we need to keep a list of the input sections
|
|
|
|
// associated with this output section. We only need the list if we
|
|
|
|
// might have to change the offsets of the input section within the
|
|
|
|
// output section after we add the input section. The ordinary
|
|
|
|
// input sections will be written out when we process the object
|
|
|
|
// file, and as such we don't need to track them here. We do need
|
|
|
|
// to track Output_section_data objects here. We store instances of
|
|
|
|
// this structure in a std::vector, so it must be a POD. There can
|
|
|
|
// be many instances of this structure, so we use a union to save
|
|
|
|
// some space.
|
|
|
|
class Input_section
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
Input_section()
|
2007-05-16 17:42:48 +00:00
|
|
|
: shndx_(0), p2align_(0)
|
|
|
|
{
|
|
|
|
this->u1_.data_size = 0;
|
|
|
|
this->u2_.object = NULL;
|
|
|
|
}
|
2006-11-03 18:26:11 +00:00
|
|
|
|
2007-05-16 17:42:48 +00:00
|
|
|
// For an ordinary input section.
|
2009-12-14 19:53:05 +00:00
|
|
|
Input_section(Relobj* object, unsigned int shndx, off_t data_size,
|
|
|
|
uint64_t addralign)
|
|
|
|
: shndx_(shndx),
|
2010-06-01 23:37:58 +00:00
|
|
|
p2align_(ffsll(static_cast<long long>(addralign))),
|
|
|
|
section_order_index_(0)
|
2006-11-03 18:26:11 +00:00
|
|
|
{
|
2009-12-14 19:53:05 +00:00
|
|
|
gold_assert(shndx != OUTPUT_SECTION_CODE
|
|
|
|
&& shndx != MERGE_DATA_SECTION_CODE
|
|
|
|
&& shndx != MERGE_STRING_SECTION_CODE
|
|
|
|
&& shndx != RELAXED_INPUT_SECTION_CODE);
|
|
|
|
this->u1_.data_size = data_size;
|
2007-05-16 17:42:48 +00:00
|
|
|
this->u2_.object = object;
|
2006-11-03 18:26:11 +00:00
|
|
|
}
|
|
|
|
|
2007-05-16 17:42:48 +00:00
|
|
|
// For a non-merge output section.
|
2006-11-03 18:26:11 +00:00
|
|
|
Input_section(Output_section_data* posd)
|
2010-06-01 23:37:58 +00:00
|
|
|
: shndx_(OUTPUT_SECTION_CODE), p2align_(0),
|
|
|
|
section_order_index_(0)
|
2007-05-16 17:42:48 +00:00
|
|
|
{
|
|
|
|
this->u1_.data_size = 0;
|
|
|
|
this->u2_.posd = posd;
|
|
|
|
}
|
|
|
|
|
|
|
|
// For a merge section.
|
|
|
|
Input_section(Output_section_data* posd, bool is_string, uint64_t entsize)
|
|
|
|
: shndx_(is_string
|
|
|
|
? MERGE_STRING_SECTION_CODE
|
|
|
|
: MERGE_DATA_SECTION_CODE),
|
2010-06-01 23:37:58 +00:00
|
|
|
p2align_(0),
|
|
|
|
section_order_index_(0)
|
2007-05-16 17:42:48 +00:00
|
|
|
{
|
|
|
|
this->u1_.entsize = entsize;
|
|
|
|
this->u2_.posd = posd;
|
|
|
|
}
|
2006-11-03 18:26:11 +00:00
|
|
|
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 01:10:38 +00:00
|
|
|
// For a relaxed input section.
|
2010-08-25 08:36:54 +00:00
|
|
|
Input_section(Output_relaxed_input_section* psection)
|
2010-06-01 23:37:58 +00:00
|
|
|
: shndx_(RELAXED_INPUT_SECTION_CODE), p2align_(0),
|
|
|
|
section_order_index_(0)
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 01:10:38 +00:00
|
|
|
{
|
|
|
|
this->u1_.data_size = 0;
|
|
|
|
this->u2_.poris = psection;
|
|
|
|
}
|
|
|
|
|
2010-06-01 23:37:58 +00:00
|
|
|
unsigned int
|
|
|
|
section_order_index() const
|
|
|
|
{
|
|
|
|
return this->section_order_index_;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
set_section_order_index(unsigned int number)
|
|
|
|
{
|
|
|
|
this->section_order_index_ = number;
|
|
|
|
}
|
|
|
|
|
2006-11-03 18:26:11 +00:00
|
|
|
// The required alignment.
|
|
|
|
uint64_t
|
|
|
|
addralign() const
|
2006-11-29 17:56:40 +00:00
|
|
|
{
|
2010-05-19 07:09:36 +00:00
|
|
|
if (this->p2align_ != 0)
|
|
|
|
return static_cast<uint64_t>(1) << (this->p2align_ - 1);
|
|
|
|
else if (!this->is_input_section())
|
2008-06-18 04:39:41 +00:00
|
|
|
return this->u2_.posd->addralign();
|
2010-05-19 07:09:36 +00:00
|
|
|
else
|
|
|
|
return 0;
|
2006-11-29 17:56:40 +00:00
|
|
|
}
|
2006-11-03 18:26:11 +00:00
|
|
|
|
2010-05-19 07:09:36 +00:00
|
|
|
// Set the required alignment, which must be either 0 or a power of 2.
|
|
|
|
// For input sections that are sub-classes of Output_section_data, a
|
|
|
|
// alignment of zero means asking the underlying object for alignment.
|
|
|
|
void
|
|
|
|
set_addralign(uint64_t addralign)
|
|
|
|
{
|
|
|
|
if (addralign == 0)
|
|
|
|
this->p2align_ = 0;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
gold_assert((addralign & (addralign - 1)) == 0);
|
|
|
|
this->p2align_ = ffsll(static_cast<long long>(addralign));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-04-12 00:44:48 +00:00
|
|
|
// Return the current required size, without finalization.
|
|
|
|
off_t
|
|
|
|
current_data_size() const;
|
|
|
|
|
2006-11-03 18:26:11 +00:00
|
|
|
// Return the required size.
|
|
|
|
off_t
|
|
|
|
data_size() const;
|
|
|
|
|
2008-02-04 05:43:05 +00:00
|
|
|
// Whether this is an input section.
|
|
|
|
bool
|
|
|
|
is_input_section() const
|
|
|
|
{
|
|
|
|
return (this->shndx_ != OUTPUT_SECTION_CODE
|
|
|
|
&& this->shndx_ != MERGE_DATA_SECTION_CODE
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 01:10:38 +00:00
|
|
|
&& this->shndx_ != MERGE_STRING_SECTION_CODE
|
|
|
|
&& this->shndx_ != RELAXED_INPUT_SECTION_CODE);
|
2008-02-04 05:43:05 +00:00
|
|
|
}
|
|
|
|
|
2007-05-16 17:42:48 +00:00
|
|
|
// Return whether this is a merge section which matches the
|
|
|
|
// parameters.
|
|
|
|
bool
|
2007-10-18 17:46:23 +00:00
|
|
|
is_merge_section(bool is_string, uint64_t entsize,
|
2009-12-14 19:53:05 +00:00
|
|
|
uint64_t addralign) const
|
2007-05-16 17:42:48 +00:00
|
|
|
{
|
|
|
|
return (this->shndx_ == (is_string
|
|
|
|
? MERGE_STRING_SECTION_CODE
|
|
|
|
: MERGE_DATA_SECTION_CODE)
|
2007-10-18 17:46:23 +00:00
|
|
|
&& this->u1_.entsize == entsize
|
2009-12-14 19:53:05 +00:00
|
|
|
&& this->addralign() == addralign);
|
2007-05-16 17:42:48 +00:00
|
|
|
}
|
|
|
|
|
2010-05-23 Doug Kwan <dougkwan@google.com>
* arm.cc (Arm_input_section::do_output_offset): Use convert_types
instead of a cast.
(Target_arm::apply_cortex_a8_workaround): Rewrite a conditional branch
with a direct branch, not a conditional branch, to a stub.
* merge.cc (Output_merge_base::record_input_section): New method
defintion.
(Output_merge_data::do_add_input_section): Record input section if
keeps-input-sections flag is set.
(Output_merge_string::do_add_input_section): Ditto.
* merge.h (Output_merge_base::Output_merge_base): Initialize new data
members KEEPS_INPUT_SECTIONS_, FIRST_RELOBJ_, FIRST_SHNDX_ and
INPUT_SECTIONS_.
(Output_merge_base::keeps_input_sections,
Output_merge_base::set_keeps_input_sections,
Output_merge_base::first_relobj, Output_merge_base::first_shndx): New
method definitions.
(Output_merge_base::Input_sections): New type declaration.
(Output_merge_base::input_sections_begin,
Output_merge_base::input_sections_end,
Output_merge_base::do_set_keeps_input_sections): New method definitions.
(Output_merge_base::bool keeps_input_sections_,
Output_merge_base::first_relobj_, Output_merge_base::first_shndx_,
Output_merge_base::input_sections_): New data members.
(Output_merge_data::do_set_keeps_input_sections): New method
defintion.
(Output_merge_string::do_set_keeps_input_sections): Ditto.
* output.cc (Output_section::Input_section::relobj): Move method
defintion from class declaration to here and handle merge sections.
(Output_section::Input_section::shndx): Ditto.
(Output_section::Output_section): Remove initializations of removed
data members and initialize new data member LOOKUP_MAPS_.
(Output_section::add_input_section): Set keeps-input-sections flag
for a newly created merge output section as appropriate. Adjust code
to use Output_section_lookup_maps class.
(Output_section::add_relaxed_input_section): Adjst code for lookup
maps code refactoring.
(Output_section::add_merge_input_section): Add a new parameter
KEEPS_INPUT_SECTION. Adjust code to use Output_section_lookup_maps
class. If adding input section to a newly created merge output
section fails, remove the new merge section.
(Output_section::convert_input_sections_in_list_to_relaxed_input_sections):
Adjust code for use of the Output_section_lookup_maps class.
(Output_section::find_merge_section): Ditto.
(Output_section::build_lookup_maps): New method defintion.
(Output_section::find_relaxed_input_section): Adjust code to use
Output_section_lookup_maps class.
(Output_section::get_input_sections): Export merge sections. Adjust
code to use Output_section_lookup_maps class.
(Output_section:::add_script_input_section): Adjust code to use
Output_section_lookup_maps class. Update lookup maps for merge
sections also.
(Output_section::discard_states): Use Output_section_lookup_maps.
(Output_section::restore_states): Same.
* output.h (Merge_section_properties): Move class defintion out of
Output_section.
(Output_section_lookup_maps): New class.
(Output_section::Input_section::is_merge_section): New method
defintion.
(Output_section::Input_section::relobj): Move defintion out of class
defintion. Declare method only.
(Output_section::Input_section::shndx): Ditto.
(Output_section::Input_section::output_merge_base): New method defintion.
(Output_section::Input_section::u2_.pomb): New union field.
(Output_section::Merge_section_by_properties_map,
Output_section::Output_section_data_by_input_section_map,
Output_section::Ouptut_relaxed_input_section_by_input_section_map):
Remove types.
(Output_section::add_merge_input_section): Add new parameter
KEEPS_INPUT_SECTIONS.
(Output_section::build_lookup_maps): New method declaration.
(Output_section::merge_section_map_,
Output_section::merge_section_by_properties_map_,
Output_section::relaxed_input_section_map_,
Output_section::is_relaxed_input_section_map_valid_): Remove data
members.
(Output_section::lookup_maps_): New data member.
2010-05-23 07:43:39 +00:00
|
|
|
// Return whether this is a merge section for some input section.
|
|
|
|
bool
|
|
|
|
is_merge_section() const
|
|
|
|
{
|
|
|
|
return (this->shndx_ == MERGE_DATA_SECTION_CODE
|
|
|
|
|| this->shndx_ == MERGE_STRING_SECTION_CODE);
|
|
|
|
}
|
|
|
|
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 01:10:38 +00:00
|
|
|
// Return whether this is a relaxed input section.
|
|
|
|
bool
|
|
|
|
is_relaxed_input_section() const
|
|
|
|
{ return this->shndx_ == RELAXED_INPUT_SECTION_CODE; }
|
|
|
|
|
|
|
|
// Return whether this is a generic Output_section_data.
|
|
|
|
bool
|
|
|
|
is_output_section_data() const
|
|
|
|
{
|
|
|
|
return this->shndx_ == OUTPUT_SECTION_CODE;
|
|
|
|
}
|
|
|
|
|
2008-02-04 05:43:05 +00:00
|
|
|
// Return the object for an input section.
|
|
|
|
Relobj*
|
2010-05-23 Doug Kwan <dougkwan@google.com>
* arm.cc (Arm_input_section::do_output_offset): Use convert_types
instead of a cast.
(Target_arm::apply_cortex_a8_workaround): Rewrite a conditional branch
with a direct branch, not a conditional branch, to a stub.
* merge.cc (Output_merge_base::record_input_section): New method
defintion.
(Output_merge_data::do_add_input_section): Record input section if
keeps-input-sections flag is set.
(Output_merge_string::do_add_input_section): Ditto.
* merge.h (Output_merge_base::Output_merge_base): Initialize new data
members KEEPS_INPUT_SECTIONS_, FIRST_RELOBJ_, FIRST_SHNDX_ and
INPUT_SECTIONS_.
(Output_merge_base::keeps_input_sections,
Output_merge_base::set_keeps_input_sections,
Output_merge_base::first_relobj, Output_merge_base::first_shndx): New
method definitions.
(Output_merge_base::Input_sections): New type declaration.
(Output_merge_base::input_sections_begin,
Output_merge_base::input_sections_end,
Output_merge_base::do_set_keeps_input_sections): New method definitions.
(Output_merge_base::bool keeps_input_sections_,
Output_merge_base::first_relobj_, Output_merge_base::first_shndx_,
Output_merge_base::input_sections_): New data members.
(Output_merge_data::do_set_keeps_input_sections): New method
defintion.
(Output_merge_string::do_set_keeps_input_sections): Ditto.
* output.cc (Output_section::Input_section::relobj): Move method
defintion from class declaration to here and handle merge sections.
(Output_section::Input_section::shndx): Ditto.
(Output_section::Output_section): Remove initializations of removed
data members and initialize new data member LOOKUP_MAPS_.
(Output_section::add_input_section): Set keeps-input-sections flag
for a newly created merge output section as appropriate. Adjust code
to use Output_section_lookup_maps class.
(Output_section::add_relaxed_input_section): Adjst code for lookup
maps code refactoring.
(Output_section::add_merge_input_section): Add a new parameter
KEEPS_INPUT_SECTION. Adjust code to use Output_section_lookup_maps
class. If adding input section to a newly created merge output
section fails, remove the new merge section.
(Output_section::convert_input_sections_in_list_to_relaxed_input_sections):
Adjust code for use of the Output_section_lookup_maps class.
(Output_section::find_merge_section): Ditto.
(Output_section::build_lookup_maps): New method defintion.
(Output_section::find_relaxed_input_section): Adjust code to use
Output_section_lookup_maps class.
(Output_section::get_input_sections): Export merge sections. Adjust
code to use Output_section_lookup_maps class.
(Output_section:::add_script_input_section): Adjust code to use
Output_section_lookup_maps class. Update lookup maps for merge
sections also.
(Output_section::discard_states): Use Output_section_lookup_maps.
(Output_section::restore_states): Same.
* output.h (Merge_section_properties): Move class defintion out of
Output_section.
(Output_section_lookup_maps): New class.
(Output_section::Input_section::is_merge_section): New method
defintion.
(Output_section::Input_section::relobj): Move defintion out of class
defintion. Declare method only.
(Output_section::Input_section::shndx): Ditto.
(Output_section::Input_section::output_merge_base): New method defintion.
(Output_section::Input_section::u2_.pomb): New union field.
(Output_section::Merge_section_by_properties_map,
Output_section::Output_section_data_by_input_section_map,
Output_section::Ouptut_relaxed_input_section_by_input_section_map):
Remove types.
(Output_section::add_merge_input_section): Add new parameter
KEEPS_INPUT_SECTIONS.
(Output_section::build_lookup_maps): New method declaration.
(Output_section::merge_section_map_,
Output_section::merge_section_by_properties_map_,
Output_section::relaxed_input_section_map_,
Output_section::is_relaxed_input_section_map_valid_): Remove data
members.
(Output_section::lookup_maps_): New data member.
2010-05-23 07:43:39 +00:00
|
|
|
relobj() const;
|
2008-02-04 05:43:05 +00:00
|
|
|
|
|
|
|
// Return the input section index for an input section.
|
|
|
|
unsigned int
|
2010-05-23 Doug Kwan <dougkwan@google.com>
* arm.cc (Arm_input_section::do_output_offset): Use convert_types
instead of a cast.
(Target_arm::apply_cortex_a8_workaround): Rewrite a conditional branch
with a direct branch, not a conditional branch, to a stub.
* merge.cc (Output_merge_base::record_input_section): New method
defintion.
(Output_merge_data::do_add_input_section): Record input section if
keeps-input-sections flag is set.
(Output_merge_string::do_add_input_section): Ditto.
* merge.h (Output_merge_base::Output_merge_base): Initialize new data
members KEEPS_INPUT_SECTIONS_, FIRST_RELOBJ_, FIRST_SHNDX_ and
INPUT_SECTIONS_.
(Output_merge_base::keeps_input_sections,
Output_merge_base::set_keeps_input_sections,
Output_merge_base::first_relobj, Output_merge_base::first_shndx): New
method definitions.
(Output_merge_base::Input_sections): New type declaration.
(Output_merge_base::input_sections_begin,
Output_merge_base::input_sections_end,
Output_merge_base::do_set_keeps_input_sections): New method definitions.
(Output_merge_base::bool keeps_input_sections_,
Output_merge_base::first_relobj_, Output_merge_base::first_shndx_,
Output_merge_base::input_sections_): New data members.
(Output_merge_data::do_set_keeps_input_sections): New method
defintion.
(Output_merge_string::do_set_keeps_input_sections): Ditto.
* output.cc (Output_section::Input_section::relobj): Move method
defintion from class declaration to here and handle merge sections.
(Output_section::Input_section::shndx): Ditto.
(Output_section::Output_section): Remove initializations of removed
data members and initialize new data member LOOKUP_MAPS_.
(Output_section::add_input_section): Set keeps-input-sections flag
for a newly created merge output section as appropriate. Adjust code
to use Output_section_lookup_maps class.
(Output_section::add_relaxed_input_section): Adjst code for lookup
maps code refactoring.
(Output_section::add_merge_input_section): Add a new parameter
KEEPS_INPUT_SECTION. Adjust code to use Output_section_lookup_maps
class. If adding input section to a newly created merge output
section fails, remove the new merge section.
(Output_section::convert_input_sections_in_list_to_relaxed_input_sections):
Adjust code for use of the Output_section_lookup_maps class.
(Output_section::find_merge_section): Ditto.
(Output_section::build_lookup_maps): New method defintion.
(Output_section::find_relaxed_input_section): Adjust code to use
Output_section_lookup_maps class.
(Output_section::get_input_sections): Export merge sections. Adjust
code to use Output_section_lookup_maps class.
(Output_section:::add_script_input_section): Adjust code to use
Output_section_lookup_maps class. Update lookup maps for merge
sections also.
(Output_section::discard_states): Use Output_section_lookup_maps.
(Output_section::restore_states): Same.
* output.h (Merge_section_properties): Move class defintion out of
Output_section.
(Output_section_lookup_maps): New class.
(Output_section::Input_section::is_merge_section): New method
defintion.
(Output_section::Input_section::relobj): Move defintion out of class
defintion. Declare method only.
(Output_section::Input_section::shndx): Ditto.
(Output_section::Input_section::output_merge_base): New method defintion.
(Output_section::Input_section::u2_.pomb): New union field.
(Output_section::Merge_section_by_properties_map,
Output_section::Output_section_data_by_input_section_map,
Output_section::Ouptut_relaxed_input_section_by_input_section_map):
Remove types.
(Output_section::add_merge_input_section): Add new parameter
KEEPS_INPUT_SECTIONS.
(Output_section::build_lookup_maps): New method declaration.
(Output_section::merge_section_map_,
Output_section::merge_section_by_properties_map_,
Output_section::relaxed_input_section_map_,
Output_section::is_relaxed_input_section_map_valid_): Remove data
members.
(Output_section::lookup_maps_): New data member.
2010-05-23 07:43:39 +00:00
|
|
|
shndx() const;
|
2008-02-04 05:43:05 +00:00
|
|
|
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 01:10:38 +00:00
|
|
|
// For non-input-sections, return the associated Output_section_data
|
|
|
|
// object.
|
|
|
|
Output_section_data*
|
|
|
|
output_section_data() const
|
|
|
|
{
|
|
|
|
gold_assert(!this->is_input_section());
|
|
|
|
return this->u2_.posd;
|
|
|
|
}
|
|
|
|
|
2010-05-23 Doug Kwan <dougkwan@google.com>
* arm.cc (Arm_input_section::do_output_offset): Use convert_types
instead of a cast.
(Target_arm::apply_cortex_a8_workaround): Rewrite a conditional branch
with a direct branch, not a conditional branch, to a stub.
* merge.cc (Output_merge_base::record_input_section): New method
defintion.
(Output_merge_data::do_add_input_section): Record input section if
keeps-input-sections flag is set.
(Output_merge_string::do_add_input_section): Ditto.
* merge.h (Output_merge_base::Output_merge_base): Initialize new data
members KEEPS_INPUT_SECTIONS_, FIRST_RELOBJ_, FIRST_SHNDX_ and
INPUT_SECTIONS_.
(Output_merge_base::keeps_input_sections,
Output_merge_base::set_keeps_input_sections,
Output_merge_base::first_relobj, Output_merge_base::first_shndx): New
method definitions.
(Output_merge_base::Input_sections): New type declaration.
(Output_merge_base::input_sections_begin,
Output_merge_base::input_sections_end,
Output_merge_base::do_set_keeps_input_sections): New method definitions.
(Output_merge_base::bool keeps_input_sections_,
Output_merge_base::first_relobj_, Output_merge_base::first_shndx_,
Output_merge_base::input_sections_): New data members.
(Output_merge_data::do_set_keeps_input_sections): New method
defintion.
(Output_merge_string::do_set_keeps_input_sections): Ditto.
* output.cc (Output_section::Input_section::relobj): Move method
defintion from class declaration to here and handle merge sections.
(Output_section::Input_section::shndx): Ditto.
(Output_section::Output_section): Remove initializations of removed
data members and initialize new data member LOOKUP_MAPS_.
(Output_section::add_input_section): Set keeps-input-sections flag
for a newly created merge output section as appropriate. Adjust code
to use Output_section_lookup_maps class.
(Output_section::add_relaxed_input_section): Adjst code for lookup
maps code refactoring.
(Output_section::add_merge_input_section): Add a new parameter
KEEPS_INPUT_SECTION. Adjust code to use Output_section_lookup_maps
class. If adding input section to a newly created merge output
section fails, remove the new merge section.
(Output_section::convert_input_sections_in_list_to_relaxed_input_sections):
Adjust code for use of the Output_section_lookup_maps class.
(Output_section::find_merge_section): Ditto.
(Output_section::build_lookup_maps): New method defintion.
(Output_section::find_relaxed_input_section): Adjust code to use
Output_section_lookup_maps class.
(Output_section::get_input_sections): Export merge sections. Adjust
code to use Output_section_lookup_maps class.
(Output_section:::add_script_input_section): Adjust code to use
Output_section_lookup_maps class. Update lookup maps for merge
sections also.
(Output_section::discard_states): Use Output_section_lookup_maps.
(Output_section::restore_states): Same.
* output.h (Merge_section_properties): Move class defintion out of
Output_section.
(Output_section_lookup_maps): New class.
(Output_section::Input_section::is_merge_section): New method
defintion.
(Output_section::Input_section::relobj): Move defintion out of class
defintion. Declare method only.
(Output_section::Input_section::shndx): Ditto.
(Output_section::Input_section::output_merge_base): New method defintion.
(Output_section::Input_section::u2_.pomb): New union field.
(Output_section::Merge_section_by_properties_map,
Output_section::Output_section_data_by_input_section_map,
Output_section::Ouptut_relaxed_input_section_by_input_section_map):
Remove types.
(Output_section::add_merge_input_section): Add new parameter
KEEPS_INPUT_SECTIONS.
(Output_section::build_lookup_maps): New method declaration.
(Output_section::merge_section_map_,
Output_section::merge_section_by_properties_map_,
Output_section::relaxed_input_section_map_,
Output_section::is_relaxed_input_section_map_valid_): Remove data
members.
(Output_section::lookup_maps_): New data member.
2010-05-23 07:43:39 +00:00
|
|
|
// For a merge section, return the Output_merge_base pointer.
|
|
|
|
Output_merge_base*
|
|
|
|
output_merge_base() const
|
|
|
|
{
|
|
|
|
gold_assert(this->is_merge_section());
|
|
|
|
return this->u2_.pomb;
|
|
|
|
}
|
|
|
|
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 01:10:38 +00:00
|
|
|
// Return the Output_relaxed_input_section object.
|
|
|
|
Output_relaxed_input_section*
|
|
|
|
relaxed_input_section() const
|
|
|
|
{
|
|
|
|
gold_assert(this->is_relaxed_input_section());
|
|
|
|
return this->u2_.poris;
|
|
|
|
}
|
|
|
|
|
2007-05-16 17:42:48 +00:00
|
|
|
// Set the output section.
|
|
|
|
void
|
|
|
|
set_output_section(Output_section* os)
|
|
|
|
{
|
|
|
|
gold_assert(!this->is_input_section());
|
2010-08-25 08:36:54 +00:00
|
|
|
Output_section_data* posd =
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 01:10:38 +00:00
|
|
|
this->is_relaxed_input_section() ? this->u2_.poris : this->u2_.posd;
|
|
|
|
posd->set_output_section(os);
|
2007-05-16 17:42:48 +00:00
|
|
|
}
|
|
|
|
|
2006-11-03 18:26:11 +00:00
|
|
|
// Set the address and file offset. This is called during
|
2007-12-01 06:34:12 +00:00
|
|
|
// Layout::finalize. SECTION_FILE_OFFSET is the file offset of
|
|
|
|
// the enclosing section.
|
2006-11-03 18:26:11 +00:00
|
|
|
void
|
2007-12-01 06:34:12 +00:00
|
|
|
set_address_and_file_offset(uint64_t address, off_t file_offset,
|
|
|
|
off_t section_file_offset);
|
2006-11-03 18:26:11 +00:00
|
|
|
|
2008-02-04 05:43:05 +00:00
|
|
|
// Reset the address and file offset.
|
|
|
|
void
|
|
|
|
reset_address_and_file_offset();
|
|
|
|
|
2007-12-01 06:34:12 +00:00
|
|
|
// Finalize the data size.
|
|
|
|
void
|
|
|
|
finalize_data_size();
|
2007-11-30 00:35:27 +00:00
|
|
|
|
2007-05-16 17:42:48 +00:00
|
|
|
// Add an input section, for SHF_MERGE sections.
|
|
|
|
bool
|
2009-12-14 19:53:05 +00:00
|
|
|
add_input_section(Relobj* object, unsigned int shndx)
|
2007-05-16 17:42:48 +00:00
|
|
|
{
|
|
|
|
gold_assert(this->shndx_ == MERGE_DATA_SECTION_CODE
|
|
|
|
|| this->shndx_ == MERGE_STRING_SECTION_CODE);
|
2009-12-14 19:53:05 +00:00
|
|
|
return this->u2_.posd->add_input_section(object, shndx);
|
2007-05-16 17:42:48 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Given an input OBJECT, an input section index SHNDX within that
|
|
|
|
// object, and an OFFSET relative to the start of that input
|
2007-11-09 07:00:15 +00:00
|
|
|
// section, return whether or not the output offset is known. If
|
2007-12-20 16:27:34 +00:00
|
|
|
// this function returns true, it sets *POUTPUT to the offset in
|
|
|
|
// the output section, relative to the start of the input section
|
|
|
|
// in the output section. *POUTPUT may be different from OFFSET
|
|
|
|
// for a merged section.
|
2007-05-16 17:42:48 +00:00
|
|
|
bool
|
2007-12-18 00:48:04 +00:00
|
|
|
output_offset(const Relobj* object, unsigned int shndx,
|
|
|
|
section_offset_type offset,
|
2010-08-25 08:36:54 +00:00
|
|
|
section_offset_type* poutput) const;
|
2007-05-16 17:42:48 +00:00
|
|
|
|
2007-12-21 21:19:45 +00:00
|
|
|
// Return whether this is the merge section for the input section
|
|
|
|
// SHNDX in OBJECT.
|
|
|
|
bool
|
|
|
|
is_merge_section_for(const Relobj* object, unsigned int shndx) const;
|
|
|
|
|
2006-11-03 18:26:11 +00:00
|
|
|
// Write out the data. This does nothing for an input section.
|
|
|
|
void
|
|
|
|
write(Output_file*);
|
|
|
|
|
2007-12-01 06:34:12 +00:00
|
|
|
// Write the data to a buffer. This does nothing for an input
|
|
|
|
// section.
|
|
|
|
void
|
|
|
|
write_to_buffer(unsigned char*);
|
|
|
|
|
2008-05-21 21:37:44 +00:00
|
|
|
// Print to a map file.
|
|
|
|
void
|
|
|
|
print_to_mapfile(Mapfile*) const;
|
|
|
|
|
2007-12-18 21:24:10 +00:00
|
|
|
// Print statistics about merge sections to stderr.
|
|
|
|
void
|
|
|
|
print_merge_stats(const char* section_name)
|
|
|
|
{
|
|
|
|
if (this->shndx_ == MERGE_DATA_SECTION_CODE
|
|
|
|
|| this->shndx_ == MERGE_STRING_SECTION_CODE)
|
|
|
|
this->u2_.posd->print_merge_stats(section_name);
|
|
|
|
}
|
|
|
|
|
2006-11-03 18:26:11 +00:00
|
|
|
private:
|
2007-05-16 17:42:48 +00:00
|
|
|
// Code values which appear in shndx_. If the value is not one of
|
|
|
|
// these codes, it is the input section index in the object file.
|
|
|
|
enum
|
|
|
|
{
|
|
|
|
// An Output_section_data.
|
|
|
|
OUTPUT_SECTION_CODE = -1U,
|
|
|
|
// An Output_section_data for an SHF_MERGE section with
|
|
|
|
// SHF_STRINGS not set.
|
|
|
|
MERGE_DATA_SECTION_CODE = -2U,
|
|
|
|
// An Output_section_data for an SHF_MERGE section with
|
|
|
|
// SHF_STRINGS set.
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 01:10:38 +00:00
|
|
|
MERGE_STRING_SECTION_CODE = -3U,
|
|
|
|
// An Output_section_data for a relaxed input section.
|
|
|
|
RELAXED_INPUT_SECTION_CODE = -4U
|
2007-05-16 17:42:48 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
// For an ordinary input section, this is the section index in the
|
|
|
|
// input file. For an Output_section_data, this is
|
|
|
|
// OUTPUT_SECTION_CODE or MERGE_DATA_SECTION_CODE or
|
|
|
|
// MERGE_STRING_SECTION_CODE.
|
2006-11-03 18:26:11 +00:00
|
|
|
unsigned int shndx_;
|
|
|
|
// The required alignment, stored as a power of 2.
|
|
|
|
unsigned int p2align_;
|
|
|
|
union
|
|
|
|
{
|
2007-05-16 17:42:48 +00:00
|
|
|
// For an ordinary input section, the section size.
|
|
|
|
off_t data_size;
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 01:10:38 +00:00
|
|
|
// For OUTPUT_SECTION_CODE or RELAXED_INPUT_SECTION_CODE, this is not
|
|
|
|
// used. For MERGE_DATA_SECTION_CODE or MERGE_STRING_SECTION_CODE, the
|
2007-05-16 17:42:48 +00:00
|
|
|
// entity size.
|
|
|
|
uint64_t entsize;
|
|
|
|
} u1_;
|
|
|
|
union
|
|
|
|
{
|
|
|
|
// For an ordinary input section, the object which holds the
|
2006-11-03 18:26:11 +00:00
|
|
|
// input section.
|
2006-11-06 22:46:08 +00:00
|
|
|
Relobj* object;
|
2007-05-16 17:42:48 +00:00
|
|
|
// For OUTPUT_SECTION_CODE or MERGE_DATA_SECTION_CODE or
|
|
|
|
// MERGE_STRING_SECTION_CODE, the data.
|
2006-11-03 18:26:11 +00:00
|
|
|
Output_section_data* posd;
|
2010-05-23 Doug Kwan <dougkwan@google.com>
* arm.cc (Arm_input_section::do_output_offset): Use convert_types
instead of a cast.
(Target_arm::apply_cortex_a8_workaround): Rewrite a conditional branch
with a direct branch, not a conditional branch, to a stub.
* merge.cc (Output_merge_base::record_input_section): New method
defintion.
(Output_merge_data::do_add_input_section): Record input section if
keeps-input-sections flag is set.
(Output_merge_string::do_add_input_section): Ditto.
* merge.h (Output_merge_base::Output_merge_base): Initialize new data
members KEEPS_INPUT_SECTIONS_, FIRST_RELOBJ_, FIRST_SHNDX_ and
INPUT_SECTIONS_.
(Output_merge_base::keeps_input_sections,
Output_merge_base::set_keeps_input_sections,
Output_merge_base::first_relobj, Output_merge_base::first_shndx): New
method definitions.
(Output_merge_base::Input_sections): New type declaration.
(Output_merge_base::input_sections_begin,
Output_merge_base::input_sections_end,
Output_merge_base::do_set_keeps_input_sections): New method definitions.
(Output_merge_base::bool keeps_input_sections_,
Output_merge_base::first_relobj_, Output_merge_base::first_shndx_,
Output_merge_base::input_sections_): New data members.
(Output_merge_data::do_set_keeps_input_sections): New method
defintion.
(Output_merge_string::do_set_keeps_input_sections): Ditto.
* output.cc (Output_section::Input_section::relobj): Move method
defintion from class declaration to here and handle merge sections.
(Output_section::Input_section::shndx): Ditto.
(Output_section::Output_section): Remove initializations of removed
data members and initialize new data member LOOKUP_MAPS_.
(Output_section::add_input_section): Set keeps-input-sections flag
for a newly created merge output section as appropriate. Adjust code
to use Output_section_lookup_maps class.
(Output_section::add_relaxed_input_section): Adjst code for lookup
maps code refactoring.
(Output_section::add_merge_input_section): Add a new parameter
KEEPS_INPUT_SECTION. Adjust code to use Output_section_lookup_maps
class. If adding input section to a newly created merge output
section fails, remove the new merge section.
(Output_section::convert_input_sections_in_list_to_relaxed_input_sections):
Adjust code for use of the Output_section_lookup_maps class.
(Output_section::find_merge_section): Ditto.
(Output_section::build_lookup_maps): New method defintion.
(Output_section::find_relaxed_input_section): Adjust code to use
Output_section_lookup_maps class.
(Output_section::get_input_sections): Export merge sections. Adjust
code to use Output_section_lookup_maps class.
(Output_section:::add_script_input_section): Adjust code to use
Output_section_lookup_maps class. Update lookup maps for merge
sections also.
(Output_section::discard_states): Use Output_section_lookup_maps.
(Output_section::restore_states): Same.
* output.h (Merge_section_properties): Move class defintion out of
Output_section.
(Output_section_lookup_maps): New class.
(Output_section::Input_section::is_merge_section): New method
defintion.
(Output_section::Input_section::relobj): Move defintion out of class
defintion. Declare method only.
(Output_section::Input_section::shndx): Ditto.
(Output_section::Input_section::output_merge_base): New method defintion.
(Output_section::Input_section::u2_.pomb): New union field.
(Output_section::Merge_section_by_properties_map,
Output_section::Output_section_data_by_input_section_map,
Output_section::Ouptut_relaxed_input_section_by_input_section_map):
Remove types.
(Output_section::add_merge_input_section): Add new parameter
KEEPS_INPUT_SECTIONS.
(Output_section::build_lookup_maps): New method declaration.
(Output_section::merge_section_map_,
Output_section::merge_section_by_properties_map_,
Output_section::relaxed_input_section_map_,
Output_section::is_relaxed_input_section_map_valid_): Remove data
members.
(Output_section::lookup_maps_): New data member.
2010-05-23 07:43:39 +00:00
|
|
|
Output_merge_base* pomb;
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 01:10:38 +00:00
|
|
|
// For RELAXED_INPUT_SECTION_CODE, the data.
|
|
|
|
Output_relaxed_input_section* poris;
|
2007-05-16 17:42:48 +00:00
|
|
|
} u2_;
|
2010-06-01 23:37:58 +00:00
|
|
|
// The line number of the pattern it matches in the --section-ordering-file
|
|
|
|
// file. It is 0 if does not match any pattern.
|
|
|
|
unsigned int section_order_index_;
|
2006-11-03 18:26:11 +00:00
|
|
|
};
|
|
|
|
|
2010-05-19 07:09:36 +00:00
|
|
|
// Store the list of input sections for this Output_section into the
|
|
|
|
// list passed in. This removes the input sections, leaving only
|
|
|
|
// any Output_section_data elements. This returns the size of those
|
|
|
|
// Output_section_data elements. ADDRESS is the address of this
|
|
|
|
// output section. FILL is the fill value to use, in case there are
|
|
|
|
// any spaces between the remaining Output_section_data elements.
|
|
|
|
uint64_t
|
|
|
|
get_input_sections(uint64_t address, const std::string& fill,
|
|
|
|
std::list<Input_section>*);
|
|
|
|
|
|
|
|
// Add a script input section. A script input section can either be
|
|
|
|
// a plain input section or a sub-class of Output_section_data.
|
|
|
|
void
|
|
|
|
add_script_input_section(const Input_section& input_section);
|
|
|
|
|
|
|
|
// Set the current size of the output section.
|
|
|
|
void
|
|
|
|
set_current_data_size(off_t size)
|
|
|
|
{ this->set_current_data_size_for_child(size); }
|
|
|
|
|
|
|
|
// End of linker script support.
|
|
|
|
|
|
|
|
// Save states before doing section layout.
|
|
|
|
// This is used for relaxation.
|
|
|
|
void
|
|
|
|
save_states();
|
|
|
|
|
|
|
|
// Restore states prior to section layout.
|
|
|
|
void
|
|
|
|
restore_states();
|
|
|
|
|
|
|
|
// Discard states.
|
|
|
|
void
|
|
|
|
discard_states();
|
|
|
|
|
|
|
|
// Convert existing input sections to relaxed input sections.
|
|
|
|
void
|
|
|
|
convert_input_sections_to_relaxed_sections(
|
|
|
|
const std::vector<Output_relaxed_input_section*>& sections);
|
|
|
|
|
|
|
|
// Find a relaxed input section to an input section in OBJECT
|
|
|
|
// with index SHNDX. Return NULL if none is found.
|
|
|
|
const Output_relaxed_input_section*
|
|
|
|
find_relaxed_input_section(const Relobj* object, unsigned int shndx) const;
|
|
|
|
|
|
|
|
// Whether section offsets need adjustment due to relaxation.
|
|
|
|
bool
|
|
|
|
section_offsets_need_adjustment() const
|
|
|
|
{ return this->section_offsets_need_adjustment_; }
|
|
|
|
|
|
|
|
// Set section_offsets_need_adjustment to be true.
|
|
|
|
void
|
|
|
|
set_section_offsets_need_adjustment()
|
|
|
|
{ this->section_offsets_need_adjustment_ = true; }
|
|
|
|
|
|
|
|
// Adjust section offsets of input sections in this. This is
|
|
|
|
// requires if relaxation caused some input sections to change sizes.
|
|
|
|
void
|
|
|
|
adjust_section_offsets();
|
|
|
|
|
|
|
|
// Whether this is a NOLOAD section.
|
|
|
|
bool
|
|
|
|
is_noload() const
|
|
|
|
{ return this->is_noload_; }
|
|
|
|
|
|
|
|
// Set NOLOAD flag.
|
|
|
|
void
|
|
|
|
set_is_noload()
|
|
|
|
{ this->is_noload_ = true; }
|
|
|
|
|
|
|
|
// Print merge statistics to stderr.
|
|
|
|
void
|
|
|
|
print_merge_stats();
|
|
|
|
|
2011-04-12 00:44:48 +00:00
|
|
|
// Set a fixed layout for the section. Used for incremental update links.
|
|
|
|
void
|
|
|
|
set_fixed_layout(uint64_t sh_addr, off_t sh_offset, off_t sh_size,
|
|
|
|
uint64_t sh_addralign);
|
|
|
|
|
|
|
|
// Return TRUE if the section has a fixed layout.
|
|
|
|
bool
|
|
|
|
has_fixed_layout() const
|
|
|
|
{ return this->has_fixed_layout_; }
|
|
|
|
|
|
|
|
// Reserve space within the fixed layout for the section. Used for
|
|
|
|
// incremental update links.
|
|
|
|
void
|
|
|
|
reserve(uint64_t sh_offset, uint64_t sh_size);
|
|
|
|
|
2010-05-19 07:09:36 +00:00
|
|
|
protected:
|
|
|
|
// Return the output section--i.e., the object itself.
|
|
|
|
Output_section*
|
|
|
|
do_output_section()
|
|
|
|
{ return this; }
|
|
|
|
|
|
|
|
const Output_section*
|
|
|
|
do_output_section() const
|
|
|
|
{ return this; }
|
|
|
|
|
|
|
|
// Return the section index in the output file.
|
|
|
|
unsigned int
|
|
|
|
do_out_shndx() const
|
|
|
|
{
|
|
|
|
gold_assert(this->out_shndx_ != -1U);
|
|
|
|
return this->out_shndx_;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Set the output section index.
|
|
|
|
void
|
|
|
|
do_set_out_shndx(unsigned int shndx)
|
|
|
|
{
|
|
|
|
gold_assert(this->out_shndx_ == -1U || this->out_shndx_ == shndx);
|
|
|
|
this->out_shndx_ = shndx;
|
|
|
|
}
|
|
|
|
|
2011-04-12 00:44:48 +00:00
|
|
|
// Update the data size of the Output_section. For a typical
|
|
|
|
// Output_section, there is nothing to do, but if there are any
|
|
|
|
// Output_section_data objects we need to do a trial layout
|
|
|
|
// here.
|
|
|
|
virtual void
|
|
|
|
update_data_size();
|
|
|
|
|
2010-05-19 07:09:36 +00:00
|
|
|
// Set the final data size of the Output_section. For a typical
|
|
|
|
// Output_section, there is nothing to do, but if there are any
|
|
|
|
// Output_section_data objects we need to set their final addresses
|
|
|
|
// here.
|
|
|
|
virtual void
|
|
|
|
set_final_data_size();
|
|
|
|
|
|
|
|
// Reset the address and file offset.
|
|
|
|
void
|
|
|
|
do_reset_address_and_file_offset();
|
|
|
|
|
|
|
|
// Return true if address and file offset already have reset values. In
|
|
|
|
// other words, calling reset_address_and_file_offset will not change them.
|
|
|
|
bool
|
|
|
|
do_address_and_file_offset_have_reset_values() const;
|
|
|
|
|
|
|
|
// Write the data to the file. For a typical Output_section, this
|
|
|
|
// does nothing: the data is written out by calling Object::Relocate
|
|
|
|
// on each input object. But if there are any Output_section_data
|
|
|
|
// objects we do need to write them out here.
|
|
|
|
virtual void
|
|
|
|
do_write(Output_file*);
|
|
|
|
|
|
|
|
// Return the address alignment--function required by parent class.
|
|
|
|
uint64_t
|
|
|
|
do_addralign() const
|
|
|
|
{ return this->addralign_; }
|
|
|
|
|
|
|
|
// Return whether there is a load address.
|
|
|
|
bool
|
|
|
|
do_has_load_address() const
|
|
|
|
{ return this->has_load_address_; }
|
|
|
|
|
|
|
|
// Return the load address.
|
|
|
|
uint64_t
|
|
|
|
do_load_address() const
|
|
|
|
{
|
|
|
|
gold_assert(this->has_load_address_);
|
|
|
|
return this->load_address_;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Return whether this is an Output_section.
|
|
|
|
bool
|
|
|
|
do_is_section() const
|
|
|
|
{ return true; }
|
|
|
|
|
|
|
|
// Return whether this is a section of the specified type.
|
|
|
|
bool
|
|
|
|
do_is_section_type(elfcpp::Elf_Word type) const
|
|
|
|
{ return this->type_ == type; }
|
|
|
|
|
|
|
|
// Return whether the specified section flag is set.
|
|
|
|
bool
|
|
|
|
do_is_section_flag_set(elfcpp::Elf_Xword flag) const
|
|
|
|
{ return (this->flags_ & flag) != 0; }
|
|
|
|
|
|
|
|
// Set the TLS offset. Called only for SHT_TLS sections.
|
|
|
|
void
|
|
|
|
do_set_tls_offset(uint64_t tls_base);
|
|
|
|
|
|
|
|
// Return the TLS offset, relative to the base of the TLS segment.
|
|
|
|
// Valid only for SHT_TLS sections.
|
|
|
|
uint64_t
|
|
|
|
do_tls_offset() const
|
|
|
|
{ return this->tls_offset_; }
|
|
|
|
|
|
|
|
// This may be implemented by a child class.
|
|
|
|
virtual void
|
|
|
|
do_finalize_name(Layout*)
|
|
|
|
{ }
|
|
|
|
|
|
|
|
// Print to the map file.
|
|
|
|
virtual void
|
|
|
|
do_print_to_mapfile(Mapfile*) const;
|
|
|
|
|
|
|
|
// Record that this section requires postprocessing after all
|
|
|
|
// relocations have been applied. This is called by a child class.
|
|
|
|
void
|
|
|
|
set_requires_postprocessing()
|
|
|
|
{
|
|
|
|
this->requires_postprocessing_ = true;
|
|
|
|
this->after_input_sections_ = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Write all the data of an Output_section into the postprocessing
|
|
|
|
// buffer.
|
|
|
|
void
|
|
|
|
write_to_postprocessing_buffer();
|
|
|
|
|
2006-11-03 18:26:11 +00:00
|
|
|
typedef std::vector<Input_section> Input_section_list;
|
|
|
|
|
2009-10-09 Doug Kwan <dougkwan@google.com>
* layout.cc (Layout::make_output_section): Call target hook to make
ordinary output section.
(Layout::finalize): Adjust parameter list of call the
Target::may_relax().
* layout.h (class Layout::section_list): New method.
* merge.h (Output_merge_base::entsize): Change visibility to public.
(Output_merge_base::is_string, Output_merge_base::do_is_string):
New methods.
(Output_merge_string::do_is_string): New method.
* object.cc (Sized_relobj::do_setup): renamed from
Sized_relobj::set_up.
* object.h (Sized_relobj::adjust_shndx,
Sized_relobj::initializ_input_to_output_maps,
Sized_relobj::free_input_to_output_maps): Change visibilities to
protected.
(Sized_relobj::setup): Virtualize.
(Sized_relobj::do_setup): New method declaration.
(Sized_relobj::invalidate_section_offset,
Sized_relobj::do_invalidate_section_offset): New method decfinitions.
(Sized_relobj::elf_file, Sized_relobj::local_values): New methods.
* options.cc (parse_int): New function.
* options.h (parse_int): New declaration.
(DEFINE_int): New macro.
(stub_group_size): New option.
* output.cc (Output_section::Output_section): Initialize memebers
merge_section_map_, merge_section_by_properties_map_,
relaxed_input_section_map_, is_relaxed_input_section_map_valid_.
(Output_section::add_input_section): Handled deferred code-fill
generation and remove an old comment.
(Output_section::add_relaxed_input_section): New method definition.
(Output_section::add_merge_input_section): Use merge section by
properties map to speed to search. Update merge section maps
as appropriate.
(Output_section::build_relaxation_map): New method definition.
(Output_section::convert_input_sections_in_list_to_relaxed_sections):
Same.
(Output_section::relax_input_section): Renamed to
Output_section::convert_input_sections_to_relaxed_sections and change
interface to take a vector of pointers to relaxed sections.
(Output_section::find_merge_section,
Output_section::find_relaxed_input_section): New method definitions.
(Output_section::is_input_address_mapped,
Output_section::output_offset, Output_section::output_address):
Use output section data maps to speed up searching.
(Output_section::find_starting_output_address): Add comments.
(Output_section::do_write,
Output_section::write_to_postprocessing_buffer): Do code-fill
generation as appropriate.
(Output_section::get_input_sections): Invalidate relaxed input section
map.
(Output_section::restore_states): Adjust type of checkpoint .
Invalidate relaxed input section map.
* output.h (Output_merge_base): New class declaration.
(Input_section_specifier): New class defintion.
(class Output_relaxed_input_section) Change base class to
Output_section_data_build.
(Output_relaxed_input_section::Output_relaxed_input_section): Adjust
base class initializer.
(Output_section::add_relaxed_input_section): New method declaration.
(Output_section::Input_section): Change visibility to protected.
(Output_section::Input_section::relobj,
Output_section::Input_section::shndx): Handle relaxed input sections.
Output_section::input_sections) Change visibility to protected. Also
define overload to return a non-const pointer.
(Output_section::Merge_section_properties): New class defintion.
(Output_section::Merge_section_by_properties_map,
Output_section::Output_section_data_by_input_section_map,
Output_section::Relaxation_map): New types.
(Output_section::relax_input_section): Rename method to
Output_section::convert_input_sections_to_relaxed_sections and change
interface to take a vector of relaxed section pointers.
(Output_section::find_merge_section,
Output_section::find_relaxed_input_section,
Output_section::build_relaxation_map,
Output_section::convert_input_sections_in_list_to_relaxed_sections):
New method declarations.
(Output_section::merge_section_map_
Output_section::merge_section_by_properties_map_,
Output_section::relaxed_input_section_map_,
Output_section::is_relaxed_input_section_map_valid_,
Output_section::generate_code_fills_at_write_): New data members.
* script-sections.cc
(Output_section_element_input::set_section_addresses): Call
current_data_size and addralign methods of relaxed input sections.
(Orphan_output_section::set_section_addresses): Call current_data_size
and addralign methods of relaxed input sections.
* symtab.cc (Symbol_table::compute_final_value): Extract template
from the body of Symbol_table::sized_finalize_symbol.
(Symbol_table::sized_finalized_symbol): Call
Symbol_table::compute_final_value.
* symtab.h (Symbol_table::Compute_final_value_status): New enum type.
(Symbol_table::compute_final_value): New templated method declaration.
* target.cc (Target::do_make_output_section): New method defintion.
* target.h (Target::make_output_section): New method declaration.
(Target::relax): Add more parameters for input objects, symbol table
and layout. Adjust call to do_relax.
(Target::do_make_output_section): New method declaration.
(Target::do_relax): Add parameters for input objects, symbol table
and layout.
2009-10-09 23:18:19 +00:00
|
|
|
// Allow a child class to access the input sections.
|
|
|
|
const Input_section_list&
|
|
|
|
input_sections() const
|
|
|
|
{ return this->input_sections_; }
|
|
|
|
|
2010-07-13 20:07:08 +00:00
|
|
|
// Whether this always keeps an input section list
|
|
|
|
bool
|
|
|
|
always_keeps_input_sections() const
|
|
|
|
{ return this->always_keeps_input_sections_; }
|
|
|
|
|
|
|
|
// Always keep an input section list.
|
|
|
|
void
|
|
|
|
set_always_keeps_input_sections()
|
|
|
|
{
|
|
|
|
gold_assert(this->current_data_size_for_child() == 0);
|
|
|
|
this->always_keeps_input_sections_ = true;
|
|
|
|
}
|
|
|
|
|
2009-10-09 Doug Kwan <dougkwan@google.com>
* layout.cc (Layout::make_output_section): Call target hook to make
ordinary output section.
(Layout::finalize): Adjust parameter list of call the
Target::may_relax().
* layout.h (class Layout::section_list): New method.
* merge.h (Output_merge_base::entsize): Change visibility to public.
(Output_merge_base::is_string, Output_merge_base::do_is_string):
New methods.
(Output_merge_string::do_is_string): New method.
* object.cc (Sized_relobj::do_setup): renamed from
Sized_relobj::set_up.
* object.h (Sized_relobj::adjust_shndx,
Sized_relobj::initializ_input_to_output_maps,
Sized_relobj::free_input_to_output_maps): Change visibilities to
protected.
(Sized_relobj::setup): Virtualize.
(Sized_relobj::do_setup): New method declaration.
(Sized_relobj::invalidate_section_offset,
Sized_relobj::do_invalidate_section_offset): New method decfinitions.
(Sized_relobj::elf_file, Sized_relobj::local_values): New methods.
* options.cc (parse_int): New function.
* options.h (parse_int): New declaration.
(DEFINE_int): New macro.
(stub_group_size): New option.
* output.cc (Output_section::Output_section): Initialize memebers
merge_section_map_, merge_section_by_properties_map_,
relaxed_input_section_map_, is_relaxed_input_section_map_valid_.
(Output_section::add_input_section): Handled deferred code-fill
generation and remove an old comment.
(Output_section::add_relaxed_input_section): New method definition.
(Output_section::add_merge_input_section): Use merge section by
properties map to speed to search. Update merge section maps
as appropriate.
(Output_section::build_relaxation_map): New method definition.
(Output_section::convert_input_sections_in_list_to_relaxed_sections):
Same.
(Output_section::relax_input_section): Renamed to
Output_section::convert_input_sections_to_relaxed_sections and change
interface to take a vector of pointers to relaxed sections.
(Output_section::find_merge_section,
Output_section::find_relaxed_input_section): New method definitions.
(Output_section::is_input_address_mapped,
Output_section::output_offset, Output_section::output_address):
Use output section data maps to speed up searching.
(Output_section::find_starting_output_address): Add comments.
(Output_section::do_write,
Output_section::write_to_postprocessing_buffer): Do code-fill
generation as appropriate.
(Output_section::get_input_sections): Invalidate relaxed input section
map.
(Output_section::restore_states): Adjust type of checkpoint .
Invalidate relaxed input section map.
* output.h (Output_merge_base): New class declaration.
(Input_section_specifier): New class defintion.
(class Output_relaxed_input_section) Change base class to
Output_section_data_build.
(Output_relaxed_input_section::Output_relaxed_input_section): Adjust
base class initializer.
(Output_section::add_relaxed_input_section): New method declaration.
(Output_section::Input_section): Change visibility to protected.
(Output_section::Input_section::relobj,
Output_section::Input_section::shndx): Handle relaxed input sections.
Output_section::input_sections) Change visibility to protected. Also
define overload to return a non-const pointer.
(Output_section::Merge_section_properties): New class defintion.
(Output_section::Merge_section_by_properties_map,
Output_section::Output_section_data_by_input_section_map,
Output_section::Relaxation_map): New types.
(Output_section::relax_input_section): Rename method to
Output_section::convert_input_sections_to_relaxed_sections and change
interface to take a vector of relaxed section pointers.
(Output_section::find_merge_section,
Output_section::find_relaxed_input_section,
Output_section::build_relaxation_map,
Output_section::convert_input_sections_in_list_to_relaxed_sections):
New method declarations.
(Output_section::merge_section_map_
Output_section::merge_section_by_properties_map_,
Output_section::relaxed_input_section_map_,
Output_section::is_relaxed_input_section_map_valid_,
Output_section::generate_code_fills_at_write_): New data members.
* script-sections.cc
(Output_section_element_input::set_section_addresses): Call
current_data_size and addralign methods of relaxed input sections.
(Orphan_output_section::set_section_addresses): Call current_data_size
and addralign methods of relaxed input sections.
* symtab.cc (Symbol_table::compute_final_value): Extract template
from the body of Symbol_table::sized_finalize_symbol.
(Symbol_table::sized_finalized_symbol): Call
Symbol_table::compute_final_value.
* symtab.h (Symbol_table::Compute_final_value_status): New enum type.
(Symbol_table::compute_final_value): New templated method declaration.
* target.cc (Target::do_make_output_section): New method defintion.
* target.h (Target::make_output_section): New method declaration.
(Target::relax): Add more parameters for input objects, symbol table
and layout. Adjust call to do_relax.
(Target::do_make_output_section): New method declaration.
(Target::do_relax): Add parameters for input objects, symbol table
and layout.
2009-10-09 23:18:19 +00:00
|
|
|
private:
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 01:10:38 +00:00
|
|
|
// We only save enough information to undo the effects of section layout.
|
|
|
|
class Checkpoint_output_section
|
|
|
|
{
|
|
|
|
public:
|
2009-12-14 19:53:05 +00:00
|
|
|
Checkpoint_output_section(uint64_t addralign, elfcpp::Elf_Xword flags,
|
|
|
|
const Input_section_list& input_sections,
|
|
|
|
off_t first_input_offset,
|
|
|
|
bool attached_input_sections_are_sorted)
|
|
|
|
: addralign_(addralign), flags_(flags),
|
|
|
|
input_sections_(input_sections),
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 01:10:38 +00:00
|
|
|
input_sections_size_(input_sections_.size()),
|
2009-12-14 19:53:05 +00:00
|
|
|
input_sections_copy_(), first_input_offset_(first_input_offset),
|
|
|
|
attached_input_sections_are_sorted_(attached_input_sections_are_sorted)
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 01:10:38 +00:00
|
|
|
{ }
|
|
|
|
|
|
|
|
virtual
|
|
|
|
~Checkpoint_output_section()
|
|
|
|
{ }
|
|
|
|
|
|
|
|
// Return the address alignment.
|
|
|
|
uint64_t
|
|
|
|
addralign() const
|
|
|
|
{ return this->addralign_; }
|
|
|
|
|
|
|
|
// Return the section flags.
|
|
|
|
elfcpp::Elf_Xword
|
|
|
|
flags() const
|
|
|
|
{ return this->flags_; }
|
|
|
|
|
|
|
|
// Return a reference to the input section list copy.
|
2009-10-09 Doug Kwan <dougkwan@google.com>
* layout.cc (Layout::make_output_section): Call target hook to make
ordinary output section.
(Layout::finalize): Adjust parameter list of call the
Target::may_relax().
* layout.h (class Layout::section_list): New method.
* merge.h (Output_merge_base::entsize): Change visibility to public.
(Output_merge_base::is_string, Output_merge_base::do_is_string):
New methods.
(Output_merge_string::do_is_string): New method.
* object.cc (Sized_relobj::do_setup): renamed from
Sized_relobj::set_up.
* object.h (Sized_relobj::adjust_shndx,
Sized_relobj::initializ_input_to_output_maps,
Sized_relobj::free_input_to_output_maps): Change visibilities to
protected.
(Sized_relobj::setup): Virtualize.
(Sized_relobj::do_setup): New method declaration.
(Sized_relobj::invalidate_section_offset,
Sized_relobj::do_invalidate_section_offset): New method decfinitions.
(Sized_relobj::elf_file, Sized_relobj::local_values): New methods.
* options.cc (parse_int): New function.
* options.h (parse_int): New declaration.
(DEFINE_int): New macro.
(stub_group_size): New option.
* output.cc (Output_section::Output_section): Initialize memebers
merge_section_map_, merge_section_by_properties_map_,
relaxed_input_section_map_, is_relaxed_input_section_map_valid_.
(Output_section::add_input_section): Handled deferred code-fill
generation and remove an old comment.
(Output_section::add_relaxed_input_section): New method definition.
(Output_section::add_merge_input_section): Use merge section by
properties map to speed to search. Update merge section maps
as appropriate.
(Output_section::build_relaxation_map): New method definition.
(Output_section::convert_input_sections_in_list_to_relaxed_sections):
Same.
(Output_section::relax_input_section): Renamed to
Output_section::convert_input_sections_to_relaxed_sections and change
interface to take a vector of pointers to relaxed sections.
(Output_section::find_merge_section,
Output_section::find_relaxed_input_section): New method definitions.
(Output_section::is_input_address_mapped,
Output_section::output_offset, Output_section::output_address):
Use output section data maps to speed up searching.
(Output_section::find_starting_output_address): Add comments.
(Output_section::do_write,
Output_section::write_to_postprocessing_buffer): Do code-fill
generation as appropriate.
(Output_section::get_input_sections): Invalidate relaxed input section
map.
(Output_section::restore_states): Adjust type of checkpoint .
Invalidate relaxed input section map.
* output.h (Output_merge_base): New class declaration.
(Input_section_specifier): New class defintion.
(class Output_relaxed_input_section) Change base class to
Output_section_data_build.
(Output_relaxed_input_section::Output_relaxed_input_section): Adjust
base class initializer.
(Output_section::add_relaxed_input_section): New method declaration.
(Output_section::Input_section): Change visibility to protected.
(Output_section::Input_section::relobj,
Output_section::Input_section::shndx): Handle relaxed input sections.
Output_section::input_sections) Change visibility to protected. Also
define overload to return a non-const pointer.
(Output_section::Merge_section_properties): New class defintion.
(Output_section::Merge_section_by_properties_map,
Output_section::Output_section_data_by_input_section_map,
Output_section::Relaxation_map): New types.
(Output_section::relax_input_section): Rename method to
Output_section::convert_input_sections_to_relaxed_sections and change
interface to take a vector of relaxed section pointers.
(Output_section::find_merge_section,
Output_section::find_relaxed_input_section,
Output_section::build_relaxation_map,
Output_section::convert_input_sections_in_list_to_relaxed_sections):
New method declarations.
(Output_section::merge_section_map_
Output_section::merge_section_by_properties_map_,
Output_section::relaxed_input_section_map_,
Output_section::is_relaxed_input_section_map_valid_,
Output_section::generate_code_fills_at_write_): New data members.
* script-sections.cc
(Output_section_element_input::set_section_addresses): Call
current_data_size and addralign methods of relaxed input sections.
(Orphan_output_section::set_section_addresses): Call current_data_size
and addralign methods of relaxed input sections.
* symtab.cc (Symbol_table::compute_final_value): Extract template
from the body of Symbol_table::sized_finalize_symbol.
(Symbol_table::sized_finalized_symbol): Call
Symbol_table::compute_final_value.
* symtab.h (Symbol_table::Compute_final_value_status): New enum type.
(Symbol_table::compute_final_value): New templated method declaration.
* target.cc (Target::do_make_output_section): New method defintion.
* target.h (Target::make_output_section): New method declaration.
(Target::relax): Add more parameters for input objects, symbol table
and layout. Adjust call to do_relax.
(Target::do_make_output_section): New method declaration.
(Target::do_relax): Add parameters for input objects, symbol table
and layout.
2009-10-09 23:18:19 +00:00
|
|
|
Input_section_list*
|
|
|
|
input_sections()
|
|
|
|
{ return &this->input_sections_copy_; }
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 01:10:38 +00:00
|
|
|
|
|
|
|
// Return the size of input_sections at the time when checkpoint is
|
|
|
|
// taken.
|
|
|
|
size_t
|
|
|
|
input_sections_size() const
|
|
|
|
{ return this->input_sections_size_; }
|
|
|
|
|
|
|
|
// Whether input sections are copied.
|
|
|
|
bool
|
|
|
|
input_sections_saved() const
|
|
|
|
{ return this->input_sections_copy_.size() == this->input_sections_size_; }
|
|
|
|
|
|
|
|
off_t
|
|
|
|
first_input_offset() const
|
|
|
|
{ return this->first_input_offset_; }
|
|
|
|
|
|
|
|
bool
|
|
|
|
attached_input_sections_are_sorted() const
|
|
|
|
{ return this->attached_input_sections_are_sorted_; }
|
|
|
|
|
|
|
|
// Save input sections.
|
|
|
|
void
|
|
|
|
save_input_sections()
|
|
|
|
{
|
|
|
|
this->input_sections_copy_.reserve(this->input_sections_size_);
|
|
|
|
this->input_sections_copy_.clear();
|
|
|
|
Input_section_list::const_iterator p = this->input_sections_.begin();
|
|
|
|
gold_assert(this->input_sections_size_ >= this->input_sections_.size());
|
|
|
|
for(size_t i = 0; i < this->input_sections_size_ ; i++, ++p)
|
|
|
|
this->input_sections_copy_.push_back(*p);
|
|
|
|
}
|
|
|
|
|
|
|
|
private:
|
|
|
|
// The section alignment.
|
|
|
|
uint64_t addralign_;
|
|
|
|
// The section flags.
|
|
|
|
elfcpp::Elf_Xword flags_;
|
|
|
|
// Reference to the input sections to be checkpointed.
|
|
|
|
const Input_section_list& input_sections_;
|
|
|
|
// Size of the checkpointed portion of input_sections_;
|
|
|
|
size_t input_sections_size_;
|
|
|
|
// Copy of input sections.
|
|
|
|
Input_section_list input_sections_copy_;
|
|
|
|
// The offset of the first entry in input_sections_.
|
|
|
|
off_t first_input_offset_;
|
|
|
|
// True if the input sections attached to this output section have
|
|
|
|
// already been sorted.
|
|
|
|
bool attached_input_sections_are_sorted_;
|
|
|
|
};
|
|
|
|
|
2008-03-28 22:42:34 +00:00
|
|
|
// This class is used to sort the input sections.
|
|
|
|
class Input_section_sort_entry;
|
|
|
|
|
2010-03-01 21:43:50 +00:00
|
|
|
// This is the sort comparison function for ctors and dtors.
|
2008-03-28 22:42:34 +00:00
|
|
|
struct Input_section_sort_compare
|
|
|
|
{
|
|
|
|
bool
|
|
|
|
operator()(const Input_section_sort_entry&,
|
|
|
|
const Input_section_sort_entry&) const;
|
|
|
|
};
|
|
|
|
|
2010-03-01 21:43:50 +00:00
|
|
|
// This is the sort comparison function for .init_array and .fini_array.
|
|
|
|
struct Input_section_sort_init_fini_compare
|
|
|
|
{
|
|
|
|
bool
|
|
|
|
operator()(const Input_section_sort_entry&,
|
|
|
|
const Input_section_sort_entry&) const;
|
|
|
|
};
|
|
|
|
|
2010-06-01 23:37:58 +00:00
|
|
|
// This is the sort comparison function when a section order is specified
|
|
|
|
// from an input file.
|
|
|
|
struct Input_section_sort_section_order_index_compare
|
|
|
|
{
|
|
|
|
bool
|
|
|
|
operator()(const Input_section_sort_entry&,
|
|
|
|
const Input_section_sort_entry&) const;
|
|
|
|
};
|
|
|
|
|
2007-09-21 05:31:19 +00:00
|
|
|
// Fill data. This is used to fill in data between input sections.
|
2008-02-04 05:43:05 +00:00
|
|
|
// It is also used for data statements (BYTE, WORD, etc.) in linker
|
|
|
|
// scripts. When we have to keep track of the input sections, we
|
|
|
|
// can use an Output_data_const, but we don't want to have to keep
|
|
|
|
// track of input sections just to implement fills.
|
2007-09-21 05:31:19 +00:00
|
|
|
class Fill
|
|
|
|
{
|
|
|
|
public:
|
2009-12-14 19:53:05 +00:00
|
|
|
Fill(off_t section_offset, off_t length)
|
|
|
|
: section_offset_(section_offset),
|
|
|
|
length_(convert_to_section_size_type(length))
|
2007-09-21 05:31:19 +00:00
|
|
|
{ }
|
|
|
|
|
|
|
|
// Return section offset.
|
|
|
|
off_t
|
|
|
|
section_offset() const
|
|
|
|
{ return this->section_offset_; }
|
|
|
|
|
|
|
|
// Return fill length.
|
2008-02-04 05:43:05 +00:00
|
|
|
section_size_type
|
2007-09-21 05:31:19 +00:00
|
|
|
length() const
|
|
|
|
{ return this->length_; }
|
|
|
|
|
|
|
|
private:
|
|
|
|
// The offset within the output section.
|
|
|
|
off_t section_offset_;
|
|
|
|
// The length of the space to fill.
|
2008-02-04 05:43:05 +00:00
|
|
|
section_size_type length_;
|
2007-09-21 05:31:19 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
typedef std::vector<Fill> Fill_list;
|
|
|
|
|
2009-10-09 Doug Kwan <dougkwan@google.com>
* layout.cc (Layout::make_output_section): Call target hook to make
ordinary output section.
(Layout::finalize): Adjust parameter list of call the
Target::may_relax().
* layout.h (class Layout::section_list): New method.
* merge.h (Output_merge_base::entsize): Change visibility to public.
(Output_merge_base::is_string, Output_merge_base::do_is_string):
New methods.
(Output_merge_string::do_is_string): New method.
* object.cc (Sized_relobj::do_setup): renamed from
Sized_relobj::set_up.
* object.h (Sized_relobj::adjust_shndx,
Sized_relobj::initializ_input_to_output_maps,
Sized_relobj::free_input_to_output_maps): Change visibilities to
protected.
(Sized_relobj::setup): Virtualize.
(Sized_relobj::do_setup): New method declaration.
(Sized_relobj::invalidate_section_offset,
Sized_relobj::do_invalidate_section_offset): New method decfinitions.
(Sized_relobj::elf_file, Sized_relobj::local_values): New methods.
* options.cc (parse_int): New function.
* options.h (parse_int): New declaration.
(DEFINE_int): New macro.
(stub_group_size): New option.
* output.cc (Output_section::Output_section): Initialize memebers
merge_section_map_, merge_section_by_properties_map_,
relaxed_input_section_map_, is_relaxed_input_section_map_valid_.
(Output_section::add_input_section): Handled deferred code-fill
generation and remove an old comment.
(Output_section::add_relaxed_input_section): New method definition.
(Output_section::add_merge_input_section): Use merge section by
properties map to speed to search. Update merge section maps
as appropriate.
(Output_section::build_relaxation_map): New method definition.
(Output_section::convert_input_sections_in_list_to_relaxed_sections):
Same.
(Output_section::relax_input_section): Renamed to
Output_section::convert_input_sections_to_relaxed_sections and change
interface to take a vector of pointers to relaxed sections.
(Output_section::find_merge_section,
Output_section::find_relaxed_input_section): New method definitions.
(Output_section::is_input_address_mapped,
Output_section::output_offset, Output_section::output_address):
Use output section data maps to speed up searching.
(Output_section::find_starting_output_address): Add comments.
(Output_section::do_write,
Output_section::write_to_postprocessing_buffer): Do code-fill
generation as appropriate.
(Output_section::get_input_sections): Invalidate relaxed input section
map.
(Output_section::restore_states): Adjust type of checkpoint .
Invalidate relaxed input section map.
* output.h (Output_merge_base): New class declaration.
(Input_section_specifier): New class defintion.
(class Output_relaxed_input_section) Change base class to
Output_section_data_build.
(Output_relaxed_input_section::Output_relaxed_input_section): Adjust
base class initializer.
(Output_section::add_relaxed_input_section): New method declaration.
(Output_section::Input_section): Change visibility to protected.
(Output_section::Input_section::relobj,
Output_section::Input_section::shndx): Handle relaxed input sections.
Output_section::input_sections) Change visibility to protected. Also
define overload to return a non-const pointer.
(Output_section::Merge_section_properties): New class defintion.
(Output_section::Merge_section_by_properties_map,
Output_section::Output_section_data_by_input_section_map,
Output_section::Relaxation_map): New types.
(Output_section::relax_input_section): Rename method to
Output_section::convert_input_sections_to_relaxed_sections and change
interface to take a vector of relaxed section pointers.
(Output_section::find_merge_section,
Output_section::find_relaxed_input_section,
Output_section::build_relaxation_map,
Output_section::convert_input_sections_in_list_to_relaxed_sections):
New method declarations.
(Output_section::merge_section_map_
Output_section::merge_section_by_properties_map_,
Output_section::relaxed_input_section_map_,
Output_section::is_relaxed_input_section_map_valid_,
Output_section::generate_code_fills_at_write_): New data members.
* script-sections.cc
(Output_section_element_input::set_section_addresses): Call
current_data_size and addralign methods of relaxed input sections.
(Orphan_output_section::set_section_addresses): Call current_data_size
and addralign methods of relaxed input sections.
* symtab.cc (Symbol_table::compute_final_value): Extract template
from the body of Symbol_table::sized_finalize_symbol.
(Symbol_table::sized_finalized_symbol): Call
Symbol_table::compute_final_value.
* symtab.h (Symbol_table::Compute_final_value_status): New enum type.
(Symbol_table::compute_final_value): New templated method declaration.
* target.cc (Target::do_make_output_section): New method defintion.
* target.h (Target::make_output_section): New method declaration.
(Target::relax): Add more parameters for input objects, symbol table
and layout. Adjust call to do_relax.
(Target::do_make_output_section): New method declaration.
(Target::do_relax): Add parameters for input objects, symbol table
and layout.
2009-10-09 23:18:19 +00:00
|
|
|
// Map used during relaxation of existing sections. This map
|
2010-01-20 17:29:52 +00:00
|
|
|
// a section id an input section list index. We assume that
|
|
|
|
// Input_section_list is a vector.
|
|
|
|
typedef Unordered_map<Section_id, size_t, Section_id_hash> Relaxation_map;
|
2009-10-09 Doug Kwan <dougkwan@google.com>
* layout.cc (Layout::make_output_section): Call target hook to make
ordinary output section.
(Layout::finalize): Adjust parameter list of call the
Target::may_relax().
* layout.h (class Layout::section_list): New method.
* merge.h (Output_merge_base::entsize): Change visibility to public.
(Output_merge_base::is_string, Output_merge_base::do_is_string):
New methods.
(Output_merge_string::do_is_string): New method.
* object.cc (Sized_relobj::do_setup): renamed from
Sized_relobj::set_up.
* object.h (Sized_relobj::adjust_shndx,
Sized_relobj::initializ_input_to_output_maps,
Sized_relobj::free_input_to_output_maps): Change visibilities to
protected.
(Sized_relobj::setup): Virtualize.
(Sized_relobj::do_setup): New method declaration.
(Sized_relobj::invalidate_section_offset,
Sized_relobj::do_invalidate_section_offset): New method decfinitions.
(Sized_relobj::elf_file, Sized_relobj::local_values): New methods.
* options.cc (parse_int): New function.
* options.h (parse_int): New declaration.
(DEFINE_int): New macro.
(stub_group_size): New option.
* output.cc (Output_section::Output_section): Initialize memebers
merge_section_map_, merge_section_by_properties_map_,
relaxed_input_section_map_, is_relaxed_input_section_map_valid_.
(Output_section::add_input_section): Handled deferred code-fill
generation and remove an old comment.
(Output_section::add_relaxed_input_section): New method definition.
(Output_section::add_merge_input_section): Use merge section by
properties map to speed to search. Update merge section maps
as appropriate.
(Output_section::build_relaxation_map): New method definition.
(Output_section::convert_input_sections_in_list_to_relaxed_sections):
Same.
(Output_section::relax_input_section): Renamed to
Output_section::convert_input_sections_to_relaxed_sections and change
interface to take a vector of pointers to relaxed sections.
(Output_section::find_merge_section,
Output_section::find_relaxed_input_section): New method definitions.
(Output_section::is_input_address_mapped,
Output_section::output_offset, Output_section::output_address):
Use output section data maps to speed up searching.
(Output_section::find_starting_output_address): Add comments.
(Output_section::do_write,
Output_section::write_to_postprocessing_buffer): Do code-fill
generation as appropriate.
(Output_section::get_input_sections): Invalidate relaxed input section
map.
(Output_section::restore_states): Adjust type of checkpoint .
Invalidate relaxed input section map.
* output.h (Output_merge_base): New class declaration.
(Input_section_specifier): New class defintion.
(class Output_relaxed_input_section) Change base class to
Output_section_data_build.
(Output_relaxed_input_section::Output_relaxed_input_section): Adjust
base class initializer.
(Output_section::add_relaxed_input_section): New method declaration.
(Output_section::Input_section): Change visibility to protected.
(Output_section::Input_section::relobj,
Output_section::Input_section::shndx): Handle relaxed input sections.
Output_section::input_sections) Change visibility to protected. Also
define overload to return a non-const pointer.
(Output_section::Merge_section_properties): New class defintion.
(Output_section::Merge_section_by_properties_map,
Output_section::Output_section_data_by_input_section_map,
Output_section::Relaxation_map): New types.
(Output_section::relax_input_section): Rename method to
Output_section::convert_input_sections_to_relaxed_sections and change
interface to take a vector of relaxed section pointers.
(Output_section::find_merge_section,
Output_section::find_relaxed_input_section,
Output_section::build_relaxation_map,
Output_section::convert_input_sections_in_list_to_relaxed_sections):
New method declarations.
(Output_section::merge_section_map_
Output_section::merge_section_by_properties_map_,
Output_section::relaxed_input_section_map_,
Output_section::is_relaxed_input_section_map_valid_,
Output_section::generate_code_fills_at_write_): New data members.
* script-sections.cc
(Output_section_element_input::set_section_addresses): Call
current_data_size and addralign methods of relaxed input sections.
(Orphan_output_section::set_section_addresses): Call current_data_size
and addralign methods of relaxed input sections.
* symtab.cc (Symbol_table::compute_final_value): Extract template
from the body of Symbol_table::sized_finalize_symbol.
(Symbol_table::sized_finalized_symbol): Call
Symbol_table::compute_final_value.
* symtab.h (Symbol_table::Compute_final_value_status): New enum type.
(Symbol_table::compute_final_value): New templated method declaration.
* target.cc (Target::do_make_output_section): New method defintion.
* target.h (Target::make_output_section): New method declaration.
(Target::relax): Add more parameters for input objects, symbol table
and layout. Adjust call to do_relax.
(Target::do_make_output_section): New method declaration.
(Target::do_relax): Add parameters for input objects, symbol table
and layout.
2009-10-09 23:18:19 +00:00
|
|
|
|
2007-05-16 17:42:48 +00:00
|
|
|
// Add a new output section by Input_section.
|
|
|
|
void
|
|
|
|
add_output_section_data(Input_section*);
|
|
|
|
|
|
|
|
// Add an SHF_MERGE input section. Returns true if the section was
|
2010-05-23 Doug Kwan <dougkwan@google.com>
* arm.cc (Arm_input_section::do_output_offset): Use convert_types
instead of a cast.
(Target_arm::apply_cortex_a8_workaround): Rewrite a conditional branch
with a direct branch, not a conditional branch, to a stub.
* merge.cc (Output_merge_base::record_input_section): New method
defintion.
(Output_merge_data::do_add_input_section): Record input section if
keeps-input-sections flag is set.
(Output_merge_string::do_add_input_section): Ditto.
* merge.h (Output_merge_base::Output_merge_base): Initialize new data
members KEEPS_INPUT_SECTIONS_, FIRST_RELOBJ_, FIRST_SHNDX_ and
INPUT_SECTIONS_.
(Output_merge_base::keeps_input_sections,
Output_merge_base::set_keeps_input_sections,
Output_merge_base::first_relobj, Output_merge_base::first_shndx): New
method definitions.
(Output_merge_base::Input_sections): New type declaration.
(Output_merge_base::input_sections_begin,
Output_merge_base::input_sections_end,
Output_merge_base::do_set_keeps_input_sections): New method definitions.
(Output_merge_base::bool keeps_input_sections_,
Output_merge_base::first_relobj_, Output_merge_base::first_shndx_,
Output_merge_base::input_sections_): New data members.
(Output_merge_data::do_set_keeps_input_sections): New method
defintion.
(Output_merge_string::do_set_keeps_input_sections): Ditto.
* output.cc (Output_section::Input_section::relobj): Move method
defintion from class declaration to here and handle merge sections.
(Output_section::Input_section::shndx): Ditto.
(Output_section::Output_section): Remove initializations of removed
data members and initialize new data member LOOKUP_MAPS_.
(Output_section::add_input_section): Set keeps-input-sections flag
for a newly created merge output section as appropriate. Adjust code
to use Output_section_lookup_maps class.
(Output_section::add_relaxed_input_section): Adjst code for lookup
maps code refactoring.
(Output_section::add_merge_input_section): Add a new parameter
KEEPS_INPUT_SECTION. Adjust code to use Output_section_lookup_maps
class. If adding input section to a newly created merge output
section fails, remove the new merge section.
(Output_section::convert_input_sections_in_list_to_relaxed_input_sections):
Adjust code for use of the Output_section_lookup_maps class.
(Output_section::find_merge_section): Ditto.
(Output_section::build_lookup_maps): New method defintion.
(Output_section::find_relaxed_input_section): Adjust code to use
Output_section_lookup_maps class.
(Output_section::get_input_sections): Export merge sections. Adjust
code to use Output_section_lookup_maps class.
(Output_section:::add_script_input_section): Adjust code to use
Output_section_lookup_maps class. Update lookup maps for merge
sections also.
(Output_section::discard_states): Use Output_section_lookup_maps.
(Output_section::restore_states): Same.
* output.h (Merge_section_properties): Move class defintion out of
Output_section.
(Output_section_lookup_maps): New class.
(Output_section::Input_section::is_merge_section): New method
defintion.
(Output_section::Input_section::relobj): Move defintion out of class
defintion. Declare method only.
(Output_section::Input_section::shndx): Ditto.
(Output_section::Input_section::output_merge_base): New method defintion.
(Output_section::Input_section::u2_.pomb): New union field.
(Output_section::Merge_section_by_properties_map,
Output_section::Output_section_data_by_input_section_map,
Output_section::Ouptut_relaxed_input_section_by_input_section_map):
Remove types.
(Output_section::add_merge_input_section): Add new parameter
KEEPS_INPUT_SECTIONS.
(Output_section::build_lookup_maps): New method declaration.
(Output_section::merge_section_map_,
Output_section::merge_section_by_properties_map_,
Output_section::relaxed_input_section_map_,
Output_section::is_relaxed_input_section_map_valid_): Remove data
members.
(Output_section::lookup_maps_): New data member.
2010-05-23 07:43:39 +00:00
|
|
|
// handled. If KEEPS_INPUT_SECTIONS is true, the output merge section
|
|
|
|
// stores information about the merged input sections.
|
2007-05-16 17:42:48 +00:00
|
|
|
bool
|
|
|
|
add_merge_input_section(Relobj* object, unsigned int shndx, uint64_t flags,
|
2010-05-23 Doug Kwan <dougkwan@google.com>
* arm.cc (Arm_input_section::do_output_offset): Use convert_types
instead of a cast.
(Target_arm::apply_cortex_a8_workaround): Rewrite a conditional branch
with a direct branch, not a conditional branch, to a stub.
* merge.cc (Output_merge_base::record_input_section): New method
defintion.
(Output_merge_data::do_add_input_section): Record input section if
keeps-input-sections flag is set.
(Output_merge_string::do_add_input_section): Ditto.
* merge.h (Output_merge_base::Output_merge_base): Initialize new data
members KEEPS_INPUT_SECTIONS_, FIRST_RELOBJ_, FIRST_SHNDX_ and
INPUT_SECTIONS_.
(Output_merge_base::keeps_input_sections,
Output_merge_base::set_keeps_input_sections,
Output_merge_base::first_relobj, Output_merge_base::first_shndx): New
method definitions.
(Output_merge_base::Input_sections): New type declaration.
(Output_merge_base::input_sections_begin,
Output_merge_base::input_sections_end,
Output_merge_base::do_set_keeps_input_sections): New method definitions.
(Output_merge_base::bool keeps_input_sections_,
Output_merge_base::first_relobj_, Output_merge_base::first_shndx_,
Output_merge_base::input_sections_): New data members.
(Output_merge_data::do_set_keeps_input_sections): New method
defintion.
(Output_merge_string::do_set_keeps_input_sections): Ditto.
* output.cc (Output_section::Input_section::relobj): Move method
defintion from class declaration to here and handle merge sections.
(Output_section::Input_section::shndx): Ditto.
(Output_section::Output_section): Remove initializations of removed
data members and initialize new data member LOOKUP_MAPS_.
(Output_section::add_input_section): Set keeps-input-sections flag
for a newly created merge output section as appropriate. Adjust code
to use Output_section_lookup_maps class.
(Output_section::add_relaxed_input_section): Adjst code for lookup
maps code refactoring.
(Output_section::add_merge_input_section): Add a new parameter
KEEPS_INPUT_SECTION. Adjust code to use Output_section_lookup_maps
class. If adding input section to a newly created merge output
section fails, remove the new merge section.
(Output_section::convert_input_sections_in_list_to_relaxed_input_sections):
Adjust code for use of the Output_section_lookup_maps class.
(Output_section::find_merge_section): Ditto.
(Output_section::build_lookup_maps): New method defintion.
(Output_section::find_relaxed_input_section): Adjust code to use
Output_section_lookup_maps class.
(Output_section::get_input_sections): Export merge sections. Adjust
code to use Output_section_lookup_maps class.
(Output_section:::add_script_input_section): Adjust code to use
Output_section_lookup_maps class. Update lookup maps for merge
sections also.
(Output_section::discard_states): Use Output_section_lookup_maps.
(Output_section::restore_states): Same.
* output.h (Merge_section_properties): Move class defintion out of
Output_section.
(Output_section_lookup_maps): New class.
(Output_section::Input_section::is_merge_section): New method
defintion.
(Output_section::Input_section::relobj): Move defintion out of class
defintion. Declare method only.
(Output_section::Input_section::shndx): Ditto.
(Output_section::Input_section::output_merge_base): New method defintion.
(Output_section::Input_section::u2_.pomb): New union field.
(Output_section::Merge_section_by_properties_map,
Output_section::Output_section_data_by_input_section_map,
Output_section::Ouptut_relaxed_input_section_by_input_section_map):
Remove types.
(Output_section::add_merge_input_section): Add new parameter
KEEPS_INPUT_SECTIONS.
(Output_section::build_lookup_maps): New method declaration.
(Output_section::merge_section_map_,
Output_section::merge_section_by_properties_map_,
Output_section::relaxed_input_section_map_,
Output_section::is_relaxed_input_section_map_valid_): Remove data
members.
(Output_section::lookup_maps_): New data member.
2010-05-23 07:43:39 +00:00
|
|
|
uint64_t entsize, uint64_t addralign,
|
|
|
|
bool keeps_input_sections);
|
2007-05-16 17:42:48 +00:00
|
|
|
|
|
|
|
// Add an output SHF_MERGE section POSD to this output section.
|
|
|
|
// IS_STRING indicates whether it is a SHF_STRINGS section, and
|
|
|
|
// ENTSIZE is the entity size. This returns the entry added to
|
|
|
|
// input_sections_.
|
|
|
|
void
|
|
|
|
add_output_merge_section(Output_section_data* posd, bool is_string,
|
|
|
|
uint64_t entsize);
|
|
|
|
|
2008-03-28 22:42:34 +00:00
|
|
|
// Sort the attached input sections.
|
|
|
|
void
|
|
|
|
sort_attached_input_sections();
|
|
|
|
|
2009-10-09 Doug Kwan <dougkwan@google.com>
* layout.cc (Layout::make_output_section): Call target hook to make
ordinary output section.
(Layout::finalize): Adjust parameter list of call the
Target::may_relax().
* layout.h (class Layout::section_list): New method.
* merge.h (Output_merge_base::entsize): Change visibility to public.
(Output_merge_base::is_string, Output_merge_base::do_is_string):
New methods.
(Output_merge_string::do_is_string): New method.
* object.cc (Sized_relobj::do_setup): renamed from
Sized_relobj::set_up.
* object.h (Sized_relobj::adjust_shndx,
Sized_relobj::initializ_input_to_output_maps,
Sized_relobj::free_input_to_output_maps): Change visibilities to
protected.
(Sized_relobj::setup): Virtualize.
(Sized_relobj::do_setup): New method declaration.
(Sized_relobj::invalidate_section_offset,
Sized_relobj::do_invalidate_section_offset): New method decfinitions.
(Sized_relobj::elf_file, Sized_relobj::local_values): New methods.
* options.cc (parse_int): New function.
* options.h (parse_int): New declaration.
(DEFINE_int): New macro.
(stub_group_size): New option.
* output.cc (Output_section::Output_section): Initialize memebers
merge_section_map_, merge_section_by_properties_map_,
relaxed_input_section_map_, is_relaxed_input_section_map_valid_.
(Output_section::add_input_section): Handled deferred code-fill
generation and remove an old comment.
(Output_section::add_relaxed_input_section): New method definition.
(Output_section::add_merge_input_section): Use merge section by
properties map to speed to search. Update merge section maps
as appropriate.
(Output_section::build_relaxation_map): New method definition.
(Output_section::convert_input_sections_in_list_to_relaxed_sections):
Same.
(Output_section::relax_input_section): Renamed to
Output_section::convert_input_sections_to_relaxed_sections and change
interface to take a vector of pointers to relaxed sections.
(Output_section::find_merge_section,
Output_section::find_relaxed_input_section): New method definitions.
(Output_section::is_input_address_mapped,
Output_section::output_offset, Output_section::output_address):
Use output section data maps to speed up searching.
(Output_section::find_starting_output_address): Add comments.
(Output_section::do_write,
Output_section::write_to_postprocessing_buffer): Do code-fill
generation as appropriate.
(Output_section::get_input_sections): Invalidate relaxed input section
map.
(Output_section::restore_states): Adjust type of checkpoint .
Invalidate relaxed input section map.
* output.h (Output_merge_base): New class declaration.
(Input_section_specifier): New class defintion.
(class Output_relaxed_input_section) Change base class to
Output_section_data_build.
(Output_relaxed_input_section::Output_relaxed_input_section): Adjust
base class initializer.
(Output_section::add_relaxed_input_section): New method declaration.
(Output_section::Input_section): Change visibility to protected.
(Output_section::Input_section::relobj,
Output_section::Input_section::shndx): Handle relaxed input sections.
Output_section::input_sections) Change visibility to protected. Also
define overload to return a non-const pointer.
(Output_section::Merge_section_properties): New class defintion.
(Output_section::Merge_section_by_properties_map,
Output_section::Output_section_data_by_input_section_map,
Output_section::Relaxation_map): New types.
(Output_section::relax_input_section): Rename method to
Output_section::convert_input_sections_to_relaxed_sections and change
interface to take a vector of relaxed section pointers.
(Output_section::find_merge_section,
Output_section::find_relaxed_input_section,
Output_section::build_relaxation_map,
Output_section::convert_input_sections_in_list_to_relaxed_sections):
New method declarations.
(Output_section::merge_section_map_
Output_section::merge_section_by_properties_map_,
Output_section::relaxed_input_section_map_,
Output_section::is_relaxed_input_section_map_valid_,
Output_section::generate_code_fills_at_write_): New data members.
* script-sections.cc
(Output_section_element_input::set_section_addresses): Call
current_data_size and addralign methods of relaxed input sections.
(Orphan_output_section::set_section_addresses): Call current_data_size
and addralign methods of relaxed input sections.
* symtab.cc (Symbol_table::compute_final_value): Extract template
from the body of Symbol_table::sized_finalize_symbol.
(Symbol_table::sized_finalized_symbol): Call
Symbol_table::compute_final_value.
* symtab.h (Symbol_table::Compute_final_value_status): New enum type.
(Symbol_table::compute_final_value): New templated method declaration.
* target.cc (Target::do_make_output_section): New method defintion.
* target.h (Target::make_output_section): New method declaration.
(Target::relax): Add more parameters for input objects, symbol table
and layout. Adjust call to do_relax.
(Target::do_make_output_section): New method declaration.
(Target::do_relax): Add parameters for input objects, symbol table
and layout.
2009-10-09 23:18:19 +00:00
|
|
|
// Find the merge section into which an input section with index SHNDX in
|
|
|
|
// OBJECT has been added. Return NULL if none found.
|
|
|
|
Output_section_data*
|
|
|
|
find_merge_section(const Relobj* object, unsigned int shndx) const;
|
|
|
|
|
|
|
|
// Build a relaxation map.
|
|
|
|
void
|
|
|
|
build_relaxation_map(
|
|
|
|
const Input_section_list& input_sections,
|
|
|
|
size_t limit,
|
|
|
|
Relaxation_map* map) const;
|
|
|
|
|
|
|
|
// Convert input sections in an input section list into relaxed sections.
|
|
|
|
void
|
|
|
|
convert_input_sections_in_list_to_relaxed_sections(
|
|
|
|
const std::vector<Output_relaxed_input_section*>& relaxed_sections,
|
|
|
|
const Relaxation_map& map,
|
|
|
|
Input_section_list* input_sections);
|
|
|
|
|
2010-05-23 Doug Kwan <dougkwan@google.com>
* arm.cc (Arm_input_section::do_output_offset): Use convert_types
instead of a cast.
(Target_arm::apply_cortex_a8_workaround): Rewrite a conditional branch
with a direct branch, not a conditional branch, to a stub.
* merge.cc (Output_merge_base::record_input_section): New method
defintion.
(Output_merge_data::do_add_input_section): Record input section if
keeps-input-sections flag is set.
(Output_merge_string::do_add_input_section): Ditto.
* merge.h (Output_merge_base::Output_merge_base): Initialize new data
members KEEPS_INPUT_SECTIONS_, FIRST_RELOBJ_, FIRST_SHNDX_ and
INPUT_SECTIONS_.
(Output_merge_base::keeps_input_sections,
Output_merge_base::set_keeps_input_sections,
Output_merge_base::first_relobj, Output_merge_base::first_shndx): New
method definitions.
(Output_merge_base::Input_sections): New type declaration.
(Output_merge_base::input_sections_begin,
Output_merge_base::input_sections_end,
Output_merge_base::do_set_keeps_input_sections): New method definitions.
(Output_merge_base::bool keeps_input_sections_,
Output_merge_base::first_relobj_, Output_merge_base::first_shndx_,
Output_merge_base::input_sections_): New data members.
(Output_merge_data::do_set_keeps_input_sections): New method
defintion.
(Output_merge_string::do_set_keeps_input_sections): Ditto.
* output.cc (Output_section::Input_section::relobj): Move method
defintion from class declaration to here and handle merge sections.
(Output_section::Input_section::shndx): Ditto.
(Output_section::Output_section): Remove initializations of removed
data members and initialize new data member LOOKUP_MAPS_.
(Output_section::add_input_section): Set keeps-input-sections flag
for a newly created merge output section as appropriate. Adjust code
to use Output_section_lookup_maps class.
(Output_section::add_relaxed_input_section): Adjst code for lookup
maps code refactoring.
(Output_section::add_merge_input_section): Add a new parameter
KEEPS_INPUT_SECTION. Adjust code to use Output_section_lookup_maps
class. If adding input section to a newly created merge output
section fails, remove the new merge section.
(Output_section::convert_input_sections_in_list_to_relaxed_input_sections):
Adjust code for use of the Output_section_lookup_maps class.
(Output_section::find_merge_section): Ditto.
(Output_section::build_lookup_maps): New method defintion.
(Output_section::find_relaxed_input_section): Adjust code to use
Output_section_lookup_maps class.
(Output_section::get_input_sections): Export merge sections. Adjust
code to use Output_section_lookup_maps class.
(Output_section:::add_script_input_section): Adjust code to use
Output_section_lookup_maps class. Update lookup maps for merge
sections also.
(Output_section::discard_states): Use Output_section_lookup_maps.
(Output_section::restore_states): Same.
* output.h (Merge_section_properties): Move class defintion out of
Output_section.
(Output_section_lookup_maps): New class.
(Output_section::Input_section::is_merge_section): New method
defintion.
(Output_section::Input_section::relobj): Move defintion out of class
defintion. Declare method only.
(Output_section::Input_section::shndx): Ditto.
(Output_section::Input_section::output_merge_base): New method defintion.
(Output_section::Input_section::u2_.pomb): New union field.
(Output_section::Merge_section_by_properties_map,
Output_section::Output_section_data_by_input_section_map,
Output_section::Ouptut_relaxed_input_section_by_input_section_map):
Remove types.
(Output_section::add_merge_input_section): Add new parameter
KEEPS_INPUT_SECTIONS.
(Output_section::build_lookup_maps): New method declaration.
(Output_section::merge_section_map_,
Output_section::merge_section_by_properties_map_,
Output_section::relaxed_input_section_map_,
Output_section::is_relaxed_input_section_map_valid_): Remove data
members.
(Output_section::lookup_maps_): New data member.
2010-05-23 07:43:39 +00:00
|
|
|
// Build the lookup maps for merge and relaxed input sections.
|
|
|
|
void
|
|
|
|
build_lookup_maps() const;
|
|
|
|
|
2006-09-21 22:13:18 +00:00
|
|
|
// Most of these fields are only valid after layout.
|
|
|
|
|
|
|
|
// The name of the section. This will point into a Stringpool.
|
2007-11-30 00:35:27 +00:00
|
|
|
const char* name_;
|
2006-09-27 22:53:42 +00:00
|
|
|
// The section address is in the parent class.
|
2006-09-21 22:13:18 +00:00
|
|
|
// The section alignment.
|
|
|
|
uint64_t addralign_;
|
|
|
|
// The section entry size.
|
|
|
|
uint64_t entsize_;
|
2008-02-04 05:43:05 +00:00
|
|
|
// The load address. This is only used when using a linker script
|
|
|
|
// with a SECTIONS clause. The has_load_address_ field indicates
|
|
|
|
// whether this field is valid.
|
|
|
|
uint64_t load_address_;
|
2006-09-27 22:53:42 +00:00
|
|
|
// The file offset is in the parent class.
|
2006-12-01 16:51:25 +00:00
|
|
|
// Set the section link field to the index of this section.
|
2006-12-06 00:02:36 +00:00
|
|
|
const Output_data* link_section_;
|
2006-12-01 16:51:25 +00:00
|
|
|
// If link_section_ is NULL, this is the link field.
|
2006-09-21 22:13:18 +00:00
|
|
|
unsigned int link_;
|
2006-12-01 16:51:25 +00:00
|
|
|
// Set the section info field to the index of this section.
|
2008-02-06 19:32:32 +00:00
|
|
|
const Output_section* info_section_;
|
2008-02-06 08:13:50 +00:00
|
|
|
// If info_section_ is NULL, set the info field to the symbol table
|
|
|
|
// index of this symbol.
|
|
|
|
const Symbol* info_symndx_;
|
|
|
|
// If info_section_ and info_symndx_ are NULL, this is the section
|
|
|
|
// info field.
|
2006-09-21 22:13:18 +00:00
|
|
|
unsigned int info_;
|
|
|
|
// The section type.
|
2007-11-29 20:10:17 +00:00
|
|
|
const elfcpp::Elf_Word type_;
|
2006-09-21 22:13:18 +00:00
|
|
|
// The section flags.
|
2008-02-04 05:43:05 +00:00
|
|
|
elfcpp::Elf_Xword flags_;
|
2010-08-03 Ian Lance Taylor <iant@google.com>
PR 11805
* layout.h (enum Output_section_order): Define.
(class Layout): Update declarations.
* layout.cc (Layout::get_output_section): Add order parameter.
Remove is_interp, is_dynamic_linker_section, is_last_relro, and
is_first_non_relro parameters. Change all callers.
(Layout::choose_output_section): Likewise.
(Layout::add_output_section_data): Likewise.
(Layout::make_output_section): Likewise. Set order.
(Layout::default_section_order): New function.
(Layout::layout_eh_frame): Call add_output_section_to_nonload.
* output.cc (Output_section::Output_section): Initialize order_.
Don't initialize deleted fields.
(Output_segment::Output_segment): Don't initialize deleted
fields.
(Output_segment::add_output_section_to_load): New function
replacing add_output_section. Change all callers to call this or
add_output_section_to_nonload.
(Output_segment::add_output_section_to_nonload): New function.
(Output_segment::remove_output_section): Rewrite.
(Output_segment::add_initial_output_data): Likewise.
(Output_segment::has_any_data_sections): Likewise.
(Output_segment::is_first_section_relro): Likewise.
(Output_segment::maximum_alignment): Likewise.
(Output_segment::has_dynamic_reloc): New function replacing
dynamic_reloc_count. Change all callers.
(Output_segment::has_dynamic_reloc_list): New function replacing
dynamic_reloc_count_list. Change all callers.
(Output_segment::set_section_addresses): Rewrite.
(Output_segment::set_offset): Rewrite.
(Output_segment::find_first_and_last_list): Remove.
(Output_segment::set_tls_offsets): Rewrite.
(Output_segment::first_section_load_address): Likewise.
(Output_segment::output_section_count): Likewise.
(Output_segment::section_with_lowest_load_address): Likewise.
(Output_segment::write_section_headers): Likewise.
(Output_segment::print_sections_to_map): Likewise.
* output.h (class Output_data): Remove dynamic_reloc_count_
field. Add has_dynamic_reloc_ field. Make bools into bitfields.
(Output_data::add_dynamic_reloc): Rewrite.
(Output_data::has_dynamic_reloc): New function.
(Output_data::dynamic_reloc_count): Remove.
(class Output_section): Add order_ field. Remvoe is_relro_local_,
is_last_relro_, is_first_non_relro_, is_interp_,
is_dynamic_linker_section_ fields. Add order and set_order
functions. Remove is_relro_local, set_is_relro_local,
is_last_relro, set_is_last_relro, is_first_non_relro,
set_is_first_non_relro functions, is_interp, set_is_interp,
is_dynamic_linker_section, and set_is_dynamic_linker_section
functions.
(class Output_segment): Change Output_data_list from std::list to
std:;vector. Add output_lists_ field. Remove output_data_ and
output_bss_ fields. Update declarations.
2010-08-03 14:07:13 +00:00
|
|
|
// The order of this section in the output segment.
|
|
|
|
Output_section_order order_;
|
2006-09-29 19:58:17 +00:00
|
|
|
// The section index.
|
2006-11-03 18:26:11 +00:00
|
|
|
unsigned int out_shndx_;
|
2006-11-16 00:38:25 +00:00
|
|
|
// If there is a STT_SECTION for this output section in the normal
|
|
|
|
// symbol table, this is the symbol index. This starts out as zero.
|
|
|
|
// It is initialized in Layout::finalize() to be the index, or -1U
|
|
|
|
// if there isn't one.
|
|
|
|
unsigned int symtab_index_;
|
|
|
|
// If there is a STT_SECTION for this output section in the dynamic
|
|
|
|
// symbol table, this is the symbol index. This starts out as zero.
|
|
|
|
// It is initialized in Layout::finalize() to be the index, or -1U
|
|
|
|
// if there isn't one.
|
|
|
|
unsigned int dynsym_index_;
|
2006-11-03 18:26:11 +00:00
|
|
|
// The input sections. This will be empty in cases where we don't
|
|
|
|
// need to keep track of them.
|
|
|
|
Input_section_list input_sections_;
|
|
|
|
// The offset of the first entry in input_sections_.
|
|
|
|
off_t first_input_offset_;
|
2007-09-21 05:31:19 +00:00
|
|
|
// The fill data. This is separate from input_sections_ because we
|
|
|
|
// often will need fill sections without needing to keep track of
|
|
|
|
// input sections.
|
|
|
|
Fill_list fills_;
|
2007-12-01 06:34:12 +00:00
|
|
|
// If the section requires postprocessing, this buffer holds the
|
|
|
|
// section contents during relocation.
|
|
|
|
unsigned char* postprocessing_buffer_;
|
2006-11-16 00:38:25 +00:00
|
|
|
// Whether this output section needs a STT_SECTION symbol in the
|
|
|
|
// normal symbol table. This will be true if there is a relocation
|
|
|
|
// which needs it.
|
|
|
|
bool needs_symtab_index_ : 1;
|
|
|
|
// Whether this output section needs a STT_SECTION symbol in the
|
|
|
|
// dynamic symbol table. This will be true if there is a dynamic
|
|
|
|
// relocation which needs it.
|
|
|
|
bool needs_dynsym_index_ : 1;
|
2006-12-01 16:51:25 +00:00
|
|
|
// Whether the link field of this output section should point to the
|
|
|
|
// normal symbol table.
|
|
|
|
bool should_link_to_symtab_ : 1;
|
|
|
|
// Whether the link field of this output section should point to the
|
|
|
|
// dynamic symbol table.
|
|
|
|
bool should_link_to_dynsym_ : 1;
|
2007-11-09 07:00:15 +00:00
|
|
|
// Whether this section should be written after all the input
|
|
|
|
// sections are complete.
|
|
|
|
bool after_input_sections_ : 1;
|
2007-11-29 20:10:17 +00:00
|
|
|
// Whether this section requires post processing after all
|
|
|
|
// relocations have been applied.
|
|
|
|
bool requires_postprocessing_ : 1;
|
2008-02-04 05:43:05 +00:00
|
|
|
// Whether an input section was mapped to this output section
|
|
|
|
// because of a SECTIONS clause in a linker script.
|
|
|
|
bool found_in_sections_clause_ : 1;
|
|
|
|
// Whether this section has an explicitly specified load address.
|
|
|
|
bool has_load_address_ : 1;
|
2008-02-06 19:32:32 +00:00
|
|
|
// True if the info_section_ field means the section index of the
|
|
|
|
// section, false if it means the symbol index of the corresponding
|
|
|
|
// section symbol.
|
|
|
|
bool info_uses_section_index_ : 1;
|
2010-06-01 23:37:58 +00:00
|
|
|
// True if input sections attached to this output section have to be
|
|
|
|
// sorted according to a specified order.
|
|
|
|
bool input_section_order_specified_ : 1;
|
2008-03-28 22:42:34 +00:00
|
|
|
// True if the input sections attached to this output section may
|
|
|
|
// need sorting.
|
|
|
|
bool may_sort_attached_input_sections_ : 1;
|
|
|
|
// True if the input sections attached to this output section must
|
|
|
|
// be sorted.
|
|
|
|
bool must_sort_attached_input_sections_ : 1;
|
|
|
|
// True if the input sections attached to this output section have
|
|
|
|
// already been sorted.
|
|
|
|
bool attached_input_sections_are_sorted_ : 1;
|
2008-05-20 04:00:47 +00:00
|
|
|
// True if this section holds relro data.
|
|
|
|
bool is_relro_ : 1;
|
2009-06-22 06:51:53 +00:00
|
|
|
// True if this is a small section.
|
|
|
|
bool is_small_section_ : 1;
|
|
|
|
// True if this is a large section.
|
|
|
|
bool is_large_section_ : 1;
|
2009-11-04 15:56:03 +00:00
|
|
|
// Whether code-fills are generated at write.
|
|
|
|
bool generate_code_fills_at_write_ : 1;
|
2009-12-30 04:00:21 +00:00
|
|
|
// Whether the entry size field should be zero.
|
|
|
|
bool is_entsize_zero_ : 1;
|
2010-01-23 01:07:59 +00:00
|
|
|
// Whether section offsets need adjustment due to relaxation.
|
|
|
|
bool section_offsets_need_adjustment_ : 1;
|
2010-04-09 17:32:58 +00:00
|
|
|
// Whether this is a NOLOAD section.
|
|
|
|
bool is_noload_ : 1;
|
2010-07-13 20:07:08 +00:00
|
|
|
// Whether this always keeps input section.
|
|
|
|
bool always_keeps_input_sections_ : 1;
|
2011-04-12 00:44:48 +00:00
|
|
|
// Whether this section has a fixed layout, for incremental update links.
|
|
|
|
bool has_fixed_layout_ : 1;
|
2007-12-06 05:55:50 +00:00
|
|
|
// For SHT_TLS sections, the offset of this section relative to the base
|
|
|
|
// of the TLS segment.
|
|
|
|
uint64_t tls_offset_;
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 01:10:38 +00:00
|
|
|
// Saved checkpoint.
|
|
|
|
Checkpoint_output_section* checkpoint_;
|
2010-05-23 Doug Kwan <dougkwan@google.com>
* arm.cc (Arm_input_section::do_output_offset): Use convert_types
instead of a cast.
(Target_arm::apply_cortex_a8_workaround): Rewrite a conditional branch
with a direct branch, not a conditional branch, to a stub.
* merge.cc (Output_merge_base::record_input_section): New method
defintion.
(Output_merge_data::do_add_input_section): Record input section if
keeps-input-sections flag is set.
(Output_merge_string::do_add_input_section): Ditto.
* merge.h (Output_merge_base::Output_merge_base): Initialize new data
members KEEPS_INPUT_SECTIONS_, FIRST_RELOBJ_, FIRST_SHNDX_ and
INPUT_SECTIONS_.
(Output_merge_base::keeps_input_sections,
Output_merge_base::set_keeps_input_sections,
Output_merge_base::first_relobj, Output_merge_base::first_shndx): New
method definitions.
(Output_merge_base::Input_sections): New type declaration.
(Output_merge_base::input_sections_begin,
Output_merge_base::input_sections_end,
Output_merge_base::do_set_keeps_input_sections): New method definitions.
(Output_merge_base::bool keeps_input_sections_,
Output_merge_base::first_relobj_, Output_merge_base::first_shndx_,
Output_merge_base::input_sections_): New data members.
(Output_merge_data::do_set_keeps_input_sections): New method
defintion.
(Output_merge_string::do_set_keeps_input_sections): Ditto.
* output.cc (Output_section::Input_section::relobj): Move method
defintion from class declaration to here and handle merge sections.
(Output_section::Input_section::shndx): Ditto.
(Output_section::Output_section): Remove initializations of removed
data members and initialize new data member LOOKUP_MAPS_.
(Output_section::add_input_section): Set keeps-input-sections flag
for a newly created merge output section as appropriate. Adjust code
to use Output_section_lookup_maps class.
(Output_section::add_relaxed_input_section): Adjst code for lookup
maps code refactoring.
(Output_section::add_merge_input_section): Add a new parameter
KEEPS_INPUT_SECTION. Adjust code to use Output_section_lookup_maps
class. If adding input section to a newly created merge output
section fails, remove the new merge section.
(Output_section::convert_input_sections_in_list_to_relaxed_input_sections):
Adjust code for use of the Output_section_lookup_maps class.
(Output_section::find_merge_section): Ditto.
(Output_section::build_lookup_maps): New method defintion.
(Output_section::find_relaxed_input_section): Adjust code to use
Output_section_lookup_maps class.
(Output_section::get_input_sections): Export merge sections. Adjust
code to use Output_section_lookup_maps class.
(Output_section:::add_script_input_section): Adjust code to use
Output_section_lookup_maps class. Update lookup maps for merge
sections also.
(Output_section::discard_states): Use Output_section_lookup_maps.
(Output_section::restore_states): Same.
* output.h (Merge_section_properties): Move class defintion out of
Output_section.
(Output_section_lookup_maps): New class.
(Output_section::Input_section::is_merge_section): New method
defintion.
(Output_section::Input_section::relobj): Move defintion out of class
defintion. Declare method only.
(Output_section::Input_section::shndx): Ditto.
(Output_section::Input_section::output_merge_base): New method defintion.
(Output_section::Input_section::u2_.pomb): New union field.
(Output_section::Merge_section_by_properties_map,
Output_section::Output_section_data_by_input_section_map,
Output_section::Ouptut_relaxed_input_section_by_input_section_map):
Remove types.
(Output_section::add_merge_input_section): Add new parameter
KEEPS_INPUT_SECTIONS.
(Output_section::build_lookup_maps): New method declaration.
(Output_section::merge_section_map_,
Output_section::merge_section_by_properties_map_,
Output_section::relaxed_input_section_map_,
Output_section::is_relaxed_input_section_map_valid_): Remove data
members.
(Output_section::lookup_maps_): New data member.
2010-05-23 07:43:39 +00:00
|
|
|
// Fast lookup maps for merged and relaxed input sections.
|
|
|
|
Output_section_lookup_maps* lookup_maps_;
|
2011-04-12 00:44:48 +00:00
|
|
|
// List of available regions within the section, for incremental
|
|
|
|
// update links.
|
|
|
|
Free_list free_list_;
|
2006-09-21 22:13:18 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
// An output segment. PT_LOAD segments are built from collections of
|
|
|
|
// output sections. Other segments typically point within PT_LOAD
|
|
|
|
// segments, and are built directly as needed.
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 01:10:38 +00:00
|
|
|
//
|
|
|
|
// NOTE: We want to use the copy constructor for this class. During
|
|
|
|
// relaxation, we may try built the segments multiple times. We do
|
|
|
|
// that by copying the original segment list before lay-out, doing
|
|
|
|
// a trial lay-out and roll-back to the saved copied if we need to
|
|
|
|
// to the lay-out again.
|
2006-09-21 22:13:18 +00:00
|
|
|
|
|
|
|
class Output_segment
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
// Create an output segment, specifying the type and flags.
|
|
|
|
Output_segment(elfcpp::Elf_Word, elfcpp::Elf_Word);
|
|
|
|
|
|
|
|
// Return the virtual address.
|
|
|
|
uint64_t
|
|
|
|
vaddr() const
|
|
|
|
{ return this->vaddr_; }
|
|
|
|
|
|
|
|
// Return the physical address.
|
|
|
|
uint64_t
|
|
|
|
paddr() const
|
|
|
|
{ return this->paddr_; }
|
|
|
|
|
|
|
|
// Return the segment type.
|
|
|
|
elfcpp::Elf_Word
|
|
|
|
type() const
|
|
|
|
{ return this->type_; }
|
|
|
|
|
|
|
|
// Return the segment flags.
|
|
|
|
elfcpp::Elf_Word
|
|
|
|
flags() const
|
|
|
|
{ return this->flags_; }
|
|
|
|
|
2006-10-20 20:40:49 +00:00
|
|
|
// Return the memory size.
|
|
|
|
uint64_t
|
|
|
|
memsz() const
|
|
|
|
{ return this->memsz_; }
|
|
|
|
|
2006-11-03 18:26:11 +00:00
|
|
|
// Return the file size.
|
|
|
|
off_t
|
|
|
|
filesz() const
|
|
|
|
{ return this->filesz_; }
|
|
|
|
|
2008-02-07 07:33:46 +00:00
|
|
|
// Return the file offset.
|
|
|
|
off_t
|
|
|
|
offset() const
|
|
|
|
{ return this->offset_; }
|
|
|
|
|
2009-06-22 06:51:53 +00:00
|
|
|
// Whether this is a segment created to hold large data sections.
|
|
|
|
bool
|
|
|
|
is_large_data_segment() const
|
|
|
|
{ return this->is_large_data_segment_; }
|
|
|
|
|
|
|
|
// Record that this is a segment created to hold large data
|
|
|
|
// sections.
|
|
|
|
void
|
|
|
|
set_is_large_data_segment()
|
|
|
|
{ this->is_large_data_segment_ = true; }
|
|
|
|
|
2006-09-27 22:53:42 +00:00
|
|
|
// Return the maximum alignment of the Output_data.
|
|
|
|
uint64_t
|
2008-02-04 05:43:05 +00:00
|
|
|
maximum_alignment();
|
2006-09-27 22:53:42 +00:00
|
|
|
|
2010-08-03 Ian Lance Taylor <iant@google.com>
PR 11805
* layout.h (enum Output_section_order): Define.
(class Layout): Update declarations.
* layout.cc (Layout::get_output_section): Add order parameter.
Remove is_interp, is_dynamic_linker_section, is_last_relro, and
is_first_non_relro parameters. Change all callers.
(Layout::choose_output_section): Likewise.
(Layout::add_output_section_data): Likewise.
(Layout::make_output_section): Likewise. Set order.
(Layout::default_section_order): New function.
(Layout::layout_eh_frame): Call add_output_section_to_nonload.
* output.cc (Output_section::Output_section): Initialize order_.
Don't initialize deleted fields.
(Output_segment::Output_segment): Don't initialize deleted
fields.
(Output_segment::add_output_section_to_load): New function
replacing add_output_section. Change all callers to call this or
add_output_section_to_nonload.
(Output_segment::add_output_section_to_nonload): New function.
(Output_segment::remove_output_section): Rewrite.
(Output_segment::add_initial_output_data): Likewise.
(Output_segment::has_any_data_sections): Likewise.
(Output_segment::is_first_section_relro): Likewise.
(Output_segment::maximum_alignment): Likewise.
(Output_segment::has_dynamic_reloc): New function replacing
dynamic_reloc_count. Change all callers.
(Output_segment::has_dynamic_reloc_list): New function replacing
dynamic_reloc_count_list. Change all callers.
(Output_segment::set_section_addresses): Rewrite.
(Output_segment::set_offset): Rewrite.
(Output_segment::find_first_and_last_list): Remove.
(Output_segment::set_tls_offsets): Rewrite.
(Output_segment::first_section_load_address): Likewise.
(Output_segment::output_section_count): Likewise.
(Output_segment::section_with_lowest_load_address): Likewise.
(Output_segment::write_section_headers): Likewise.
(Output_segment::print_sections_to_map): Likewise.
* output.h (class Output_data): Remove dynamic_reloc_count_
field. Add has_dynamic_reloc_ field. Make bools into bitfields.
(Output_data::add_dynamic_reloc): Rewrite.
(Output_data::has_dynamic_reloc): New function.
(Output_data::dynamic_reloc_count): Remove.
(class Output_section): Add order_ field. Remvoe is_relro_local_,
is_last_relro_, is_first_non_relro_, is_interp_,
is_dynamic_linker_section_ fields. Add order and set_order
functions. Remove is_relro_local, set_is_relro_local,
is_last_relro, set_is_last_relro, is_first_non_relro,
set_is_first_non_relro functions, is_interp, set_is_interp,
is_dynamic_linker_section, and set_is_dynamic_linker_section
functions.
(class Output_segment): Change Output_data_list from std::list to
std:;vector. Add output_lists_ field. Remove output_data_ and
output_bss_ fields. Update declarations.
2010-08-03 14:07:13 +00:00
|
|
|
// Add the Output_section OS to this PT_LOAD segment. SEG_FLAGS is
|
|
|
|
// the segment flags to use.
|
|
|
|
void
|
|
|
|
add_output_section_to_load(Layout* layout, Output_section* os,
|
|
|
|
elfcpp::Elf_Word seg_flags);
|
|
|
|
|
|
|
|
// Add the Output_section OS to this non-PT_LOAD segment. SEG_FLAGS
|
|
|
|
// is the segment flags to use.
|
2006-09-21 22:13:18 +00:00
|
|
|
void
|
2010-08-03 Ian Lance Taylor <iant@google.com>
PR 11805
* layout.h (enum Output_section_order): Define.
(class Layout): Update declarations.
* layout.cc (Layout::get_output_section): Add order parameter.
Remove is_interp, is_dynamic_linker_section, is_last_relro, and
is_first_non_relro parameters. Change all callers.
(Layout::choose_output_section): Likewise.
(Layout::add_output_section_data): Likewise.
(Layout::make_output_section): Likewise. Set order.
(Layout::default_section_order): New function.
(Layout::layout_eh_frame): Call add_output_section_to_nonload.
* output.cc (Output_section::Output_section): Initialize order_.
Don't initialize deleted fields.
(Output_segment::Output_segment): Don't initialize deleted
fields.
(Output_segment::add_output_section_to_load): New function
replacing add_output_section. Change all callers to call this or
add_output_section_to_nonload.
(Output_segment::add_output_section_to_nonload): New function.
(Output_segment::remove_output_section): Rewrite.
(Output_segment::add_initial_output_data): Likewise.
(Output_segment::has_any_data_sections): Likewise.
(Output_segment::is_first_section_relro): Likewise.
(Output_segment::maximum_alignment): Likewise.
(Output_segment::has_dynamic_reloc): New function replacing
dynamic_reloc_count. Change all callers.
(Output_segment::has_dynamic_reloc_list): New function replacing
dynamic_reloc_count_list. Change all callers.
(Output_segment::set_section_addresses): Rewrite.
(Output_segment::set_offset): Rewrite.
(Output_segment::find_first_and_last_list): Remove.
(Output_segment::set_tls_offsets): Rewrite.
(Output_segment::first_section_load_address): Likewise.
(Output_segment::output_section_count): Likewise.
(Output_segment::section_with_lowest_load_address): Likewise.
(Output_segment::write_section_headers): Likewise.
(Output_segment::print_sections_to_map): Likewise.
* output.h (class Output_data): Remove dynamic_reloc_count_
field. Add has_dynamic_reloc_ field. Make bools into bitfields.
(Output_data::add_dynamic_reloc): Rewrite.
(Output_data::has_dynamic_reloc): New function.
(Output_data::dynamic_reloc_count): Remove.
(class Output_section): Add order_ field. Remvoe is_relro_local_,
is_last_relro_, is_first_non_relro_, is_interp_,
is_dynamic_linker_section_ fields. Add order and set_order
functions. Remove is_relro_local, set_is_relro_local,
is_last_relro, set_is_last_relro, is_first_non_relro,
set_is_first_non_relro functions, is_interp, set_is_interp,
is_dynamic_linker_section, and set_is_dynamic_linker_section
functions.
(class Output_segment): Change Output_data_list from std::list to
std:;vector. Add output_lists_ field. Remove output_data_ and
output_bss_ fields. Update declarations.
2010-08-03 14:07:13 +00:00
|
|
|
add_output_section_to_nonload(Output_section* os,
|
|
|
|
elfcpp::Elf_Word seg_flags);
|
2006-09-27 22:53:42 +00:00
|
|
|
|
2008-03-12 04:38:42 +00:00
|
|
|
// Remove an Output_section from this segment. It is an error if it
|
|
|
|
// is not present.
|
|
|
|
void
|
|
|
|
remove_output_section(Output_section* os);
|
|
|
|
|
2010-01-06 22:37:18 +00:00
|
|
|
// Add an Output_data (which need not be an Output_section) to the
|
|
|
|
// start of this segment.
|
2006-09-27 22:53:42 +00:00
|
|
|
void
|
|
|
|
add_initial_output_data(Output_data*);
|
|
|
|
|
2008-02-13 22:47:28 +00:00
|
|
|
// Return true if this segment has any sections which hold actual
|
|
|
|
// data, rather than being a BSS section.
|
|
|
|
bool
|
2010-08-03 Ian Lance Taylor <iant@google.com>
PR 11805
* layout.h (enum Output_section_order): Define.
(class Layout): Update declarations.
* layout.cc (Layout::get_output_section): Add order parameter.
Remove is_interp, is_dynamic_linker_section, is_last_relro, and
is_first_non_relro parameters. Change all callers.
(Layout::choose_output_section): Likewise.
(Layout::add_output_section_data): Likewise.
(Layout::make_output_section): Likewise. Set order.
(Layout::default_section_order): New function.
(Layout::layout_eh_frame): Call add_output_section_to_nonload.
* output.cc (Output_section::Output_section): Initialize order_.
Don't initialize deleted fields.
(Output_segment::Output_segment): Don't initialize deleted
fields.
(Output_segment::add_output_section_to_load): New function
replacing add_output_section. Change all callers to call this or
add_output_section_to_nonload.
(Output_segment::add_output_section_to_nonload): New function.
(Output_segment::remove_output_section): Rewrite.
(Output_segment::add_initial_output_data): Likewise.
(Output_segment::has_any_data_sections): Likewise.
(Output_segment::is_first_section_relro): Likewise.
(Output_segment::maximum_alignment): Likewise.
(Output_segment::has_dynamic_reloc): New function replacing
dynamic_reloc_count. Change all callers.
(Output_segment::has_dynamic_reloc_list): New function replacing
dynamic_reloc_count_list. Change all callers.
(Output_segment::set_section_addresses): Rewrite.
(Output_segment::set_offset): Rewrite.
(Output_segment::find_first_and_last_list): Remove.
(Output_segment::set_tls_offsets): Rewrite.
(Output_segment::first_section_load_address): Likewise.
(Output_segment::output_section_count): Likewise.
(Output_segment::section_with_lowest_load_address): Likewise.
(Output_segment::write_section_headers): Likewise.
(Output_segment::print_sections_to_map): Likewise.
* output.h (class Output_data): Remove dynamic_reloc_count_
field. Add has_dynamic_reloc_ field. Make bools into bitfields.
(Output_data::add_dynamic_reloc): Rewrite.
(Output_data::has_dynamic_reloc): New function.
(Output_data::dynamic_reloc_count): Remove.
(class Output_section): Add order_ field. Remvoe is_relro_local_,
is_last_relro_, is_first_non_relro_, is_interp_,
is_dynamic_linker_section_ fields. Add order and set_order
functions. Remove is_relro_local, set_is_relro_local,
is_last_relro, set_is_last_relro, is_first_non_relro,
set_is_first_non_relro functions, is_interp, set_is_interp,
is_dynamic_linker_section, and set_is_dynamic_linker_section
functions.
(class Output_segment): Change Output_data_list from std::list to
std:;vector. Add output_lists_ field. Remove output_data_ and
output_bss_ fields. Update declarations.
2010-08-03 14:07:13 +00:00
|
|
|
has_any_data_sections() const;
|
2008-02-13 22:47:28 +00:00
|
|
|
|
2010-08-03 Ian Lance Taylor <iant@google.com>
PR 11805
* layout.h (enum Output_section_order): Define.
(class Layout): Update declarations.
* layout.cc (Layout::get_output_section): Add order parameter.
Remove is_interp, is_dynamic_linker_section, is_last_relro, and
is_first_non_relro parameters. Change all callers.
(Layout::choose_output_section): Likewise.
(Layout::add_output_section_data): Likewise.
(Layout::make_output_section): Likewise. Set order.
(Layout::default_section_order): New function.
(Layout::layout_eh_frame): Call add_output_section_to_nonload.
* output.cc (Output_section::Output_section): Initialize order_.
Don't initialize deleted fields.
(Output_segment::Output_segment): Don't initialize deleted
fields.
(Output_segment::add_output_section_to_load): New function
replacing add_output_section. Change all callers to call this or
add_output_section_to_nonload.
(Output_segment::add_output_section_to_nonload): New function.
(Output_segment::remove_output_section): Rewrite.
(Output_segment::add_initial_output_data): Likewise.
(Output_segment::has_any_data_sections): Likewise.
(Output_segment::is_first_section_relro): Likewise.
(Output_segment::maximum_alignment): Likewise.
(Output_segment::has_dynamic_reloc): New function replacing
dynamic_reloc_count. Change all callers.
(Output_segment::has_dynamic_reloc_list): New function replacing
dynamic_reloc_count_list. Change all callers.
(Output_segment::set_section_addresses): Rewrite.
(Output_segment::set_offset): Rewrite.
(Output_segment::find_first_and_last_list): Remove.
(Output_segment::set_tls_offsets): Rewrite.
(Output_segment::first_section_load_address): Likewise.
(Output_segment::output_section_count): Likewise.
(Output_segment::section_with_lowest_load_address): Likewise.
(Output_segment::write_section_headers): Likewise.
(Output_segment::print_sections_to_map): Likewise.
* output.h (class Output_data): Remove dynamic_reloc_count_
field. Add has_dynamic_reloc_ field. Make bools into bitfields.
(Output_data::add_dynamic_reloc): Rewrite.
(Output_data::has_dynamic_reloc): New function.
(Output_data::dynamic_reloc_count): Remove.
(class Output_section): Add order_ field. Remvoe is_relro_local_,
is_last_relro_, is_first_non_relro_, is_interp_,
is_dynamic_linker_section_ fields. Add order and set_order
functions. Remove is_relro_local, set_is_relro_local,
is_last_relro, set_is_last_relro, is_first_non_relro,
set_is_first_non_relro functions, is_interp, set_is_interp,
is_dynamic_linker_section, and set_is_dynamic_linker_section
functions.
(class Output_segment): Change Output_data_list from std::list to
std:;vector. Add output_lists_ field. Remove output_data_ and
output_bss_ fields. Update declarations.
2010-08-03 14:07:13 +00:00
|
|
|
// Whether this segment has a dynamic relocs.
|
|
|
|
bool
|
|
|
|
has_dynamic_reloc() const;
|
2007-11-15 23:46:46 +00:00
|
|
|
|
2008-02-04 05:43:05 +00:00
|
|
|
// Return the address of the first section.
|
|
|
|
uint64_t
|
|
|
|
first_section_load_address() const;
|
|
|
|
|
|
|
|
// Return whether the addresses have been set already.
|
|
|
|
bool
|
|
|
|
are_addresses_set() const
|
|
|
|
{ return this->are_addresses_set_; }
|
|
|
|
|
|
|
|
// Set the addresses.
|
|
|
|
void
|
2009-12-14 19:53:05 +00:00
|
|
|
set_addresses(uint64_t vaddr, uint64_t paddr)
|
2008-02-04 05:43:05 +00:00
|
|
|
{
|
2009-12-14 19:53:05 +00:00
|
|
|
this->vaddr_ = vaddr;
|
|
|
|
this->paddr_ = paddr;
|
2008-02-04 05:43:05 +00:00
|
|
|
this->are_addresses_set_ = true;
|
|
|
|
}
|
|
|
|
|
2010-01-06 22:37:18 +00:00
|
|
|
// Update the flags for the flags of an output section added to this
|
|
|
|
// segment.
|
|
|
|
void
|
|
|
|
update_flags_for_output_section(elfcpp::Elf_Xword flags)
|
|
|
|
{
|
|
|
|
// The ELF ABI specifies that a PT_TLS segment should always have
|
|
|
|
// PF_R as the flags.
|
|
|
|
if (this->type() != elfcpp::PT_TLS)
|
|
|
|
this->flags_ |= flags;
|
|
|
|
}
|
|
|
|
|
2008-02-04 22:54:31 +00:00
|
|
|
// Set the segment flags. This is only used if we have a PHDRS
|
|
|
|
// clause which explicitly specifies the flags.
|
|
|
|
void
|
2009-12-14 19:53:05 +00:00
|
|
|
set_flags(elfcpp::Elf_Word flags)
|
|
|
|
{ this->flags_ = flags; }
|
2008-02-04 22:54:31 +00:00
|
|
|
|
2006-09-27 22:53:42 +00:00
|
|
|
// Set the address of the segment to ADDR and the offset to *POFF
|
2008-02-04 05:43:05 +00:00
|
|
|
// and set the addresses and offsets of all contained output
|
|
|
|
// sections accordingly. Set the section indexes of all contained
|
|
|
|
// output sections starting with *PSHNDX. If RESET is true, first
|
|
|
|
// reset the addresses of the contained sections. Return the
|
|
|
|
// address of the immediately following segment. Update *POFF and
|
|
|
|
// *PSHNDX. This should only be called for a PT_LOAD segment.
|
2006-09-27 22:53:42 +00:00
|
|
|
uint64_t
|
2011-04-12 00:44:48 +00:00
|
|
|
set_section_addresses(Layout*, bool reset, uint64_t addr,
|
2010-11-16 19:18:31 +00:00
|
|
|
unsigned int* increase_relro, bool* has_relro,
|
2010-10-16 00:37:25 +00:00
|
|
|
off_t* poff, unsigned int* pshndx);
|
2006-09-27 22:53:42 +00:00
|
|
|
|
2007-08-21 21:03:50 +00:00
|
|
|
// Set the minimum alignment of this segment. This may be adjusted
|
|
|
|
// upward based on the section alignments.
|
|
|
|
void
|
2008-02-04 05:43:05 +00:00
|
|
|
set_minimum_p_align(uint64_t align)
|
2010-04-23 04:47:33 +00:00
|
|
|
{
|
|
|
|
if (align > this->min_p_align_)
|
|
|
|
this->min_p_align_ = align;
|
|
|
|
}
|
2007-08-21 21:03:50 +00:00
|
|
|
|
2006-09-27 22:53:42 +00:00
|
|
|
// Set the offset of this segment based on the section. This should
|
|
|
|
// only be called for a non-PT_LOAD segment.
|
|
|
|
void
|
2009-12-30 06:57:17 +00:00
|
|
|
set_offset(unsigned int increase);
|
2006-09-27 22:53:42 +00:00
|
|
|
|
2007-12-06 05:55:50 +00:00
|
|
|
// Set the TLS offsets of the sections contained in the PT_TLS segment.
|
|
|
|
void
|
|
|
|
set_tls_offsets();
|
|
|
|
|
2006-09-27 22:53:42 +00:00
|
|
|
// Return the number of output sections.
|
|
|
|
unsigned int
|
|
|
|
output_section_count() const;
|
2006-09-21 22:13:18 +00:00
|
|
|
|
2008-02-04 22:54:31 +00:00
|
|
|
// Return the section attached to the list segment with the lowest
|
|
|
|
// load address. This is used when handling a PHDRS clause in a
|
|
|
|
// linker script.
|
|
|
|
Output_section*
|
|
|
|
section_with_lowest_load_address() const;
|
|
|
|
|
2006-09-29 19:58:17 +00:00
|
|
|
// Write the segment header into *OPHDR.
|
|
|
|
template<int size, bool big_endian>
|
|
|
|
void
|
2006-11-03 18:26:11 +00:00
|
|
|
write_header(elfcpp::Phdr_write<size, big_endian>*);
|
2006-09-29 19:58:17 +00:00
|
|
|
|
|
|
|
// Write the section headers of associated sections into V.
|
|
|
|
template<int size, bool big_endian>
|
|
|
|
unsigned char*
|
2006-12-01 16:51:25 +00:00
|
|
|
write_section_headers(const Layout*, const Stringpool*, unsigned char* v,
|
2008-02-29 19:19:17 +00:00
|
|
|
unsigned int* pshndx) const;
|
2006-09-29 19:58:17 +00:00
|
|
|
|
2008-05-21 21:37:44 +00:00
|
|
|
// Print the output sections in the map file.
|
|
|
|
void
|
|
|
|
print_sections_to_mapfile(Mapfile*) const;
|
|
|
|
|
2006-09-21 22:13:18 +00:00
|
|
|
private:
|
2010-08-03 Ian Lance Taylor <iant@google.com>
PR 11805
* layout.h (enum Output_section_order): Define.
(class Layout): Update declarations.
* layout.cc (Layout::get_output_section): Add order parameter.
Remove is_interp, is_dynamic_linker_section, is_last_relro, and
is_first_non_relro parameters. Change all callers.
(Layout::choose_output_section): Likewise.
(Layout::add_output_section_data): Likewise.
(Layout::make_output_section): Likewise. Set order.
(Layout::default_section_order): New function.
(Layout::layout_eh_frame): Call add_output_section_to_nonload.
* output.cc (Output_section::Output_section): Initialize order_.
Don't initialize deleted fields.
(Output_segment::Output_segment): Don't initialize deleted
fields.
(Output_segment::add_output_section_to_load): New function
replacing add_output_section. Change all callers to call this or
add_output_section_to_nonload.
(Output_segment::add_output_section_to_nonload): New function.
(Output_segment::remove_output_section): Rewrite.
(Output_segment::add_initial_output_data): Likewise.
(Output_segment::has_any_data_sections): Likewise.
(Output_segment::is_first_section_relro): Likewise.
(Output_segment::maximum_alignment): Likewise.
(Output_segment::has_dynamic_reloc): New function replacing
dynamic_reloc_count. Change all callers.
(Output_segment::has_dynamic_reloc_list): New function replacing
dynamic_reloc_count_list. Change all callers.
(Output_segment::set_section_addresses): Rewrite.
(Output_segment::set_offset): Rewrite.
(Output_segment::find_first_and_last_list): Remove.
(Output_segment::set_tls_offsets): Rewrite.
(Output_segment::first_section_load_address): Likewise.
(Output_segment::output_section_count): Likewise.
(Output_segment::section_with_lowest_load_address): Likewise.
(Output_segment::write_section_headers): Likewise.
(Output_segment::print_sections_to_map): Likewise.
* output.h (class Output_data): Remove dynamic_reloc_count_
field. Add has_dynamic_reloc_ field. Make bools into bitfields.
(Output_data::add_dynamic_reloc): Rewrite.
(Output_data::has_dynamic_reloc): New function.
(Output_data::dynamic_reloc_count): Remove.
(class Output_section): Add order_ field. Remvoe is_relro_local_,
is_last_relro_, is_first_non_relro_, is_interp_,
is_dynamic_linker_section_ fields. Add order and set_order
functions. Remove is_relro_local, set_is_relro_local,
is_last_relro, set_is_last_relro, is_first_non_relro,
set_is_first_non_relro functions, is_interp, set_is_interp,
is_dynamic_linker_section, and set_is_dynamic_linker_section
functions.
(class Output_segment): Change Output_data_list from std::list to
std:;vector. Add output_lists_ field. Remove output_data_ and
output_bss_ fields. Update declarations.
2010-08-03 14:07:13 +00:00
|
|
|
typedef std::vector<Output_data*> Output_data_list;
|
2006-09-21 22:13:18 +00:00
|
|
|
|
2006-11-03 18:26:11 +00:00
|
|
|
// Find the maximum alignment in an Output_data_list.
|
|
|
|
static uint64_t
|
2008-02-04 05:43:05 +00:00
|
|
|
maximum_alignment_list(const Output_data_list*);
|
2006-11-03 18:26:11 +00:00
|
|
|
|
2008-05-20 04:00:47 +00:00
|
|
|
// Return whether the first data section is a relro section.
|
|
|
|
bool
|
|
|
|
is_first_section_relro() const;
|
|
|
|
|
2006-09-27 22:53:42 +00:00
|
|
|
// Set the section addresses in an Output_data_list.
|
|
|
|
uint64_t
|
2011-04-12 00:44:48 +00:00
|
|
|
set_section_list_addresses(Layout*, bool reset, Output_data_list*,
|
2008-03-19 21:41:38 +00:00
|
|
|
uint64_t addr, off_t* poff, unsigned int* pshndx,
|
2009-12-30 06:57:17 +00:00
|
|
|
bool* in_tls);
|
2006-09-27 22:53:42 +00:00
|
|
|
|
|
|
|
// Return the number of Output_sections in an Output_data_list.
|
|
|
|
unsigned int
|
|
|
|
output_section_count_list(const Output_data_list*) const;
|
|
|
|
|
2010-08-03 Ian Lance Taylor <iant@google.com>
PR 11805
* layout.h (enum Output_section_order): Define.
(class Layout): Update declarations.
* layout.cc (Layout::get_output_section): Add order parameter.
Remove is_interp, is_dynamic_linker_section, is_last_relro, and
is_first_non_relro parameters. Change all callers.
(Layout::choose_output_section): Likewise.
(Layout::add_output_section_data): Likewise.
(Layout::make_output_section): Likewise. Set order.
(Layout::default_section_order): New function.
(Layout::layout_eh_frame): Call add_output_section_to_nonload.
* output.cc (Output_section::Output_section): Initialize order_.
Don't initialize deleted fields.
(Output_segment::Output_segment): Don't initialize deleted
fields.
(Output_segment::add_output_section_to_load): New function
replacing add_output_section. Change all callers to call this or
add_output_section_to_nonload.
(Output_segment::add_output_section_to_nonload): New function.
(Output_segment::remove_output_section): Rewrite.
(Output_segment::add_initial_output_data): Likewise.
(Output_segment::has_any_data_sections): Likewise.
(Output_segment::is_first_section_relro): Likewise.
(Output_segment::maximum_alignment): Likewise.
(Output_segment::has_dynamic_reloc): New function replacing
dynamic_reloc_count. Change all callers.
(Output_segment::has_dynamic_reloc_list): New function replacing
dynamic_reloc_count_list. Change all callers.
(Output_segment::set_section_addresses): Rewrite.
(Output_segment::set_offset): Rewrite.
(Output_segment::find_first_and_last_list): Remove.
(Output_segment::set_tls_offsets): Rewrite.
(Output_segment::first_section_load_address): Likewise.
(Output_segment::output_section_count): Likewise.
(Output_segment::section_with_lowest_load_address): Likewise.
(Output_segment::write_section_headers): Likewise.
(Output_segment::print_sections_to_map): Likewise.
* output.h (class Output_data): Remove dynamic_reloc_count_
field. Add has_dynamic_reloc_ field. Make bools into bitfields.
(Output_data::add_dynamic_reloc): Rewrite.
(Output_data::has_dynamic_reloc): New function.
(Output_data::dynamic_reloc_count): Remove.
(class Output_section): Add order_ field. Remvoe is_relro_local_,
is_last_relro_, is_first_non_relro_, is_interp_,
is_dynamic_linker_section_ fields. Add order and set_order
functions. Remove is_relro_local, set_is_relro_local,
is_last_relro, set_is_last_relro, is_first_non_relro,
set_is_first_non_relro functions, is_interp, set_is_interp,
is_dynamic_linker_section, and set_is_dynamic_linker_section
functions.
(class Output_segment): Change Output_data_list from std::list to
std:;vector. Add output_lists_ field. Remove output_data_ and
output_bss_ fields. Update declarations.
2010-08-03 14:07:13 +00:00
|
|
|
// Return whether an Output_data_list has a dynamic reloc.
|
|
|
|
bool
|
|
|
|
has_dynamic_reloc_list(const Output_data_list*) const;
|
2007-11-15 23:46:46 +00:00
|
|
|
|
2008-02-04 22:54:31 +00:00
|
|
|
// Find the section with the lowest load address in an
|
|
|
|
// Output_data_list.
|
|
|
|
void
|
|
|
|
lowest_load_address_in_list(const Output_data_list* pdl,
|
|
|
|
Output_section** found,
|
|
|
|
uint64_t* found_lma) const;
|
|
|
|
|
2010-08-02 11:59:11 +00:00
|
|
|
// Find the first and last entries by address.
|
|
|
|
void
|
|
|
|
find_first_and_last_list(const Output_data_list* pdl,
|
|
|
|
const Output_data** pfirst,
|
|
|
|
const Output_data** plast) const;
|
|
|
|
|
2006-09-29 19:58:17 +00:00
|
|
|
// Write the section headers in the list into V.
|
|
|
|
template<int size, bool big_endian>
|
|
|
|
unsigned char*
|
2006-12-01 16:51:25 +00:00
|
|
|
write_section_headers_list(const Layout*, const Stringpool*,
|
|
|
|
const Output_data_list*, unsigned char* v,
|
2008-02-29 19:19:17 +00:00
|
|
|
unsigned int* pshdx) const;
|
2006-09-29 19:58:17 +00:00
|
|
|
|
2008-05-21 21:37:44 +00:00
|
|
|
// Print a section list to the mapfile.
|
|
|
|
void
|
|
|
|
print_section_list_to_mapfile(Mapfile*, const Output_data_list*) const;
|
|
|
|
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 01:10:38 +00:00
|
|
|
// NOTE: We want to use the copy constructor. Currently, shallow copy
|
|
|
|
// works for us so we do not need to write our own copy constructor.
|
|
|
|
|
2010-08-03 Ian Lance Taylor <iant@google.com>
PR 11805
* layout.h (enum Output_section_order): Define.
(class Layout): Update declarations.
* layout.cc (Layout::get_output_section): Add order parameter.
Remove is_interp, is_dynamic_linker_section, is_last_relro, and
is_first_non_relro parameters. Change all callers.
(Layout::choose_output_section): Likewise.
(Layout::add_output_section_data): Likewise.
(Layout::make_output_section): Likewise. Set order.
(Layout::default_section_order): New function.
(Layout::layout_eh_frame): Call add_output_section_to_nonload.
* output.cc (Output_section::Output_section): Initialize order_.
Don't initialize deleted fields.
(Output_segment::Output_segment): Don't initialize deleted
fields.
(Output_segment::add_output_section_to_load): New function
replacing add_output_section. Change all callers to call this or
add_output_section_to_nonload.
(Output_segment::add_output_section_to_nonload): New function.
(Output_segment::remove_output_section): Rewrite.
(Output_segment::add_initial_output_data): Likewise.
(Output_segment::has_any_data_sections): Likewise.
(Output_segment::is_first_section_relro): Likewise.
(Output_segment::maximum_alignment): Likewise.
(Output_segment::has_dynamic_reloc): New function replacing
dynamic_reloc_count. Change all callers.
(Output_segment::has_dynamic_reloc_list): New function replacing
dynamic_reloc_count_list. Change all callers.
(Output_segment::set_section_addresses): Rewrite.
(Output_segment::set_offset): Rewrite.
(Output_segment::find_first_and_last_list): Remove.
(Output_segment::set_tls_offsets): Rewrite.
(Output_segment::first_section_load_address): Likewise.
(Output_segment::output_section_count): Likewise.
(Output_segment::section_with_lowest_load_address): Likewise.
(Output_segment::write_section_headers): Likewise.
(Output_segment::print_sections_to_map): Likewise.
* output.h (class Output_data): Remove dynamic_reloc_count_
field. Add has_dynamic_reloc_ field. Make bools into bitfields.
(Output_data::add_dynamic_reloc): Rewrite.
(Output_data::has_dynamic_reloc): New function.
(Output_data::dynamic_reloc_count): Remove.
(class Output_section): Add order_ field. Remvoe is_relro_local_,
is_last_relro_, is_first_non_relro_, is_interp_,
is_dynamic_linker_section_ fields. Add order and set_order
functions. Remove is_relro_local, set_is_relro_local,
is_last_relro, set_is_last_relro, is_first_non_relro,
set_is_first_non_relro functions, is_interp, set_is_interp,
is_dynamic_linker_section, and set_is_dynamic_linker_section
functions.
(class Output_segment): Change Output_data_list from std::list to
std:;vector. Add output_lists_ field. Remove output_data_ and
output_bss_ fields. Update declarations.
2010-08-03 14:07:13 +00:00
|
|
|
// The list of output data attached to this segment.
|
|
|
|
Output_data_list output_lists_[ORDER_MAX];
|
2006-09-21 22:13:18 +00:00
|
|
|
// The segment virtual address.
|
|
|
|
uint64_t vaddr_;
|
|
|
|
// The segment physical address.
|
|
|
|
uint64_t paddr_;
|
|
|
|
// The size of the segment in memory.
|
|
|
|
uint64_t memsz_;
|
2008-02-04 05:43:05 +00:00
|
|
|
// The maximum section alignment. The is_max_align_known_ field
|
|
|
|
// indicates whether this has been finalized.
|
|
|
|
uint64_t max_align_;
|
|
|
|
// The required minimum value for the p_align field. This is used
|
|
|
|
// for PT_LOAD segments. Note that this does not mean that
|
|
|
|
// addresses should be aligned to this value; it means the p_paddr
|
|
|
|
// and p_vaddr fields must be congruent modulo this value. For
|
|
|
|
// non-PT_LOAD segments, the dynamic linker works more efficiently
|
|
|
|
// if the p_align field has the more conventional value, although it
|
|
|
|
// can align as needed.
|
|
|
|
uint64_t min_p_align_;
|
2006-09-21 22:13:18 +00:00
|
|
|
// The offset of the segment data within the file.
|
|
|
|
off_t offset_;
|
|
|
|
// The size of the segment data in the file.
|
|
|
|
off_t filesz_;
|
|
|
|
// The segment type;
|
|
|
|
elfcpp::Elf_Word type_;
|
|
|
|
// The segment flags.
|
|
|
|
elfcpp::Elf_Word flags_;
|
2008-02-04 05:43:05 +00:00
|
|
|
// Whether we have finalized max_align_.
|
|
|
|
bool is_max_align_known_ : 1;
|
|
|
|
// Whether vaddr and paddr were set by a linker script.
|
|
|
|
bool are_addresses_set_ : 1;
|
2009-06-22 06:51:53 +00:00
|
|
|
// Whether this segment holds large data sections.
|
|
|
|
bool is_large_data_segment_ : 1;
|
2006-09-21 22:13:18 +00:00
|
|
|
};
|
|
|
|
|
2006-09-29 19:58:17 +00:00
|
|
|
// This class represents the output file.
|
2006-09-21 22:13:18 +00:00
|
|
|
|
|
|
|
class Output_file
|
|
|
|
{
|
|
|
|
public:
|
2008-01-18 23:26:48 +00:00
|
|
|
Output_file(const char* name);
|
2006-09-29 19:58:17 +00:00
|
|
|
|
2008-02-07 07:33:46 +00:00
|
|
|
// Indicate that this is a temporary file which should not be
|
|
|
|
// output.
|
|
|
|
void
|
|
|
|
set_is_temporary()
|
|
|
|
{ this->is_temporary_ = true; }
|
|
|
|
|
2009-09-01 17:32:20 +00:00
|
|
|
// Try to open an existing file. Returns false if the file doesn't
|
|
|
|
// exist, has a size of 0 or can't be mmaped. This method is
|
2011-05-24 23:31:07 +00:00
|
|
|
// thread-unsafe. If BASE_NAME is not NULL, use the contents of
|
|
|
|
// that file as the base for incremental linking.
|
2009-09-01 17:32:20 +00:00
|
|
|
bool
|
2011-05-24 23:31:07 +00:00
|
|
|
open_base_file(const char* base_name, bool writable);
|
2009-09-01 17:32:20 +00:00
|
|
|
|
2006-09-29 19:58:17 +00:00
|
|
|
// Open the output file. FILE_SIZE is the final size of the file.
|
2009-09-01 17:32:20 +00:00
|
|
|
// If the file already exists, it is deleted/truncated. This method
|
|
|
|
// is thread-unsafe.
|
2006-09-29 19:58:17 +00:00
|
|
|
void
|
|
|
|
open(off_t file_size);
|
|
|
|
|
2009-09-01 17:32:20 +00:00
|
|
|
// Resize the output file. This method is thread-unsafe.
|
2007-11-29 20:10:17 +00:00
|
|
|
void
|
|
|
|
resize(off_t file_size);
|
|
|
|
|
2007-12-04 23:42:28 +00:00
|
|
|
// Close the output file (flushing all buffered data) and make sure
|
2009-09-01 17:32:20 +00:00
|
|
|
// there are no errors. This method is thread-unsafe.
|
2006-09-29 19:58:17 +00:00
|
|
|
void
|
|
|
|
close();
|
|
|
|
|
2009-10-09 16:40:51 +00:00
|
|
|
// Return the size of this file.
|
|
|
|
off_t
|
|
|
|
filesize()
|
|
|
|
{ return this->file_size_; }
|
|
|
|
|
2009-12-03 04:26:01 +00:00
|
|
|
// Return the name of this file.
|
|
|
|
const char*
|
|
|
|
filename()
|
|
|
|
{ return this->name_; }
|
|
|
|
|
2006-09-29 19:58:17 +00:00
|
|
|
// We currently always use mmap which makes the view handling quite
|
|
|
|
// simple. In the future we may support other approaches.
|
2006-09-21 22:13:18 +00:00
|
|
|
|
|
|
|
// Write data to the output file.
|
|
|
|
void
|
2007-12-20 21:21:24 +00:00
|
|
|
write(off_t offset, const void* data, size_t len)
|
2006-09-29 19:58:17 +00:00
|
|
|
{ memcpy(this->base_ + offset, data, len); }
|
|
|
|
|
|
|
|
// Get a buffer to use to write to the file, given the offset into
|
|
|
|
// the file and the size.
|
|
|
|
unsigned char*
|
2007-12-20 21:21:24 +00:00
|
|
|
get_output_view(off_t start, size_t size)
|
2006-09-29 19:58:17 +00:00
|
|
|
{
|
2007-12-21 23:08:25 +00:00
|
|
|
gold_assert(start >= 0
|
|
|
|
&& start + static_cast<off_t>(size) <= this->file_size_);
|
2006-09-29 19:58:17 +00:00
|
|
|
return this->base_ + start;
|
|
|
|
}
|
|
|
|
|
|
|
|
// VIEW must have been returned by get_output_view. Write the
|
|
|
|
// buffer to the file, passing in the offset and the size.
|
|
|
|
void
|
2007-12-20 21:21:24 +00:00
|
|
|
write_output_view(off_t, size_t, unsigned char*)
|
2006-09-29 19:58:17 +00:00
|
|
|
{ }
|
|
|
|
|
2007-11-09 07:00:15 +00:00
|
|
|
// Get a read/write buffer. This is used when we want to write part
|
|
|
|
// of the file, read it in, and write it again.
|
|
|
|
unsigned char*
|
2007-12-20 21:21:24 +00:00
|
|
|
get_input_output_view(off_t start, size_t size)
|
2007-11-09 07:00:15 +00:00
|
|
|
{ return this->get_output_view(start, size); }
|
|
|
|
|
|
|
|
// Write a read/write buffer back to the file.
|
|
|
|
void
|
2007-12-20 21:21:24 +00:00
|
|
|
write_input_output_view(off_t, size_t, unsigned char*)
|
2007-11-09 07:00:15 +00:00
|
|
|
{ }
|
|
|
|
|
|
|
|
// Get a read buffer. This is used when we just want to read part
|
|
|
|
// of the file back it in.
|
|
|
|
const unsigned char*
|
2007-12-20 21:21:24 +00:00
|
|
|
get_input_view(off_t start, size_t size)
|
2007-11-09 07:00:15 +00:00
|
|
|
{ return this->get_output_view(start, size); }
|
|
|
|
|
|
|
|
// Release a read bfufer.
|
|
|
|
void
|
2007-12-20 21:21:24 +00:00
|
|
|
free_input_view(off_t, size_t, const unsigned char*)
|
2007-11-09 07:00:15 +00:00
|
|
|
{ }
|
|
|
|
|
2006-09-29 19:58:17 +00:00
|
|
|
private:
|
2009-09-01 17:32:20 +00:00
|
|
|
// Map the file into memory or, if that fails, allocate anonymous
|
|
|
|
// memory.
|
2007-11-29 20:10:17 +00:00
|
|
|
void
|
|
|
|
map();
|
|
|
|
|
2009-03-24 18:04:26 +00:00
|
|
|
// Allocate anonymous memory for the file.
|
2009-09-01 17:32:20 +00:00
|
|
|
bool
|
2009-03-24 18:04:26 +00:00
|
|
|
map_anonymous();
|
|
|
|
|
2009-09-01 17:32:20 +00:00
|
|
|
// Map the file into memory.
|
|
|
|
bool
|
2011-05-24 23:31:07 +00:00
|
|
|
map_no_anonymous(bool);
|
2009-09-01 17:32:20 +00:00
|
|
|
|
2007-12-04 23:42:28 +00:00
|
|
|
// Unmap the file from memory (and flush to disk buffers).
|
|
|
|
void
|
|
|
|
unmap();
|
|
|
|
|
2006-09-29 19:58:17 +00:00
|
|
|
// File name.
|
|
|
|
const char* name_;
|
|
|
|
// File descriptor.
|
|
|
|
int o_;
|
|
|
|
// File size.
|
|
|
|
off_t file_size_;
|
|
|
|
// Base of file mapped into memory.
|
|
|
|
unsigned char* base_;
|
2007-12-04 23:42:28 +00:00
|
|
|
// True iff base_ points to a memory buffer rather than an output file.
|
|
|
|
bool map_is_anonymous_;
|
2011-04-12 18:06:16 +00:00
|
|
|
// True if base_ was allocated using new rather than mmap.
|
|
|
|
bool map_is_allocated_;
|
2008-02-07 07:33:46 +00:00
|
|
|
// True if this is a temporary file which should not be output.
|
|
|
|
bool is_temporary_;
|
2006-09-21 22:13:18 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
} // End namespace gold.
|
|
|
|
|
|
|
|
#endif // !defined(GOLD_OUTPUT_H)
|