From cafdd5697b0e6c1f6344caee64f798e7e72424d4 Mon Sep 17 00:00:00 2001 From: Cary Coutant Date: Thu, 14 Nov 2013 13:15:06 -0800 Subject: [PATCH] Revert "Fix race condition while building EH frame header." This reverts commit 7cdd7d57e6fa3932eb63aa785ae0e3fa837aab20. --- gold/ChangeLog | 14 ++++++++++++++ gold/ehframe.cc | 6 +----- gold/ehframe.h | 7 +------ 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/gold/ChangeLog b/gold/ChangeLog index a56044cac2d..d953d70cbd0 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,17 @@ +2013-11-14 Cary Coutant + + Revert patch -- this did not fix the problem, and there is + no race there. + + 2013-11-14 Cary Coutant + + PR gold/14860 + * ehframe.cc (Eh_frame_hdr::Eh_frame_hdr): Initialize lock_. + (Ehframe_hdr::set_final_data_size): Allocate a Lock. + * ehframe.h (Eh_frame_hdr::record_fde): Hold the lock while + updating fde_offsets_. + (Eh_frame_hdr::lock_): New data member. + 2013-11-14 Cary Coutant * dwp.cc (Dwo_file_entry): New type. diff --git a/gold/ehframe.cc b/gold/ehframe.cc index be262bffad3..08a9ec6bd17 100644 --- a/gold/ehframe.cc +++ b/gold/ehframe.cc @@ -84,8 +84,7 @@ 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), - lock_(NULL) + any_unrecognized_eh_frame_sections_(false) { } @@ -103,9 +102,6 @@ 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 d5ac668e417..8aab8b81684 100644 --- a/gold/ehframe.h +++ b/gold/ehframe.h @@ -60,10 +60,7 @@ 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_) - { - Hold_lock(*this->lock_); - this->fde_offsets_.push_back(std::make_pair(fde_offset, fde_encoding)); - } + this->fde_offsets_.push_back(std::make_pair(fde_offset, fde_encoding)); } protected: @@ -160,8 +157,6 @@ 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. -- 2.30.2