darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Don't crash if we change the address of the .eh_frame section after we

Browse source 
find its size.
This commit is contained in:
Ian Lance Taylor 2008-03-13 20:58:11 +00:00
parent 018f1beaa0
commit 1d6531cfad
3 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gold/ehframe.cc
View file

@ -487,7 +487,9 @@ Eh_frame::Eh_frame()
eh_frame_hdr_(NULL), eh_frame_hdr_(NULL),
cie_offsets_(), cie_offsets_(),
unmergeable_cie_offsets_(), unmergeable_cie_offsets_(),
merge_map_() merge_map_(),
mappings_are_done_(false),
final_data_size_(0)
{ {
} }
@ -1011,6 +1013,15 @@ Eh_frame::fde_count() const
void void
Eh_frame::set_final_data_size() Eh_frame::set_final_data_size()
{ {
// We can be called more than once if Layout::set_segment_offsets
// finds a better mapping. We don't want to add all the mappings
// again.
if (this->mappings_are_done_)
{
this->set_data_size(this->final_data_size_);
return;
}
section_offset_type output_offset = 0; section_offset_type output_offset = 0;
for (Unmergeable_cie_offsets::iterator p = for (Unmergeable_cie_offsets::iterator p =
@ -1028,6 +1039,9 @@ Eh_frame::set_final_data_size()
this->addralign(), this->addralign(),
&this->merge_map_); &this->merge_map_);
this->mappings_are_done_ = true;
this->final_data_size_ = output_offset;
gold_assert((output_offset & (this->addralign() - 1)) == 0); gold_assert((output_offset & (this->addralign() - 1)) == 0);
this->set_data_size(output_offset); this->set_data_size(output_offset);
} }

5
gold/ehframe.h
View file

@ -427,6 +427,11 @@ class Eh_frame : public Output_section_data
Unmergeable_cie_offsets unmergeable_cie_offsets_; Unmergeable_cie_offsets unmergeable_cie_offsets_;
// A mapping from input sections to the output section. // A mapping from input sections to the output section.
Merge_map merge_map_; Merge_map merge_map_;
// Whether we have created the mappings to the output section.
bool mappings_are_done_;
// The final data size. This is only set if mappings_are_done_ is
// true.
section_size_type final_data_size_;
}; };
} // End namespace gold. } // End namespace gold.

4
gold/merge.cc
View file

@ -528,7 +528,9 @@ Output_merge_string<Char_type>::finalize_merged_data()
this->add_mapping(p->object, p->shndx, p->offset, p->length, offset); this->add_mapping(p->object, p->shndx, p->offset, p->length, offset);
} }
// Save some memory. // Save some memory. This also ensures that this function will work
// if called twice, as may happen if Layout::set_segment_offsets
// finds a better alignment.
this->merged_strings_.clear(); this->merged_strings_.clear();
return this->stringpool_.get_strtab_size(); return this->stringpool_.get_strtab_size();