aboutsummaryrefslogtreecommitdiff
path: root/gold/ehframe.cc
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/ehframe.cc
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/ehframe.cc')
-rw-r--r--gold/ehframe.cc33
1 files changed, 12 insertions, 21 deletions
diff --git a/gold/ehframe.cc b/gold/ehframe.cc
index faea1a8..711103b 100644
--- a/gold/ehframe.cc
+++ b/gold/ehframe.cc
@@ -412,7 +412,7 @@ Cie::~Cie()
section_offset_type
Cie::set_output_offset(section_offset_type output_offset,
unsigned int addralign,
- Merge_map* merge_map)
+ Output_section_data *output_data)
{
size_t length = this->contents_.length();
@@ -422,8 +422,9 @@ Cie::set_output_offset(section_offset_type output_offset,
if (this->object_ != NULL)
{
// Add a mapping so that relocations are applied correctly.
- merge_map->add_mapping(this->object_, this->shndx_, this->input_offset_,
- length, output_offset);
+ this->object_->add_merge_mapping(output_data, this->shndx_,
+ this->input_offset_, length,
+ output_offset);
}
length = align_address(length, addralign);
@@ -432,7 +433,7 @@ Cie::set_output_offset(section_offset_type output_offset,
p != this->fdes_.end();
++p)
{
- (*p)->add_mapping(output_offset + length, merge_map);
+ (*p)->add_mapping(output_offset + length, output_data);
size_t fde_length = (*p)->length();
fde_length = align_address(fde_length, addralign);
@@ -531,7 +532,6 @@ Eh_frame::Eh_frame()
eh_frame_hdr_(NULL),
cie_offsets_(),
unmergeable_cie_offsets_(),
- merge_map_(),
mappings_are_done_(false),
final_data_size_(0)
{
@@ -958,8 +958,8 @@ Eh_frame::read_cie(Sized_relobj_file<size, big_endian>* object,
// know for sure that we are doing a special mapping for this
// input section, but that's OK--if we don't do a special
// mapping, nobody will ever ask for the mapping we add here.
- this->merge_map_.add_mapping(object, shndx, (pcie - 8) - pcontents,
- pcieend - (pcie - 8), -1);
+ object->add_merge_mapping(this, shndx, (pcie - 8) - pcontents,
+ pcieend - (pcie - 8), -1);
}
// Record this CIE plus the offset in the input section.
@@ -1026,8 +1026,8 @@ Eh_frame::read_fde(Sized_relobj_file<size, big_endian>* object,
{
// This FDE applies to a section which we are discarding. We
// can discard this FDE.
- this->merge_map_.add_mapping(object, shndx, (pfde - 8) - pcontents,
- pfdeend - (pfde - 8), -1);
+ object->add_merge_mapping(this, shndx, (pfde - 8) - pcontents,
+ pfdeend - (pfde - 8), -1);
return true;
}
@@ -1107,14 +1107,14 @@ Eh_frame::set_final_data_size()
++p)
output_offset = (*p)->set_output_offset(output_offset,
this->addralign(),
- &this->merge_map_);
+ this);
for (Cie_offsets::iterator p = this->cie_offsets_.begin();
p != this->cie_offsets_.end();
++p)
output_offset = (*p)->set_output_offset(output_offset,
this->addralign(),
- &this->merge_map_);
+ this);
this->mappings_are_done_ = true;
this->final_data_size_ = output_offset - output_start;
@@ -1130,16 +1130,7 @@ Eh_frame::do_output_offset(const Relobj* object, unsigned int shndx,
section_offset_type offset,
section_offset_type* poutput) const
{
- return this->merge_map_.get_output_offset(object, shndx, offset, poutput);
-}
-
-// Return whether this is the merge section for an input section.
-
-bool
-Eh_frame::do_is_merge_section_for(const Relobj* object,
- unsigned int shndx) const
-{
- return this->merge_map_.is_merge_section_for(object, shndx);
+ return object->merge_output_offset(shndx, offset, poutput);
}
// Write the data to the output file.