1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
diff --git a/gold/ehframe.cc b/gold/ehframe.cc
index 08a9ec6..be262bf 100644
--- a/gold/ehframe.cc
+++ b/gold/ehframe.cc
@@ -84,7 +84,8 @@ Eh_frame_hdr::Eh_frame_hdr(Output_section* eh_frame_section,
eh_frame_section_(eh_frame_section),
eh_frame_data_(eh_frame_data),
fde_offsets_(),
- any_unrecognized_eh_frame_sections_(false)
+ any_unrecognized_eh_frame_sections_(false),
+ lock_(NULL)
{
}
@@ -102,6 +103,9 @@ Eh_frame_hdr::set_final_data_size()
this->fde_offsets_.reserve(fde_count);
}
this->set_data_size(data_size);
+ // We need a lock for updating the fde_offsets_ vector while writing
+ // the FDEs.
+ this->lock_ = new Lock();
}
// Write the data to the file.
diff --git a/gold/ehframe.h b/gold/ehframe.h
index 8aab8b8..d5ac668 100644
--- a/gold/ehframe.h
+++ b/gold/ehframe.h
@@ -60,7 +60,10 @@ class Eh_frame_hdr : public Output_section_data
record_fde(section_offset_type fde_offset, unsigned char fde_encoding)
{
if (!this->any_unrecognized_eh_frame_sections_)
- this->fde_offsets_.push_back(std::make_pair(fde_offset, fde_encoding));
+ {
+ Hold_lock(*this->lock_);
+ this->fde_offsets_.push_back(std::make_pair(fde_offset, fde_encoding));
+ }
}
protected:
@@ -157,6 +160,8 @@ class Eh_frame_hdr : public Output_section_data
// Whether we found any .eh_frame sections which we could not
// process.
bool any_unrecognized_eh_frame_sections_;
+ // Lock held while updating fde_offsets_.
+ Lock* lock_;
};
// This class holds an FDE.
|
