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.
This commit is contained in:
Doug Kwan
parent
d446d6c4f7
commit
c0a6286595
15 changed files with 843 additions and 125 deletions
|
|
@ -2355,30 +2355,17 @@ Symbol_table::sized_finalize(off_t off, Stringpool* pool,
|
|||
return off;
|
||||
}
|
||||
|
||||
// Finalize the symbol SYM. This returns true if the symbol should be
|
||||
// added to the symbol table, false otherwise.
|
||||
// Compute the final value of SYM and store status in location PSTATUS.
|
||||
// During relaxation, this may be called multiple times for a symbol to
|
||||
// compute its would-be final value in each relaxation pass.
|
||||
|
||||
template<int size>
|
||||
bool
|
||||
Symbol_table::sized_finalize_symbol(Symbol* unsized_sym)
|
||||
typename Sized_symbol<size>::Value_type
|
||||
Symbol_table::compute_final_value(
|
||||
const Sized_symbol<size>* sym,
|
||||
Compute_final_value_status* pstatus) const
|
||||
{
|
||||
typedef typename Sized_symbol<size>::Value_type Value_type;
|
||||
|
||||
Sized_symbol<size>* sym = static_cast<Sized_symbol<size>*>(unsized_sym);
|
||||
|
||||
// The default version of a symbol may appear twice in the symbol
|
||||
// table. We only need to finalize it once.
|
||||
if (sym->has_symtab_index())
|
||||
return false;
|
||||
|
||||
if (!sym->in_reg())
|
||||
{
|
||||
gold_assert(!sym->has_symtab_index());
|
||||
sym->set_symtab_index(-1U);
|
||||
gold_assert(sym->dynsym_index() == -1U);
|
||||
return false;
|
||||
}
|
||||
|
||||
Value_type value;
|
||||
|
||||
switch (sym->source())
|
||||
|
|
@ -2392,9 +2379,8 @@ Symbol_table::sized_finalize_symbol(Symbol* unsized_sym)
|
|||
&& shndx != elfcpp::SHN_ABS
|
||||
&& !Symbol::is_common_shndx(shndx))
|
||||
{
|
||||
gold_error(_("%s: unsupported symbol section 0x%x"),
|
||||
sym->demangled_name().c_str(), shndx);
|
||||
shndx = elfcpp::SHN_UNDEF;
|
||||
*pstatus = CFVS_UNSUPPORTED_SYMBOL_SECTION;
|
||||
return 0;
|
||||
}
|
||||
|
||||
Object* symobj = sym->object();
|
||||
|
|
@ -2435,12 +2421,12 @@ Symbol_table::sized_finalize_symbol(Symbol* unsized_sym)
|
|||
|
||||
if (os == NULL)
|
||||
{
|
||||
sym->set_symtab_index(-1U);
|
||||
bool static_or_reloc = (parameters->doing_static_link() ||
|
||||
parameters->options().relocatable());
|
||||
gold_assert(static_or_reloc || sym->dynsym_index() == -1U);
|
||||
|
||||
return false;
|
||||
*pstatus = CFVS_NO_OUTPUT_SECTION;
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (secoff64 == -1ULL)
|
||||
|
|
@ -2513,6 +2499,57 @@ Symbol_table::sized_finalize_symbol(Symbol* unsized_sym)
|
|||
gold_unreachable();
|
||||
}
|
||||
|
||||
*pstatus = CFVS_OK;
|
||||
return value;
|
||||
}
|
||||
|
||||
// Finalize the symbol SYM. This returns true if the symbol should be
|
||||
// added to the symbol table, false otherwise.
|
||||
|
||||
template<int size>
|
||||
bool
|
||||
Symbol_table::sized_finalize_symbol(Symbol* unsized_sym)
|
||||
{
|
||||
typedef typename Sized_symbol<size>::Value_type Value_type;
|
||||
|
||||
Sized_symbol<size>* sym = static_cast<Sized_symbol<size>*>(unsized_sym);
|
||||
|
||||
// The default version of a symbol may appear twice in the symbol
|
||||
// table. We only need to finalize it once.
|
||||
if (sym->has_symtab_index())
|
||||
return false;
|
||||
|
||||
if (!sym->in_reg())
|
||||
{
|
||||
gold_assert(!sym->has_symtab_index());
|
||||
sym->set_symtab_index(-1U);
|
||||
gold_assert(sym->dynsym_index() == -1U);
|
||||
return false;
|
||||
}
|
||||
|
||||
// Compute final symbol value.
|
||||
Compute_final_value_status status;
|
||||
Value_type value = this->compute_final_value(sym, &status);
|
||||
|
||||
switch (status)
|
||||
{
|
||||
case CFVS_OK:
|
||||
break;
|
||||
case CFVS_UNSUPPORTED_SYMBOL_SECTION:
|
||||
{
|
||||
bool is_ordinary;
|
||||
unsigned int shndx = sym->shndx(&is_ordinary);
|
||||
gold_error(_("%s: unsupported symbol section 0x%x"),
|
||||
sym->demangled_name().c_str(), shndx);
|
||||
}
|
||||
break;
|
||||
case CFVS_NO_OUTPUT_SECTION:
|
||||
sym->set_symtab_index(-1U);
|
||||
return false;
|
||||
default:
|
||||
gold_unreachable();
|
||||
}
|
||||
|
||||
sym->set_value(value);
|
||||
|
||||
if (parameters->options().strip_all()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue