Fix corrupted .eh_frame section with LTO and --gc-sections.

[platform/upstream/binutils.git] / gold / mapfile.cc

diff --git a/gold/mapfile.cc b/gold/mapfile.cc
index e053419..dc995e9 100644 (file)
--- a/gold/mapfile.cc
+++ b/gold/mapfile.cc
@@ -1,6 +1,6 @@
 // mapfile.cc -- map file generation for gold
 
-// Copyright 2008 Free Software Foundation, Inc.
+// Copyright (C) 2008-2014 Free Software Foundation, Inc.
 // Written by Ian Lance Taylor <iant@google.com>.
 
 // This file is part of gold.
@@ -105,8 +105,7 @@ Mapfile::advance_to_column(size_t from, size_t to)
 // Report about including a member from an archive.
 
 void
-Mapfile::report_include_archive_member(const Archive* archive,
-                                      const std::string& member_name,
+Mapfile::report_include_archive_member(const std::string& member_name,
                                       const Symbol* sym, const char* why)
 {
   // We print a header before the list of archive members, mainly for
@@ -118,13 +117,9 @@ Mapfile::report_include_archive_member(const Archive* archive,
       this->printed_archive_header_ = true;
     }
 
-  fprintf(this->map_file_, "%s(%s)", archive->file().filename().c_str(),
-         member_name.c_str());
+  fprintf(this->map_file_, "%s", member_name.c_str());
 
-  size_t len = (archive->file().filename().length()
-               + member_name.length()
-               + 2);
-  this->advance_to_column(len, 30);
+  this->advance_to_column(member_name.length(), 30);
 
   if (sym == NULL)
     fprintf(this->map_file_, "%s", why);
@@ -207,7 +202,7 @@ Mapfile::print_memory_map_header()
 template<int size, bool big_endian>
 void
 Mapfile::print_input_section_symbols(
-    const Sized_relobj<size, big_endian>* relobj,
+    const Sized_relobj_file<size, big_endian>* relobj,
     unsigned int shndx)
 {
   unsigned int symcount = relobj->symbol_count();
@@ -256,12 +251,10 @@ Mapfile::print_input_section(Relobj* relobj, unsigned int shndx)
     }
   else
     {
-      section_offset_type offset;
-      os = relobj->output_section(shndx, &offset);
-      if (offset == -1)
-       addr = ~0ULL;
-      else
-       addr = os->address() + offset;
+      os = relobj->output_section(shndx);
+      addr = relobj->output_section_offset(shndx);
+      if (addr != -1ULL)
+       addr += os->address();
     }
 
   char sizebuf[50];
@@ -280,8 +273,8 @@ Mapfile::print_input_section(Relobj* relobj, unsigned int shndx)
 #ifdef HAVE_TARGET_32_LITTLE
        case Parameters::TARGET_32_LITTLE:
          {
-           const Sized_relobj<32, false>* sized_relobj =
-             static_cast<Sized_relobj<32, false>*>(relobj);
+           const Sized_relobj_file<32, false>* sized_relobj =
+             static_cast<Sized_relobj_file<32, false>*>(relobj);
            this->print_input_section_symbols(sized_relobj, shndx);
          }
          break;
@@ -289,8 +282,8 @@ Mapfile::print_input_section(Relobj* relobj, unsigned int shndx)
 #ifdef HAVE_TARGET_32_BIG
        case Parameters::TARGET_32_BIG:
          {
-           const Sized_relobj<32, true>* sized_relobj =
-             static_cast<Sized_relobj<32, true>*>(relobj);
+           const Sized_relobj_file<32, true>* sized_relobj =
+             static_cast<Sized_relobj_file<32, true>*>(relobj);
            this->print_input_section_symbols(sized_relobj, shndx);
          }
          break;
@@ -298,8 +291,8 @@ Mapfile::print_input_section(Relobj* relobj, unsigned int shndx)
 #ifdef HAVE_TARGET_64_LITTLE
        case Parameters::TARGET_64_LITTLE:
          {
-           const Sized_relobj<64, false>* sized_relobj =
-             static_cast<Sized_relobj<64, false>*>(relobj);
+           const Sized_relobj_file<64, false>* sized_relobj =
+             static_cast<Sized_relobj_file<64, false>*>(relobj);
            this->print_input_section_symbols(sized_relobj, shndx);
          }
          break;
@@ -307,8 +300,8 @@ Mapfile::print_input_section(Relobj* relobj, unsigned int shndx)
 #ifdef HAVE_TARGET_64_BIG
        case Parameters::TARGET_64_BIG:
          {
-           const Sized_relobj<64, true>* sized_relobj =
-             static_cast<Sized_relobj<64, true>*>(relobj);
+           const Sized_relobj_file<64, true>* sized_relobj =
+             static_cast<Sized_relobj_file<64, true>*>(relobj);
            this->print_input_section_symbols(sized_relobj, shndx);
          }
          break;
@@ -354,6 +347,12 @@ Mapfile::print_discarded_sections(const Input_objects* input_objects)
        ++p)
     {
       Relobj* relobj = *p;
+      // Lock the object so we can read from it.  This is only called
+      // single-threaded from Layout_task_runner, so it is OK to lock.
+      // Unfortunately we have no way to pass in a Task token.
+      const Task* dummy_task = reinterpret_cast<const Task*>(-1);
+      Task_lock_obj<Object> tl(dummy_task, relobj);
+
       unsigned int shnum = relobj->shnum();
       for (unsigned int i = 0; i < shnum; ++i)
        {