Add licensing text to every source file.

[binutils-gdb.git] / gold / archive.h

diff --git a/gold/archive.h b/gold/archive.h
index ddd665f070c4800b0ce8cab36001aa0c2fa0a04c..8c35d2278be50dde3e8149e6e9a102f993a975da 100644 (file)
--- a/gold/archive.h
+++ b/gold/archive.h
@@ -1,5 +1,25 @@
 // archive.h -- archive support for gold      -*- C++ -*-
 
+// Copyright 2006, 2007 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.
+
 #ifndef GOLD_ARCHIVE_H
 #define GOLD_ARCHIVE_H
 
@@ -11,7 +31,6 @@
 namespace gold
 {
 
-class General_options;
 class Input_file;
 class Input_objects;
 class Input_group;
@@ -69,7 +88,7 @@ class Archive
   // Select members from the archive as needed and add them to the
   // link.
   void
-  add_symbols(const General_options&, Symbol_table*, Layout*, Input_objects*);
+  add_symbols(Symbol_table*, Layout*, Input_objects*);
 
  private:
   Archive(const Archive&);
@@ -98,13 +117,11 @@ class Archive
 
   // Include all the archive members in the link.
   void
-  include_all_members(const General_options&, Symbol_table*, Layout*,
-                      Input_objects*);
+  include_all_members(Symbol_table*, Layout*, Input_objects*);
 
   // Include an archive member in the link.
   void
-  include_member(const General_options&, Symbol_table*, Layout*,
-                Input_objects*, off_t off);
+  include_member(Symbol_table*, Layout*, Input_objects*, off_t off);
 
   // An entry in the archive map of symbols to object files.
   struct Armap_entry
@@ -115,6 +132,14 @@ class Archive
     off_t offset;
   };
 
+  // A simple hash code for off_t values.
+  class Seen_hash
+  {
+   public:
+    size_t operator()(off_t val) const
+    { return static_cast<size_t>(val); }
+  };
+
   // Name of object as printed to user.
   std::string name_;
   // For reading the file.
@@ -123,9 +148,11 @@ class Archive
   std::vector<Armap_entry> armap_;
   // The extended name table.
   std::string extended_names_;
-  // Track which symbols in the archive map are for elements which
-  // have already been included in the link.
-  std::vector<bool> seen_;
+  // Track which symbols in the archive map are for elements which are
+  // defined or which have already been included in the link.
+  std::vector<bool> armap_checked_;
+  // Track which elements have been included by offset.
+  Unordered_set<off_t, Seen_hash> seen_offsets_;
 };
 
 // This class is used to read an archive and pick out the desired
@@ -134,15 +161,14 @@ class Archive
 class Add_archive_symbols : public Task
 {
  public:
-  Add_archive_symbols(const General_options& options, Symbol_table* symtab,
-                     Layout* layout, Input_objects* input_objects,
+  Add_archive_symbols(Symbol_table* symtab, Layout* layout,
+                     Input_objects* input_objects,
                      Archive* archive, Input_group* input_group,
                      Task_token* this_blocker,
                      Task_token* next_blocker)
-    : options_(options), symtab_(symtab), layout_(layout),
-      input_objects_(input_objects), archive_(archive),
-      input_group_(input_group), this_blocker_(this_blocker),
-      next_blocker_(next_blocker)
+    : symtab_(symtab), layout_(layout), input_objects_(input_objects),
+      archive_(archive), input_group_(input_group),
+      this_blocker_(this_blocker), next_blocker_(next_blocker)
   { }
 
   ~Add_archive_symbols();
@@ -161,7 +187,6 @@ class Add_archive_symbols : public Task
  private:
   class Add_archive_symbols_locker;
 
-  const General_options& options_;
   Symbol_table* symtab_;
   Layout* layout_;
   Input_objects* input_objects_;