gdb/
[deliverable/binutils-gdb.git] / gold / archive.cc
index 27f4380fbeb36cf7687a8825607e0e842dada199..1d83d6a2f79e85c364bc2828470552eb59da53a6 100644 (file)
@@ -1,6 +1,6 @@
 // archive.cc -- archive support for gold
 
-// Copyright 2006, 2007, 2008 Free Software Foundation, Inc.
+// Copyright 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 // Written by Ian Lance Taylor <iant@google.com>.
 
 // This file is part of gold.
@@ -37,6 +37,7 @@
 #include "symtab.h"
 #include "object.h"
 #include "archive.h"
+#include "plugin.h"
 
 namespace gold
 {
@@ -63,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] =
@@ -117,6 +123,16 @@ Archive::setup()
       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.
@@ -137,6 +153,12 @@ Archive::unlock_nested_archives()
 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(start, size, true, false);
 
@@ -160,6 +182,11 @@ Archive::read_armap(off_t start, section_size_type size)
       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 (static_cast<section_size_type>(name_offset) > names_size)
@@ -278,93 +305,6 @@ Archive::interpret_header(const Archive_header* hdr, off_t off,
   return member_size;
 }
 
-// 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.
-
-void
-Archive::add_symbols(Symbol_table* symtab, Layout* layout,
-                    Input_objects* input_objects, Mapfile* mapfile)
-{
-  if (this->input_file_->options().whole_archive())
-    return this->include_all_members(symtab, layout, input_objects,
-                                    mapfile);
-
-  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.
-
-  bool added_new_object;
-  do
-    {
-      added_new_object = false;
-      for (size_t i = 0; i < armap_size; ++i)
-       {
-          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())
-           {
-              this->armap_checked_[i] = true;
-             last_seen_offset = this->armap_[i].file_offset;
-             continue;
-           }
-
-         const char* sym_name = (this->armap_names_.data()
-                                 + this->armap_[i].name_offset);
-         Symbol* sym = symtab->lookup(sym_name);
-         if (sym == NULL)
-           {
-             // 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_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;
-           }
-         this->include_member(symtab, layout, input_objects,
-                              last_seen_offset, mapfile, sym, why.c_str());
-
-         added_new_object = true;
-       }
-    }
-  while (added_new_object);
-
-  input_objects->archive_stop(this);
-}
-
 // An archive member iterator.
 
 class Archive::const_iterator
@@ -494,113 +434,110 @@ Archive::end()
   return Archive::const_iterator(this, this->input_file_->file().filesize());
 }
 
-// Include all the archive members in the link.  This is for --whole-archive.
+// 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.
 
-void
-Archive::include_all_members(Symbol_table* symtab, Layout* layout,
-                             Input_objects* input_objects, Mapfile* mapfile)
+bool
+Archive::get_file_and_offset(off_t off, Input_file** input_file, off_t* memoff,
+                             off_t* memsize, std::string* member_name)
 {
-  input_objects->archive_start(this);
+  off_t nested_off;
 
-  for (Archive::const_iterator p = this->begin();
-       p != this->end();
-       ++p)
-    this->include_member(symtab, layout, input_objects, p->off,
-                        mapfile, NULL, "--whole-archive");
+  *memsize = this->read_header(off, false, member_name, &nested_off);
 
-  input_objects->archive_stop(this);
-}
+  *input_file = this->input_file_;
+  *memoff = off + static_cast<off_t>(sizeof(Archive_header));
 
-// Return the number of members in the archive.  This is only used for
-// reports.
+  if (!this->is_thin_archive_)
+    return true;
 
-size_t
-Archive::count_members()
-{
-  size_t ret = 0;
-  for (Archive::const_iterator p = this->begin();
-       p != this->end();
-       ++p)
-    ++ret;
-  return ret;
+  // 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(), false, "", 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(), false, "", 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;
 }
 
-// Include an archive member in the link.  OFF is the file offset of
-// the member header.  WHY is the reason we are including this member.
+// 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.
 
-void
-Archive::include_member(Symbol_table* symtab, Layout* layout,
-                       Input_objects* input_objects, off_t off,
-                       Mapfile* mapfile, Symbol* sym, const char* why)
+Object*
+Archive::get_elf_object_for_member(off_t off, bool* punconfigured)
 {
-  std::string n;
-  off_t nested_off;
-  this->read_header(off, false, &n, &nested_off);
-
-  if (mapfile != NULL)
-    mapfile->report_include_archive_member(this, n, sym, why);
+  *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 (!this->is_thin_archive_)
+  if (parameters->options().has_plugins())
     {
-      input_file = this->input_file_;
-      memoff = off + static_cast<off_t>(sizeof(Archive_header));
-    }
-  else
-    {
-      // Adjust a relative pathname so that it is relative
-      // to the directory containing the archive.
-      if (!IS_ABSOLUTE_PATH(n.c_str()))
-        {
-          const char *arch_path = this->name().c_str();
-          const char *basename = lbasename(arch_path);
-          if (basename > arch_path)
-            n.replace(0, 0, this->name().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(n);
-          if (p != this->nested_archives_.end())
-            arch = p->second;
-          else
-            {
-              Input_file_argument* input_file_arg =
-                new Input_file_argument(n.c_str(), false, "", false,
-                                        parameters->options());
-              input_file = new Input_file(input_file_arg);
-              if (!input_file->open(parameters->options(), *this->dirpath_,
-                                    this->task_))
-                return;
-              arch = new Archive(n, input_file, false, this->dirpath_,
-                                 this->task_);
-              arch->setup();
-              std::pair<Nested_archive_table::iterator, bool> ins =
-                this->nested_archives_.insert(std::make_pair(n, arch));
-              gold_assert(ins.second);
-            }
-          arch->include_member(symtab, layout, input_objects, nested_off,
-                              NULL, NULL, NULL);
-          return;
-        }
-      // 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(n.c_str(), false, "", false,
-                                  this->input_file_->options());
-      input_file = new Input_file(input_file_arg);
-      if (!input_file->open(parameters->options(), *this->dirpath_,
-                            this->task_))
+      Object* obj = parameters->options().plugins()->claim_file(input_file,
+                                                                memoff,
+                                                                memsize);
+      if (obj != NULL)
         {
-          return;
+          // The input file was claimed by a plugin, and its symbols
+          // have been provided by the plugin.
+          return obj;
         }
-      memoff = 0;
     }
 
   off_t filesize = input_file->file().filesize();
@@ -612,7 +549,7 @@ Archive::include_member(Symbol_table* symtab, Layout* layout,
     {
       gold_error(_("%s: member at %zu is not an ELF object"),
                 this->name().c_str(), static_cast<size_t>(off));
-      return;
+      return NULL;
     }
 
   const unsigned char* ehdr = input_file->file().get_view(memoff, 0, read_size,
@@ -627,31 +564,331 @@ Archive::include_member(Symbol_table* symtab, Layout* layout,
     {
       gold_error(_("%s: member at %zu is not an ELF object"),
                 this->name().c_str(), static_cast<size_t>(off));
-      return;
+      return NULL;
     }
 
-  Object* obj = make_elf_object((std::string(this->input_file_->filename())
-                                + "(" + n + ")"),
-                               input_file, memoff, ehdr, read_size);
+  return make_elf_object((std::string(this->input_file_->filename())
+                         + "(" + member_name + ")"),
+                        input_file, memoff, ehdr, read_size,
+                        punconfigured);
+}
+
+// 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.  Return true in
+// the normal case, false if the first member we tried to add from
+// this archive had an incompatible target.
 
-  if (input_objects->add_object(obj))
+bool
+Archive::add_symbols(Symbol_table* symtab, Layout* layout,
+                    Input_objects* input_objects, Mapfile* mapfile)
+{
+  ++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
     {
-      Read_symbols_data sd;
-      obj->read_symbols(&sd);
-      obj->layout(symtab, layout, &sd);
-      obj->add_symbols(symtab, &sd);
+      added_new_object = false;
+      for (size_t i = 0; i < armap_size; ++i)
+       {
+          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())
+           {
+              this->armap_checked_[i] = true;
+             last_seen_offset = this->armap_[i].file_offset;
+             continue;
+           }
+
+         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
+             && (sym == NULL
+                 || !sym->is_undefined()
+                 || sym->binding() == elfcpp::STB_WEAK))
+           sym = symtab->lookup(sym_name, NULL);
+
+         if (sym == NULL)
+           {
+             // 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_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
     {
-      // FIXME: We need to close the descriptor here.
-      delete obj;
+      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;
+        }
     }
 
-  if (this->is_thin_archive_)
+  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.  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.
+
+bool
+Archive::include_member(Symbol_table* symtab, Layout* layout,
+                       Input_objects* input_objects, off_t off,
+                       Mapfile* mapfile, Symbol* sym, const char* why)
+{
+  ++Archive::total_members_loaded;
+
+  std::map<off_t, Archive_member>::const_iterator p = this->members_.find(off);
+  if (p != this->members_.end())
+    {
+      Object *obj = p->second.obj_;
+
+      if (!this->included_member_
+         && this->searched_for()
+         && !parameters->is_compatible_target(obj->target()))
+       return false;
+
+      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;
+    }
+
+  bool unconfigured;
+  Object* obj = this->get_elf_object_for_member(off, &unconfigured);
+
+  if (!this->included_member_
+      && this->searched_for()
+      && (obj == NULL
+         ? unconfigured
+         : !parameters->is_compatible_target(obj->target())))
+    {
+      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)
+    {
+      pluginobj->add_symbols(symtab, NULL, layout);
+      this->included_member_ = true;
+      return true;
+    }
+
+  if (!input_objects->add_object(obj))
+    delete obj;
+  else
     {
-      // Opening the file locked it.  Unlock it now.
-      input_file->file().unlock(this->task_);
+      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;
+}
+
+// Print statistical information to stderr.  This is used for --stats.
+
+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.
@@ -683,16 +920,30 @@ Add_archive_symbols::locks(Task_locker* tl)
 }
 
 void
-Add_archive_symbols::run(Workqueue*)
+Add_archive_symbols::run(Workqueue* workqueue)
 {
-  this->archive_->add_symbols(this->symtab_, this->layout_,
-                             this->input_objects_, this->mapfile_);
-
+  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
This page took 0.031601 seconds and 4 git commands to generate.