X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gold%2Fehframe.h;h=4fd8f3e2f68885c3fc7325788c0e01d4c53dca5c;hb=13bff72615e5a93a6e5f28e83a594125e66ccced;hp=8aab8b81684b58317dc11f21c25b9fe6c52ad4ba;hpb=4bead2d512271ca2a0dee6172042558795b134cc;p=deliverable%2Fbinutils-gdb.git

diff --git a/gold/ehframe.h b/gold/ehframe.h
index 8aab8b8168..4fd8f3e2f6 100644
--- 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-2019 Free Software Foundation, Inc.
 // Written by Ian Lance Taylor <iant@google.com>.
 
 // This file is part of gold.
@@ -192,27 +192,33 @@ class Fde
   // Add a mapping for this FDE to MERGE_MAP, so that relocations
   // against the FDE are applied to right part of the output file.
   void
-  add_mapping(section_offset_type output_offset, Merge_map* merge_map) const
+  add_mapping(section_offset_type output_offset,
+              Output_section_data* output_data) const
   {
     if (this->object_ != NULL)
-      merge_map->add_mapping(this->object_, this->u_.from_object.shndx,
+      this->object_->add_merge_mapping(output_data, this->u_.from_object.shndx,
 			     this->u_.from_object.input_offset, this->length(),
 			     output_offset);
   }
 
   // Return whether this FDE was added after merge mapping.
   bool
-  post_map()
+  post_map() const
   { return this->object_ == NULL && this->u_.from_linker.post_map; }
 
+  // Return whether this FDE was added for the PLT after merge mapping.
+  bool
+  post_map(const Output_data* plt) const
+  { return this->post_map() && this->u_.from_linker.plt == plt; }
+
   // Write the FDE to OVIEW starting at OFFSET.  FDE_ENCODING is the
   // encoding, from the CIE.  Round up the bytes to ADDRALIGN if
   // necessary.  ADDRESS is the virtual address of OVIEW.  Record the
   // 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);
 
@@ -297,6 +303,16 @@ class Cie
   add_fde(Fde* fde)
   { this->fdes_.push_back(fde); }
 
+  // Remove the last FDE associated with this CIE.
+  void
+  remove_fde()
+  { this->fdes_.pop_back(); }
+
+  // Access the last FDE associated with this CIE.
+  const Fde*
+  last_fde() const
+  { return this->fdes_.back(); }
+
   // Return the number of FDEs.
   unsigned int
   fde_count() const
@@ -308,7 +324,7 @@ class Cie
   // mapping.  It returns the new output offset.
   section_offset_type
   set_output_offset(section_offset_type output_offset, unsigned int addralign,
-		    Merge_map*);
+		    Output_section_data*);
 
   // Write the CIE to OVIEW starting at OFFSET.  Round up the bytes to
   // ADDRALIGN.  ADDRESS is the virtual address of OVIEW.
@@ -317,10 +333,16 @@ 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);
 
+  // Return the FDE encoding.
+  unsigned char
+  fde_encoding() const
+  { return this->fde_encoding_; }
+
   friend bool operator<(const Cie&, const Cie&);
   friend bool operator==(const Cie&, const Cie&);
 
@@ -357,6 +379,14 @@ extern bool operator==(const Cie&, const Cie&);
 class Eh_frame : public Output_section_data
 {
  public:
+  enum Eh_frame_section_disposition
+  {
+    EH_EMPTY_SECTION,
+    EH_UNRECOGNIZED_SECTION,
+    EH_OPTIMIZABLE_SECTION,
+    EH_END_MARKER_SECTION
+  };
+
   Eh_frame();
 
   // Record the associated Eh_frame_hdr, if any.
@@ -372,7 +402,7 @@ class Eh_frame : public Output_section_data
   // returns whether the section was incorporated into the .eh_frame
   // data.
   template<int size, bool big_endian>
-  bool
+  Eh_frame_section_disposition
   add_ehframe_input_section(Sized_relobj_file<size, big_endian>* object,
 			    const unsigned char* symbols,
 			    section_size_type symbols_size,
@@ -390,6 +420,11 @@ class Eh_frame : public Output_section_data
 		      size_t cie_length, const unsigned char* fde_data,
 		      size_t fde_length);
 
+  // Remove all post-map unwind information for a PLT.
+  void
+  remove_ehframe_for_plt(Output_data* plt, const unsigned char* cie_data,
+			 size_t cie_length);
+
   // Return the number of FDEs.
   unsigned int
   fde_count() const;
@@ -405,10 +440,6 @@ class Eh_frame : public Output_section_data
 		   section_offset_type offset,
 		   section_offset_type* poutput) const;
 
-  // Return whether this is the merge section for an input section.
-  bool
-  do_is_merge_section_for(const Relobj*, unsigned int shndx) const;
-
   // Write the data to the file.
   void
   do_write(Output_file*);
@@ -503,8 +534,6 @@ class Eh_frame : public Output_section_data
   // A mapping from unmergeable CIEs to their offset in the output
   // file.
   Unmergeable_cie_offsets unmergeable_cie_offsets_;
-  // A mapping from input sections to the output section.
-  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