When disabling target async, remove all target event sources from the event loop

[deliverable/binutils-gdb.git] / gold / ehframe.h

diff --git a/gold/ehframe.h b/gold/ehframe.h
index d5ac668e417faf423b8feddca5d3cf33705119b5..aa2bd31ab87885d8368e0e3dbe2017897201659d 100644 (file)
--- a/gold/ehframe.h
+++ b/gold/ehframe.h
@@ -1,6 +1,6 @@
 // ehframe.h -- handle exception frame sections for gold  -*- C++ -*-
 
-// Copyright 2006, 2007, 2008, 2010, 2011 Free Software Foundation, Inc.
+// Copyright (C) 2006-2015 Free Software Foundation, Inc.
 // Written by Ian Lance Taylor <iant@google.com>.
 
 // This file is part of gold.
@@ -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.
@@ -216,8 +211,8 @@ class Fde
   // FDE in EH_FRAME_HDR.  Return the new offset.
   template<int size, bool big_endian>
   section_offset_type
-  write(unsigned char* oview, section_offset_type offset,
-       uint64_t address, unsigned int addralign,
+  write(unsigned char* oview, section_offset_type output_section_offset,
+       section_offset_type offset, uint64_t address, unsigned int addralign,
        section_offset_type cie_offset, unsigned char fde_encoding,
        Eh_frame_hdr* eh_frame_hdr);
 
@@ -322,7 +317,8 @@ class Cie
   // writing.  Return the new offset.
   template<int size, bool big_endian>
   section_offset_type
-  write(unsigned char* oview, section_offset_type offset, uint64_t address,
+  write(unsigned char* oview, section_offset_type output_section_offset,
+       section_offset_type offset, uint64_t address,
        unsigned int addralign, Eh_frame_hdr* eh_frame_hdr,
        Post_fdes* post_fdes);