Delete unused or undefined functions.
[deliverable/binutils-gdb.git] / gold / archive.cc
index a64109aef1227422ddda5fbfa48fe8424be914d1..011c36ddd613a660d00c623c8494a5779f8d3651 100644 (file)
@@ -1,17 +1,43 @@
 // archive.cc -- archive support for gold
 
+// Copyright 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+// Written by Ian Lance Taylor <iant@google.com>.
+
+// This file is part of gold.
+
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+// MA 02110-1301, USA.
+
 #include "gold.h"
 
 #include <cerrno>
 #include <cstring>
 #include <climits>
 #include <vector>
+#include "libiberty.h"
+#include "filenames.h"
 
 #include "elfcpp.h"
+#include "options.h"
+#include "mapfile.h"
 #include "fileread.h"
+#include "readsyms.h"
 #include "symtab.h"
 #include "object.h"
 #include "archive.h"
+#include "plugin.h"
 
 namespace gold
 {
@@ -38,6 +64,11 @@ struct Archive::Archive_header
   char ar_fmag[2];
 };
 
+// Class Archive static variables.
+unsigned int Archive::total_archives;
+unsigned int Archive::total_members;
+unsigned int Archive::total_members_loaded;
+
 // Archive methods.
 
 const char Archive::armag[sarmag] =
@@ -45,14 +76,22 @@ const char Archive::armag[sarmag] =
   '!', '<', 'a', 'r', 'c', 'h', '>', '\n'
 };
 
-const char Archive::arfmag[2] = { '`', '\n' };
+const char Archive::armagt[sarmag] =
+{
+  '!', '<', 't', 'h', 'i', 'n', '>', '\n'
+};
 
-// Get a view into the underlying file.
+const char Archive::arfmag[2] = { '`', '\n' };
 
-const unsigned char*
-Archive::get_view(off_t start, off_t size)
+Archive::Archive(const std::string& name, Input_file* input_file,
+                 bool is_thin_archive, Dirsearch* dirpath, Task* task)
+  : name_(name), input_file_(input_file), armap_(), armap_names_(),
+    extended_names_(), armap_checked_(), seen_offsets_(), members_(),
+    is_thin_archive_(is_thin_archive), included_member_(false),
+    nested_archives_(), dirpath_(dirpath), task_(task), num_members_(0)
 {
-  return this->input_file_->file().get_view(start, size);
+  this->no_export_ =
+    parameters->options().check_excluded_libs(input_file->found_name());
 }
 
 // Set up the archive: read the symbol map and the extended name
@@ -61,60 +100,113 @@ Archive::get_view(off_t start, off_t size)
 void
 Archive::setup()
 {
+  // We need to ignore empty archives.
+  if (this->input_file_->file().filesize() == sarmag)
+    return;
+
   // The first member of the archive should be the symbol table.
   std::string armap_name;
-  off_t armap_size = this->read_header(sarmag, &armap_name);
-  if (!armap_name.empty())
+  section_size_type armap_size =
+    convert_to_section_size_type(this->read_header(sarmag, false,
+                                                  &armap_name, NULL));
+  off_t off = sarmag;
+  if (armap_name.empty())
+    {
+      this->read_armap(sarmag + sizeof(Archive_header), armap_size);
+      off = sarmag + sizeof(Archive_header) + armap_size;
+    }
+  else if (!this->input_file_->options().whole_archive())
+    gold_error(_("%s: no archive symbol table (run ranlib)"),
+              this->name().c_str());
+
+  // See if there is an extended name table.  We cache these views
+  // because it is likely that we will want to read the following
+  // header in the add_symbols routine.
+  if ((off & 1) != 0)
+    ++off;
+  std::string xname;
+  section_size_type extended_size =
+    convert_to_section_size_type(this->read_header(off, true, &xname, NULL));
+  if (xname == "/")
     {
-      fprintf(stderr, _("%s: %s: no archive symbol table (run ranlib)\n"),
-             program_name, this->name().c_str());
-      gold_exit(false);
+      const unsigned char* p = this->get_view(off + sizeof(Archive_header),
+                                              extended_size, false, true);
+      const char* px = reinterpret_cast<const char*>(p);
+      this->extended_names_.assign(px, extended_size);
     }
+  bool preread_syms = (parameters->options().threads()
+                       && parameters->options().preread_archive_symbols());
+#ifndef ENABLE_THREADS
+  preread_syms = false;
+#else
+  if (parameters->options().has_plugins())
+    preread_syms = false;
+#endif
+  if (preread_syms)
+    this->read_all_symbols();
+}
+
+// Unlock any nested archives.
+
+void
+Archive::unlock_nested_archives()
+{
+  for (Nested_archive_table::iterator p = this->nested_archives_.begin();
+       p != this->nested_archives_.end();
+       ++p)
+    {
+      p->second->unlock(this->task_);
+    }
+}
+
+// Read the archive symbol map.
+
+void
+Archive::read_armap(off_t start, section_size_type size)
+{
+  // To count the total number of archive members, we'll just count
+  // the number of times the file offset changes.  Since most archives
+  // group the symbols in the armap by object, this ought to give us
+  // an accurate count.
+  off_t last_seen_offset = -1;
 
   // Read in the entire armap.
-  const unsigned char* p = this->get_view(sarmag + sizeof(Archive_header),
-                                         armap_size);
+  const unsigned char* p = this->get_view(start, size, true, false);
 
   // Numbers in the armap are always big-endian.
   const elfcpp::Elf_Word* pword = reinterpret_cast<const elfcpp::Elf_Word*>(p);
-  unsigned int nsyms = elfcpp::read_elf_word<true>(pword);
+  unsigned int nsyms = elfcpp::Swap<32, true>::readval(pword);
   ++pword;
 
   // Note that the addition is in units of sizeof(elfcpp::Elf_Word).
   const char* pnames = reinterpret_cast<const char*>(pword + nsyms);
+  section_size_type names_size =
+    reinterpret_cast<const char*>(p) + size - pnames;
+  this->armap_names_.assign(pnames, names_size);
 
   this->armap_.resize(nsyms);
 
+  section_offset_type name_offset = 0;
   for (unsigned int i = 0; i < nsyms; ++i)
     {
-      this->armap_[i].name = pnames;
-      this->armap_[i].offset = elfcpp::read_elf_word<true>(pword);
-      pnames += strlen(pnames) + 1;
+      this->armap_[i].name_offset = name_offset;
+      this->armap_[i].file_offset = elfcpp::Swap<32, true>::readval(pword);
+      name_offset += strlen(pnames + name_offset) + 1;
       ++pword;
+      if (this->armap_[i].file_offset != last_seen_offset)
+        {
+          last_seen_offset = this->armap_[i].file_offset;
+          ++this->num_members_;
+        }
     }
 
-  if (reinterpret_cast<const unsigned char*>(pnames) - p > armap_size)
-    {
-      fprintf(stderr, _("%s: %s: bad archive symbol table names\n"),
-             program_name, this->name().c_str());
-      gold_exit(false);
-    }
+  if (static_cast<section_size_type>(name_offset) > names_size)
+    gold_error(_("%s: bad archive symbol table names"),
+              this->name().c_str());
 
-  // See if there is an extended name table.
-  off_t off = sarmag + sizeof(Archive_header) + armap_size;
-  if ((off & 1) != 0)
-    ++off;
-  std::string xname;
-  off_t extended_size = this->read_header(off, &xname);
-  if (xname == "/")
-    {
-      p = this->get_view(off + sizeof(Archive_header), extended_size);
-      const char* px = reinterpret_cast<const char*>(p);
-      this->extended_names_.assign(px, extended_size);
-    }
-
-  // Opening the file locked it.  Unlock it now.
-  this->input_file_->file().unlock();
+  // This array keeps track of which symbols are for archive elements
+  // which we have already included in the link.
+  this->armap_checked_.resize(nsyms);
 }
 
 // Read the header of an archive member at OFF.  Fail if something
@@ -122,17 +214,28 @@ Archive::setup()
 // of the member.
 
 off_t
-Archive::read_header(off_t off, std::string* pname)
+Archive::read_header(off_t off, bool cache, std::string* pname,
+                     off_t* nested_off)
 {
-  const unsigned char* p = this->get_view(off, sizeof(Archive_header));
+  const unsigned char* p = this->get_view(off, sizeof(Archive_header), true,
+                                         cache);
   const Archive_header* hdr = reinterpret_cast<const Archive_header*>(p);
+  return this->interpret_header(hdr, off,  pname, nested_off);
+}
+
+// Interpret the header of HDR, the header of the archive member at
+// file offset OFF.  Fail if something goes wrong.  Return the size of
+// the member.  Set *PNAME to the name of the member.
 
+off_t
+Archive::interpret_header(const Archive_header* hdr, off_t off,
+                          std::string* pname, off_t* nested_off) const
+{
   if (memcmp(hdr->ar_fmag, arfmag, sizeof arfmag) != 0)
     {
-      fprintf(stderr, _("%s; %s: malformed archive header at %ld\n"),
-             program_name, this->name().c_str(),
-             static_cast<long>(off));
-      gold_exit(false);
+      gold_error(_("%s: malformed archive header at %zu"),
+                this->name().c_str(), static_cast<size_t>(off));
+      return this->input_file_->file().filesize() - off;
     }
 
   const int size_string_size = sizeof hdr->ar_size;
@@ -150,10 +253,9 @@ Archive::read_header(off_t off, std::string* pname)
       || member_size < 0
       || (member_size == LONG_MAX && errno == ERANGE))
     {
-      fprintf(stderr, _("%s: %s: malformed archive header size at %ld\n"),
-             program_name, this->name().c_str(),
-             static_cast<long>(off));
-      gold_exit(false);
+      gold_error(_("%s: malformed archive header size at %zu"),
+                this->name().c_str(), static_cast<size_t>(off));
+      return this->input_file_->file().filesize() - off;
     }
 
   if (hdr->ar_name[0] != '/')
@@ -162,12 +264,13 @@ Archive::read_header(off_t off, std::string* pname)
       if (name_end == NULL
          || name_end - hdr->ar_name >= static_cast<int>(sizeof hdr->ar_name))
        {
-         fprintf(stderr, _("%s: %s: malformed archive header name at %ld\n"),
-                 program_name, this->name().c_str(),
-                 static_cast<long>(off));
-         gold_exit(false);
+         gold_error(_("%s: malformed archive header name at %zu"),
+                    this->name().c_str(), static_cast<size_t>(off));
+         return this->input_file_->file().filesize() - off;
        }
       pname->assign(hdr->ar_name, name_end - hdr->ar_name);
+      if (nested_off != NULL)
+        *nested_off = 0;
     }
   else if (hdr->ar_name[1] == ' ')
     {
@@ -183,133 +286,603 @@ Archive::read_header(off_t off, std::string* pname)
     {
       errno = 0;
       long x = strtol(hdr->ar_name + 1, &end, 10);
+      long y = 0;
+      if (*end == ':')
+        y = strtol(end + 1, &end, 10);
       if (*end != ' '
          || x < 0
          || (x == LONG_MAX && errno == ERANGE)
          || static_cast<size_t>(x) >= this->extended_names_.size())
        {
-         fprintf(stderr, _("%s: %s: bad extended name index at %ld\n"),
-                 program_name, this->name().c_str(),
-                 static_cast<long>(off));
-         gold_exit(false);
+         gold_error(_("%s: bad extended name index at %zu"),
+                    this->name().c_str(), static_cast<size_t>(off));
+         return this->input_file_->file().filesize() - off;
        }
 
       const char* name = this->extended_names_.data() + x;
-      const char* name_end = strchr(name, '/');
+      const char* name_end = strchr(name, '\n');
       if (static_cast<size_t>(name_end - name) > this->extended_names_.size()
-         || name_end[1] != '\n')
+         || name_end[-1] != '/')
        {
-         fprintf(stderr, _("%s: %s: bad extended name entry at header %ld\n"),
-                 program_name, this->name().c_str(),
-                 static_cast<long>(off));
-         gold_exit(false);
+         gold_error(_("%s: bad extended name entry at header %zu"),
+                    this->name().c_str(), static_cast<size_t>(off));
+         return this->input_file_->file().filesize() - off;
        }
-      pname->assign(name, name_end - name);
+      pname->assign(name, name_end - 1 - name);
+      if (nested_off != NULL)
+        *nested_off = y;
     }
 
   return member_size;
 }
 
+// An archive member iterator.
+
+class Archive::const_iterator
+{
+ public:
+  // The header of an archive member.  This is what this iterator
+  // points to.
+  struct Header
+  {
+    // The name of the member.
+    std::string name;
+    // The file offset of the member.
+    off_t off;
+    // The file offset of a nested archive member.
+    off_t nested_off;
+    // The size of the member.
+    off_t size;
+  };
+
+  const_iterator(Archive* archive, off_t off)
+    : archive_(archive), off_(off)
+  { this->read_next_header(); }
+
+  const Header&
+  operator*() const
+  { return this->header_; }
+
+  const Header*
+  operator->() const
+  { return &this->header_; }
+
+  const_iterator&
+  operator++()
+  {
+    if (this->off_ == this->archive_->file().filesize())
+      return *this;
+    this->off_ += sizeof(Archive_header);
+    if (!this->archive_->is_thin_archive())
+      this->off_ += this->header_.size;
+    if ((this->off_ & 1) != 0)
+      ++this->off_;
+    this->read_next_header();
+    return *this;
+  }
+
+  const_iterator
+  operator++(int)
+  {
+    const_iterator ret = *this;
+    ++*this;
+    return ret;
+  }
+
+  bool
+  operator==(const const_iterator p) const
+  { return this->off_ == p->off; }
+
+  bool
+  operator!=(const const_iterator p) const
+  { return this->off_ != p->off; }
+
+ private:
+  void
+  read_next_header();
+
+  // The underlying archive.
+  Archive* archive_;
+  // The current offset in the file.
+  off_t off_;
+  // The current archive header.
+  Header header_;
+};
+
+// Read the next archive header.
+
+void
+Archive::const_iterator::read_next_header()
+{
+  off_t filesize = this->archive_->file().filesize();
+  while (true)
+    {
+      if (filesize - this->off_ < static_cast<off_t>(sizeof(Archive_header)))
+       {
+         if (filesize != this->off_)
+           {
+             gold_error(_("%s: short archive header at %zu"),
+                        this->archive_->filename().c_str(),
+                        static_cast<size_t>(this->off_));
+             this->off_ = filesize;
+           }
+         this->header_.off = filesize;
+         return;
+       }
+
+      unsigned char buf[sizeof(Archive_header)];
+      this->archive_->file().read(this->off_, sizeof(Archive_header), buf);
+
+      const Archive_header* hdr = reinterpret_cast<const Archive_header*>(buf);
+      this->header_.size =
+       this->archive_->interpret_header(hdr, this->off_, &this->header_.name,
+                                        &this->header_.nested_off);
+      this->header_.off = this->off_;
+
+      // Skip special members.
+      if (!this->header_.name.empty() && this->header_.name != "/")
+       return;
+
+      this->off_ += sizeof(Archive_header) + this->header_.size;
+      if ((this->off_ & 1) != 0)
+       ++this->off_;
+    }
+}
+
+// Initial iterator.
+
+Archive::const_iterator
+Archive::begin()
+{
+  return Archive::const_iterator(this, sarmag);
+}
+
+// Final iterator.
+
+Archive::const_iterator
+Archive::end()
+{
+  return Archive::const_iterator(this, this->input_file_->file().filesize());
+}
+
+// Get the file and offset for an archive member, which may be an
+// external member of a thin archive.  Set *INPUT_FILE to the
+// file containing the actual member, *MEMOFF to the offset
+// within that file (0 if not a nested archive), and *MEMBER_NAME
+// to the name of the archive member.  Return TRUE on success.
+
+bool
+Archive::get_file_and_offset(off_t off, Input_file** input_file, off_t* memoff,
+                             off_t* memsize, std::string* member_name)
+{
+  off_t nested_off;
+
+  *memsize = this->read_header(off, false, member_name, &nested_off);
+
+  *input_file = this->input_file_;
+  *memoff = off + static_cast<off_t>(sizeof(Archive_header));
+
+  if (!this->is_thin_archive_)
+    return true;
+
+  // Adjust a relative pathname so that it is relative
+  // to the directory containing the archive.
+  if (!IS_ABSOLUTE_PATH(member_name->c_str()))
+    {
+      const char* arch_path = this->filename().c_str();
+      const char* basename = lbasename(arch_path);
+      if (basename > arch_path)
+        member_name->replace(0, 0,
+                             this->filename().substr(0, basename - arch_path));
+    }
+
+  if (nested_off > 0)
+    {
+      // This is a member of a nested archive.  Open the containing
+      // archive if we don't already have it open, then do a recursive
+      // call to include the member from that archive.
+      Archive* arch;
+      Nested_archive_table::const_iterator p =
+        this->nested_archives_.find(*member_name);
+      if (p != this->nested_archives_.end())
+        arch = p->second;
+      else
+        {
+          Input_file_argument* input_file_arg =
+            new Input_file_argument(member_name->c_str(),
+                                    Input_file_argument::INPUT_FILE_TYPE_FILE,
+                                    "", false, parameters->options());
+          *input_file = new Input_file(input_file_arg);
+         int dummy = 0;
+          if (!(*input_file)->open(*this->dirpath_, this->task_, &dummy))
+            return false;
+          arch = new Archive(*member_name, *input_file, false, this->dirpath_,
+                             this->task_);
+          arch->setup();
+          std::pair<Nested_archive_table::iterator, bool> ins =
+            this->nested_archives_.insert(std::make_pair(*member_name, arch));
+          gold_assert(ins.second);
+        }
+      return arch->get_file_and_offset(nested_off, input_file, memoff,
+                                      memsize, member_name);
+    }
+
+  // This is an external member of a thin archive.  Open the
+  // file as a regular relocatable object file.
+  Input_file_argument* input_file_arg =
+      new Input_file_argument(member_name->c_str(),
+                              Input_file_argument::INPUT_FILE_TYPE_FILE,
+                              "", false, this->input_file_->options());
+  *input_file = new Input_file(input_file_arg);
+  int dummy = 0;
+  if (!(*input_file)->open(*this->dirpath_, this->task_, &dummy))
+    return false;
+
+  *memoff = 0;
+  *memsize = (*input_file)->file().filesize();
+  return true;
+}
+
+// Return an ELF object for the member at offset OFF.  If the ELF
+// object has an unsupported target type, set *PUNCONFIGURED to true
+// and return NULL.
+
+Object*
+Archive::get_elf_object_for_member(off_t off, bool* punconfigured)
+{
+  *punconfigured = false;
+
+  Input_file* input_file;
+  off_t memoff;
+  off_t memsize;
+  std::string member_name;
+  if (!this->get_file_and_offset(off, &input_file, &memoff, &memsize,
+                                &member_name))
+    return NULL;
+
+  if (parameters->options().has_plugins())
+    {
+      Object* obj = parameters->options().plugins()->claim_file(input_file,
+                                                                memoff,
+                                                                memsize);
+      if (obj != NULL)
+        {
+          // The input file was claimed by a plugin, and its symbols
+          // have been provided by the plugin.
+          return obj;
+        }
+    }
+
+  const unsigned char* ehdr;
+  int read_size;
+  if (!is_elf_object(input_file, memoff, &ehdr, &read_size))
+    {
+      gold_error(_("%s: member at %zu is not an ELF object"),
+                this->name().c_str(), static_cast<size_t>(off));
+      return NULL;
+    }
+
+  Object *obj = make_elf_object((std::string(this->input_file_->filename())
+                                + "(" + member_name + ")"),
+                               input_file, memoff, ehdr, read_size,
+                               punconfigured);
+  if (obj == NULL)
+    return NULL;
+  obj->set_no_export(this->no_export());
+  return obj;
+}
+
+// Read the symbols from all the archive members in the link.
+
+void
+Archive::read_all_symbols()
+{
+  for (Archive::const_iterator p = this->begin();
+       p != this->end();
+       ++p)
+    this->read_symbols(p->off);
+}
+
+// Read the symbols from an archive member in the link.  OFF is the file
+// offset of the member header.
+
+void
+Archive::read_symbols(off_t off)
+{
+  bool dummy;
+  Object* obj = this->get_elf_object_for_member(off, &dummy);
+
+  if (obj == NULL)
+    return;
+
+  Read_symbols_data* sd = new Read_symbols_data;
+  obj->read_symbols(sd);
+  Archive_member member(obj, sd);
+  this->members_[off] = member;
+}
+
 // Select members from the archive and add them to the link.  We walk
 // through the elements in the archive map, and look each one up in
 // the symbol table.  If it exists as a strong undefined symbol, we
 // pull in the corresponding element.  We have to do this in a loop,
 // since pulling in one element may create new undefined symbols which
-// may be satisfied by other objects in the archive.
+// may be satisfied by other objects in the archive.  Return true in
+// the normal case, false if the first member we tried to add from
+// this archive had an incompatible target.
 
-void
+bool
 Archive::add_symbols(Symbol_table* symtab, Layout* layout,
-                    Input_objects* input_objects)
+                    Input_objects* input_objects, Mapfile* mapfile)
 {
-  size_t armap_size = this->armap_.size();
-  std::vector<bool> seen;
-  seen.resize(this->armap_.size());
-  seen.clear();
+  ++Archive::total_archives;
+
+  if (this->input_file_->options().whole_archive())
+    return this->include_all_members(symtab, layout, input_objects,
+                                    mapfile);
+
+  Archive::total_members += this->num_members_;
 
+  input_objects->archive_start(this);
+
+  const size_t armap_size = this->armap_.size();
+
+  // This is a quick optimization, since we usually see many symbols
+  // in a row with the same offset.  last_seen_offset holds the last
+  // offset we saw that was present in the seen_offsets_ set.
+  off_t last_seen_offset = -1;
+
+  // Track which symbols in the symbol table we've already found to be
+  // defined.
+
+  char* tmpbuf = NULL;
+  size_t tmpbuflen = 0;
   bool added_new_object;
   do
     {
       added_new_object = false;
-      off_t last = -1;
       for (size_t i = 0; i < armap_size; ++i)
        {
-         if (seen[i])
-           continue;
-         if (this->armap_[i].offset == last)
+          if (this->armap_checked_[i])
+            continue;
+         if (this->armap_[i].file_offset == last_seen_offset)
+            {
+              this->armap_checked_[i] = true;
+              continue;
+            }
+         if (this->seen_offsets_.find(this->armap_[i].file_offset)
+              != this->seen_offsets_.end())
            {
-             seen[i] = true;
+              this->armap_checked_[i] = true;
+             last_seen_offset = this->armap_[i].file_offset;
              continue;
            }
 
-         Symbol* sym = symtab->lookup(this->armap_[i].name);
+         const char* sym_name = (this->armap_names_.data()
+                                 + this->armap_[i].name_offset);
+
+         // In an object file, and therefore in an archive map, an
+         // '@' in the name separates the symbol name from the
+         // version name.  If there are two '@' characters, this is
+         // the default version.
+         const char* ver = strchr(sym_name, '@');
+         bool def = false;
+         if (ver != NULL)
+           {
+             size_t symlen = ver - sym_name;
+             if (symlen + 1 > tmpbuflen)
+               {
+                 tmpbuf = static_cast<char*>(realloc(tmpbuf, symlen + 1));
+                 tmpbuflen = symlen + 1;
+               }
+             memcpy(tmpbuf, sym_name, symlen);
+             tmpbuf[symlen] = '\0';
+             sym_name = tmpbuf;
+
+             ++ver;
+             if (*ver == '@')
+               {
+                 ++ver;
+                 def = true;
+               }
+           }
+
+         Symbol* sym = symtab->lookup(sym_name, ver);
+         if (def
+             && ver != NULL
+             && (sym == NULL
+                 || !sym->is_undefined()
+                 || sym->binding() == elfcpp::STB_WEAK))
+           sym = symtab->lookup(sym_name, NULL);
+
          if (sym == NULL)
-           continue;
-         else if (sym->shnum() != elfcpp::SHN_UNDEF)
            {
-             seen[i] = true;
+             // Check whether the symbol was named in a -u option.
+             if (!parameters->options().is_undefined(sym_name))
+               continue;
+           }
+         else if (!sym->is_undefined())
+           {
+              this->armap_checked_[i] = true;
              continue;
            }
          else if (sym->binding() == elfcpp::STB_WEAK)
            continue;
 
          // We want to include this object in the link.
-         last = this->armap_[i].offset;
-         this->include_member(symtab, layout, input_objects, last);
+         last_seen_offset = this->armap_[i].file_offset;
+         this->seen_offsets_.insert(last_seen_offset);
+          this->armap_checked_[i] = true;
+
+         std::string why;
+         if (sym == NULL)
+           {
+             why = "-u ";
+             why += sym_name;
+           }
+         if (!this->include_member(symtab, layout, input_objects,
+                                   last_seen_offset, mapfile, sym,
+                                   why.c_str()))
+           {
+             if (tmpbuf != NULL)
+               free(tmpbuf);
+             return false;
+           }
+
          added_new_object = true;
        }
     }
   while (added_new_object);
+
+  if (tmpbuf != NULL)
+    free(tmpbuf);
+
+  input_objects->archive_stop(this);
+
+  return true;
+}
+
+// Include all the archive members in the link.  This is for --whole-archive.
+
+bool
+Archive::include_all_members(Symbol_table* symtab, Layout* layout,
+                             Input_objects* input_objects, Mapfile* mapfile)
+{
+  input_objects->archive_start(this);
+
+  if (this->members_.size() > 0)
+    {
+      std::map<off_t, Archive_member>::const_iterator p;
+      for (p = this->members_.begin();
+           p != this->members_.end();
+           ++p)
+        {
+          if (!this->include_member(symtab, layout, input_objects, p->first,
+                                   mapfile, NULL, "--whole-archive"))
+           return false;
+          ++Archive::total_members;
+        }
+    }
+  else
+    {
+      for (Archive::const_iterator p = this->begin();
+           p != this->end();
+           ++p)
+        {
+          if (!this->include_member(symtab, layout, input_objects, p->off,
+                                   mapfile, NULL, "--whole-archive"))
+           return false;
+          ++Archive::total_members;
+        }
+    }
+
+  input_objects->archive_stop(this);
+
+  return true;
+}
+
+// Return the number of members in the archive.  This is only used for
+// reports.
+
+size_t
+Archive::count_members()
+{
+  size_t ret = 0;
+  for (Archive::const_iterator p = this->begin();
+       p != this->end();
+       ++p)
+    ++ret;
+  return ret;
 }
 
 // Include an archive member in the link.  OFF is the file offset of
-// the member header.
+// the member header.  WHY is the reason we are including this member.
+// Return true if we added the member or if we had an error, return
+// false if this was the first member we tried to add from this
+// archive and it had an incompatible format.
 
-void
+bool
 Archive::include_member(Symbol_table* symtab, Layout* layout,
-                       Input_objects* input_objects, off_t off)
+                       Input_objects* input_objects, off_t off,
+                       Mapfile* mapfile, Symbol* sym, const char* why)
 {
-  std::string n;
-  this->read_header(off, &n);
-
-  size_t memoff = off + sizeof(Archive_header);
-
-  // Read enough of the file to pick up the entire ELF header.
-  int ehdr_size = elfcpp::Elf_sizes<64>::ehdr_size;
-  off_t bytes;
-  const unsigned char* p = this->input_file_->file().get_view(memoff,
-                                                             ehdr_size,
-                                                             &bytes);
-  if (bytes < 4)
+  ++Archive::total_members_loaded;
+
+  std::map<off_t, Archive_member>::const_iterator p = this->members_.find(off);
+  if (p != this->members_.end())
     {
-      fprintf(stderr, _("%s: %s: member at %ld is not an ELF object"),
-             program_name, this->name().c_str(),
-             static_cast<long>(off));
-      gold_exit(false);
+      Object *obj = p->second.obj_;
+
+      Read_symbols_data *sd = p->second.sd_;
+      if (mapfile != NULL)
+        mapfile->report_include_archive_member(obj->name(), sym, why);
+      if (input_objects->add_object(obj))
+        {
+          obj->layout(symtab, layout, sd);
+          obj->add_symbols(symtab, sd, layout);
+         this->included_member_ = true;
+        }
+      delete sd;
+      return true;
     }
 
-  static unsigned char elfmagic[4] =
+  bool unconfigured;
+  Object* obj = this->get_elf_object_for_member(off, &unconfigured);
+
+  if (!this->included_member_
+      && this->searched_for()
+      && obj == NULL
+      && unconfigured)
     {
-      elfcpp::ELFMAG0, elfcpp::ELFMAG1,
-      elfcpp::ELFMAG2, elfcpp::ELFMAG3
-    };
-  if (memcmp(p, elfmagic, 4) != 0)
+      if (obj != NULL)
+       delete obj;
+      return false;
+    }
+
+  if (obj == NULL)
+    return true;
+
+  if (mapfile != NULL)
+    mapfile->report_include_archive_member(obj->name(), sym, why);
+
+  Pluginobj* pluginobj = obj->pluginobj();
+  if (pluginobj != NULL)
     {
-      fprintf(stderr, _("%s: %s: member at %ld is not an ELF object"),
-             program_name, this->name().c_str(),
-             static_cast<long>(off));
-      gold_exit(false);
+      pluginobj->add_symbols(symtab, NULL, layout);
+      this->included_member_ = true;
+      return true;
     }
 
-  Object* obj = make_elf_object((std::string(this->input_file_->filename())
-                                + "(" + n + ")"),
-                               this->input_file_, memoff, p, bytes);
+  if (!input_objects->add_object(obj))
+    delete obj;
+  else
+    {
+      Read_symbols_data sd;
+      obj->read_symbols(&sd);
+      obj->layout(symtab, layout, &sd);
+      obj->add_symbols(symtab, &sd, layout);
+
+      // If this is an external member of a thin archive, unlock the file
+      // for the next task.
+      if (obj->offset() == 0)
+        obj->unlock(this->task_);
+
+      this->included_member_ = true;
+    }
+
+  return true;
+}
 
-  input_objects->add_object(obj);
+// Print statistical information to stderr.  This is used for --stats.
 
-  Read_symbols_data sd;
-  obj->read_symbols(&sd);
-  obj->layout(layout, &sd);
-  obj->add_symbols(symtab, &sd);
+void
+Archive::print_stats()
+{
+  fprintf(stderr, _("%s: archive libraries: %u\n"),
+          program_name, Archive::total_archives);
+  fprintf(stderr, _("%s: total archive members: %u\n"),
+          program_name, Archive::total_members);
+  fprintf(stderr, _("%s: loaded archive members: %u\n"),
+          program_name, Archive::total_members_loaded);
 }
 
 // Add_archive_symbols methods.
@@ -325,40 +898,54 @@ Add_archive_symbols::~Add_archive_symbols()
 // Return whether we can add the archive symbols.  We are blocked by
 // this_blocker_.  We block next_blocker_.  We also lock the file.
 
-Task::Is_runnable_type
-Add_archive_symbols::is_runnable(Workqueue*)
+Task_token*
+Add_archive_symbols::is_runnable()
 {
   if (this->this_blocker_ != NULL && this->this_blocker_->is_blocked())
-    return IS_BLOCKED;
-  return IS_RUNNABLE;
+    return this->this_blocker_;
+  return NULL;
 }
 
-class Add_archive_symbols::Add_archive_symbols_locker : public Task_locker
-{
- public:
-  Add_archive_symbols_locker(Task_token& token, Workqueue* workqueue,
-                            Archive* archive)
-    : blocker_(token, workqueue), archlock_(*archive)
-  { }
-
- private:
-  Task_locker_block blocker_;
-  Task_locker_obj<Archive> archlock_;                       
-};
-
-Task_locker*
-Add_archive_symbols::locks(Workqueue* workqueue)
+void
+Add_archive_symbols::locks(Task_locker* tl)
 {
-  return new Add_archive_symbols_locker(*this->next_blocker_,
-                                       workqueue,
-                                       this->archive_);
+  tl->add(this, this->next_blocker_);
+  tl->add(this, this->archive_->token());
 }
 
 void
-Add_archive_symbols::run(Workqueue*)
+Add_archive_symbols::run(Workqueue* workqueue)
 {
-  this->archive_->add_symbols(this->symtab_, this->layout_,
-                             this->input_objects_);
+  bool added = this->archive_->add_symbols(this->symtab_, this->layout_,
+                                          this->input_objects_,
+                                          this->mapfile_);
+  this->archive_->unlock_nested_archives();
+
+  this->archive_->release();
+  this->archive_->clear_uncached_views();
+
+  if (!added)
+    {
+      // This archive holds object files which are incompatible with
+      // our output file.
+      Read_symbols::incompatible_warning(this->input_argument_,
+                                        this->archive_->input_file());
+      Read_symbols::requeue(workqueue, this->input_objects_, this->symtab_,
+                           this->layout_, this->dirpath_, this->dirindex_,
+                           this->mapfile_, this->input_argument_,
+                           this->input_group_, this->next_blocker_);
+      delete this->archive_;
+      return;
+    }
+
+  if (this->input_group_ != NULL)
+    this->input_group_->add_archive(this->archive_);
+  else
+    {
+      // We no longer need to know about this archive.
+      delete this->archive_;
+      this->archive_ = NULL;
+    }
 }
 
 } // End namespace gold.
This page took 0.035108 seconds and 4 git commands to generate.