aboutsummaryrefslogtreecommitdiff
path: root/gold/object.h
diff options
context:
space:
mode:
authorRafael Ávila de Espíndola <rafael.espindola@gmail.com>2015-03-04 15:10:18 -0800
committerCary Coutant <ccoutant@google.com>2015-03-04 15:10:18 -0800
commitdbe40a889191708b6e32441b1c64937844645574 (patch)
treeb5c4ecc22a88cef387404490054caf90fd4d156e /gold/object.h
parenta8d9763abd6c461d646034537633fb03f5eabfd1 (diff)
downloadgdb-dbe40a889191708b6e32441b1c64937844645574.zip
gdb-dbe40a889191708b6e32441b1c64937844645574.tar.gz
gdb-dbe40a889191708b6e32441b1c64937844645574.tar.bz2
Remove empty class Merge_map.
2015-03-02 Rafael Ávila de Espíndola <rafael.espindola@gmail.com> * ehframe.cc (Cie::set_output_offset): Pass in and use a Output_section_data instead of a Merge_map. (Eh_frame::Eh_frame): Don't initialize merge_map_. (Eh_frame::read_cie): Use add_merge_mapping instead of Merge_map::add_mapping. (Eh_frame::read_fde): Ditto. (Eh_frame::set_final_data_size): Use this instead of this->merge_map_. (Eh_frame::do_output_offset): Use merge_output_offset istead of merge_map_->get_output_offset. (Eh_frame::do_is_merge_section_for): Delete. * ehframe.h (Fde::add_mapping): Pass in and use a Output_section_data instead of a Merge_map. (Cie::set_output_offset): Pass in a Output_section_data instead of a Merge_map. (Eh_frame::do_is_merge_section_for): Delete. (Eh_frame::merge_map_): Delete. * merge.cc (Object_merge_map::get_or_make_input_merge_map): Pass in and use a Output_section_data instead of a Merge_map. (Object_merge_map::add_mapping): Ditto. (Object_merge_map::get_output_offset): Remove the merge_map argument. (Object_merge_map::is_merge_section_for): Pass in and use a Output_section_data instead of a Merge_map. (Merge_map): Delete. (Output_merge_base::do_output_offset): Use merge_output_offset instead of merge_map_.get_output_offset. (Output_merge_base::do_is_merge_section_for): Delete. (Output_merge_data::do_add_input_section): Use object->add_merge_mapping instead of add_mapping. (Output_merge_string<Char_type>::finalize_merged_data): Ditto. * merge.h (Merge_map): Delete forward declaration. (Object_merge_map::add_mapping): Pass in and use a Output_section_data instead of a Merge_map. (Object_merge_map::get_output_offset): Remove the merge_map argument. (Object_merge_map::is_merge_section_for): Pass in and use a Output_section_data instead of a Merge_map. (Input_merge_map::Object_merge_map::merge_map): Replace with output_data. (Object_merge_map::get_or_make_input_merge_map): Pass in and use a Output_section_data instead of a Merge_map. (Merge_map): Delete. (Output_merge_base::Output_merge_base): Don't initialize merge_map_. (Output_merge_base::do_is_merge_section_for): Delete. (Output_merge_base::add_mapping): Delete. (Output_merge_base::merge_map_): Delete. * object.cc (Relobj::initialize_input_to_output_map): New. (Relobj::initialize_input_to_output_map): New. (Relobj::merge_output_offset): New. (Relobj::is_merge_section_for): New. (Relobj::initialize_input_to_output_map): Instantiate for 32 and 64 bits. * object.h (Relobj::merge_map): Delete. (initialize_input_to_output_map): New. (set_merge_map): Delete. (add_merge_mapping): New. (merge_output_offset): New. (is_merge_section_for): New. * output.cc (Output_section::Input_section::is_merge_section_for): Use object->is_merge_section_for. * output.h (Output_section_data::is_merge_section_for): Delete. (Output_section_data::do_is_merge_section_for): Delete. * reloc.cc (Merged_symbol_value<size>::initialize_input_to_output_map): Use object->initialize_input_to_output_map. (Merged_symbol_value<size>::value_from_output_section): Use object->merge_output_offset.
Diffstat (limited to 'gold/object.h')
-rw-r--r--gold/object.h29
1 files changed, 19 insertions, 10 deletions
diff --git a/gold/object.h b/gold/object.h
index cce6c8c..126bff5 100644
--- a/gold/object.h
+++ b/gold/object.h
@@ -41,6 +41,7 @@ class Cref;
class Layout;
class Output_data;
class Output_section;
+class Output_section_data;
class Output_file;
class Output_symtab_xindex;
class Pluginobj;
@@ -1200,18 +1201,26 @@ class Relobj : public Object
relocs_must_follow_section_writes() const
{ return this->relocs_must_follow_section_writes_; }
- // Return the object merge map.
- Object_merge_map*
- merge_map() const
- { return this->object_merge_map_; }
+ template<int size>
+ void
+ initialize_input_to_output_map(unsigned int shndx,
+ typename elfcpp::Elf_types<size>::Elf_Addr starting_address,
+ Unordered_map<section_offset_type,
+ typename elfcpp::Elf_types<size>::Elf_Addr>* output_address) const;
- // Set the object merge map.
void
- set_merge_map(Object_merge_map* object_merge_map)
- {
- gold_assert(this->object_merge_map_ == NULL);
- this->object_merge_map_ = object_merge_map;
- }
+ add_merge_mapping(Output_section_data *output_data,
+ unsigned int shndx, section_offset_type offset,
+ section_size_type length,
+ section_offset_type output_offset);
+
+ bool
+ merge_output_offset(unsigned int shndx, section_offset_type offset,
+ section_offset_type *poutput) const;
+
+ bool
+ is_merge_section_for(const Output_section_data* output_data,
+ unsigned int shndx) const;
// Record the relocatable reloc info for an input reloc section.
void