Fix build failure in inf-ptrace.c.

[binutils-gdb.git] / gold / ehframe.cc

diff --git a/gold/ehframe.cc b/gold/ehframe.cc
index 8306f51b6e75b3e68a014e33b1d4f09bcd682904..333e665c1e06b8123e5898451200747283270555 100644 (file)
--- a/gold/ehframe.cc
+++ b/gold/ehframe.cc
@@ -1,6 +1,6 @@
 // ehframe.cc -- handle exception frame sections for gold
 
-// Copyright 2006, 2007 Free Software Foundation, Inc.
+// Copyright 2006, 2007, 2008 Free Software Foundation, Inc.
 // Written by Ian Lance Taylor <iant@google.com>.
 
 // This file is part of gold.
@@ -109,46 +109,31 @@ Eh_frame_hdr::set_final_data_size()
 void
 Eh_frame_hdr::do_write(Output_file* of)
 {
-  if (parameters->get_size() == 32)
+  switch (parameters->size_and_endianness())
     {
-      if (!parameters->is_big_endian())
-       {
 #ifdef HAVE_TARGET_32_LITTLE
-         this->do_sized_write<32, false>(of);
-#else
-         gold_unreachable();
+    case Parameters::TARGET_32_LITTLE:
+      this->do_sized_write<32, false>(of);
+      break;
 #endif
-       }
-      else
-       {
 #ifdef HAVE_TARGET_32_BIG
-         this->do_sized_write<32, true>(of);
-#else
-         gold_unreachable();
+    case Parameters::TARGET_32_BIG:
+      this->do_sized_write<32, true>(of);
+      break;
 #endif
-       }
-    }
-  else if (parameters->get_size() == 64)
-    {
-      if (!parameters->is_big_endian())
-       {
 #ifdef HAVE_TARGET_64_LITTLE
-         this->do_sized_write<64, false>(of);
-#else
-         gold_unreachable();
+    case Parameters::TARGET_64_LITTLE:
+      this->do_sized_write<64, false>(of);
+      break;
 #endif
-       }
-      else
-       {
 #ifdef HAVE_TARGET_64_BIG
-         this->do_sized_write<64, true>(of);
-#else
-         gold_unreachable();
+    case Parameters::TARGET_64_BIG:
+      this->do_sized_write<64, true>(of);
+      break;
 #endif
-       }
+    default:
+      gold_unreachable();
     }
-  else
-    gold_unreachable();
 }
 
 // Write the data to the file with the right endianness.
@@ -502,7 +487,9 @@ Eh_frame::Eh_frame()
     eh_frame_hdr_(NULL),
     cie_offsets_(),
     unmergeable_cie_offsets_(),
-    merge_map_()
+    merge_map_(),
+    mappings_are_done_(false),
+    final_data_size_(0)
 {
 }
 
@@ -570,7 +557,8 @@ Eh_frame::add_ehframe_input_section(
                                          reloc_type, pcontents,
                                          contents_len, &new_cies))
     {
-      this->eh_frame_hdr_->found_unrecognized_eh_frame_section();
+      if (this->eh_frame_hdr_ != NULL)
+       this->eh_frame_hdr_->found_unrecognized_eh_frame_section();
 
       for (New_cies::iterator p = new_cies.begin();
           p != new_cies.end();
@@ -984,9 +972,12 @@ Eh_frame::read_fde(Sized_relobj<size, big_endian>* object,
   if (symndx >= symbols_size / sym_size)
     return false;
   elfcpp::Sym<size, big_endian> sym(symbols + symndx * sym_size);
-  fde_shndx = sym.get_st_shndx();
+  bool is_ordinary;
+  fde_shndx = object->adjust_sym_shndx(symndx, sym.get_st_shndx(),
+                                      &is_ordinary);
 
-  if (fde_shndx != elfcpp::SHN_UNDEF
+  if (is_ordinary
+      && fde_shndx != elfcpp::SHN_UNDEF
       && fde_shndx < object->shnum()
       && !object->is_section_included(fde_shndx))
     {
@@ -1026,6 +1017,15 @@ Eh_frame::fde_count() const
 void
 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;
 
   for (Unmergeable_cie_offsets::iterator p =
@@ -1043,6 +1043,9 @@ Eh_frame::set_final_data_size()
                                            this->addralign(),
                                            &this->merge_map_);
 
+  this->mappings_are_done_ = true;
+  this->final_data_size_ = output_offset;
+
   gold_assert((output_offset & (this->addralign() - 1)) == 0);
   this->set_data_size(output_offset);
 }
@@ -1075,46 +1078,31 @@ Eh_frame::do_write(Output_file* of)
   const off_t oview_size = this->data_size();
   unsigned char* const oview = of->get_output_view(offset, oview_size);
 
-  if (parameters->get_size() == 32)
+  switch (parameters->size_and_endianness())
     {
-      if (!parameters->is_big_endian())
-       {
 #ifdef HAVE_TARGET_32_LITTLE
-         this->do_sized_write<32, false>(oview);
-#else
-         gold_unreachable();
+    case Parameters::TARGET_32_LITTLE:
+      this->do_sized_write<32, false>(oview);
+      break;
 #endif
-       }
-      else
-       {
 #ifdef HAVE_TARGET_32_BIG
-         this->do_sized_write<32, true>(oview);
-#else
-         gold_unreachable();
+    case Parameters::TARGET_32_BIG:
+      this->do_sized_write<32, true>(oview);
+      break;
 #endif
-       }
-    }
-  else if (parameters->get_size() == 64)
-    {
-      if (!parameters->is_big_endian())
-       {
 #ifdef HAVE_TARGET_64_LITTLE
-         this->do_sized_write<64, false>(oview);
-#else
-         gold_unreachable();
+    case Parameters::TARGET_64_LITTLE:
+      this->do_sized_write<64, false>(oview);
+      break;
 #endif
-       }
-      else
-       {
 #ifdef HAVE_TARGET_64_BIG
-         this->do_sized_write<64, true>(oview);
-#else
-         gold_unreachable();
+    case Parameters::TARGET_64_BIG:
+      this->do_sized_write<64, true>(oview);
+      break;
 #endif
-       }
+    default:
+      gold_unreachable();
     }
-  else
-    gold_unreachable();
 
   of->write_output_view(offset, oview_size, oview);
 }