From Craig Silverstein: Minimal --script implementation.

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

diff --git a/gold/archive.h b/gold/archive.h
index f0edfcb7ffd228d9f9b20606c705ff2c095cd128..61d4d4b891f69ff8483f8e9e7bcaedade121c9ff 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
 
@@ -24,7 +44,8 @@ class Archive
 {
  public:
   Archive(const std::string& name, Input_file* input_file)
-    : name_(name), input_file_(input_file), armap_(), extended_names_()
+    : name_(name), input_file_(input_file), armap_(), armap_names_(),
+      extended_names_(), armap_checked_(), seen_offsets_()
   { }
 
   // The length of the magic string at the start of an archive.
@@ -75,18 +96,30 @@ class Archive
   Archive& operator=(const Archive&);
 
   struct Archive_header;
-  class Add_archive_symbols_locker;
 
   // Get a view into the underlying file.
   const unsigned char*
-  get_view(off_t start, off_t size)
-  { return this->input_file_->file().get_view(start, size); }
+  get_view(off_t start, off_t size, bool cache)
+  { return this->input_file_->file().get_view(start, size, cache); }
+
+  // Read the archive symbol map.
+  void
+  read_armap(off_t start, off_t size);
 
   // Read an archive member header at OFF.  Return the size of the
   // member, and set *PNAME to the name.
   off_t
   read_header(off_t off, std::string* pname);
 
+  // Interpret an archive header HDR at OFF.  Return the size of the
+  // member, and set *PNAME to the name.
+  off_t
+  interpret_header(const Archive_header* hdr, off_t off, std::string* pname);
+
+  // Include all the archive members in the link.
+  void
+  include_all_members(Symbol_table*, Layout*, Input_objects*);
+
   // Include an archive member in the link.
   void
   include_member(Symbol_table*, Layout*, Input_objects*, off_t off);
@@ -94,10 +127,18 @@ class Archive
   // An entry in the archive map of symbols to object files.
   struct Armap_entry
   {
-    // The symbol name.
-    const char* name;
-    // The offset to the file.
-    off_t offset;
+    // The offset to the symbol name in armap_names_.
+    off_t name_offset;
+    // The file offset to the object in the archive.
+    off_t file_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.
@@ -106,11 +147,15 @@ class Archive
   Input_file* input_file_;
   // The archive map.
   std::vector<Armap_entry> armap_;
+  // The names in the archive map.
+  std::string armap_names_;
   // 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