daily update

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

diff --git a/gold/readsyms.h b/gold/readsyms.h
index 626cb38ce21d284ece2010d1317bf3480f8b8cfc..9515ba1ca0820f288d31dad31d946d972c963024 100644 (file)
--- a/gold/readsyms.h
+++ b/gold/readsyms.h
@@ -1,6 +1,6 @@
 // readsyms.h -- read input file symbols for gold   -*- C++ -*-
 
-// Copyright 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+// Copyright 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 // Written by Ian Lance Taylor <iant@google.com>.
 
 // This file is part of gold.
@@ -58,12 +58,13 @@ class Read_symbols : public Task
   Read_symbols(Input_objects* input_objects, Symbol_table* symtab,
               Layout* layout, Dirsearch* dirpath, int dirindex,
               Mapfile* mapfile, const Input_argument* input_argument,
-              Input_group* input_group, Task_token* this_blocker,
-              Task_token* next_blocker)
+              Input_group* input_group, Archive_member* member,
+               Task_token* this_blocker, Task_token* next_blocker)
     : input_objects_(input_objects), symtab_(symtab), layout_(layout),
       dirpath_(dirpath), dirindex_(dirindex), mapfile_(mapfile),
       input_argument_(input_argument), input_group_(input_group),
-      this_blocker_(this_blocker), next_blocker_(next_blocker)
+      member_(member), this_blocker_(this_blocker),
+      next_blocker_(next_blocker)
   { }
 
   ~Read_symbols();
@@ -99,6 +100,14 @@ class Read_symbols : public Task
   void
   do_group(Workqueue*);
 
+  // Handle --start-lib ... --end-lib
+  bool
+  do_lib_group(Workqueue*);
+
+  // Handle --whole-archive --start-lib ... --end-lib --no-whole-archive
+  bool
+  do_whole_lib_group(Workqueue*);
+
   // Open and identify the file.
   bool
   do_read_symbols(Workqueue*);
@@ -111,6 +120,7 @@ class Read_symbols : public Task
   Mapfile* mapfile_;
   const Input_argument* input_argument_;
   Input_group* input_group_;
+  Archive_member* member_;
   Task_token* this_blocker_;
   Task_token* next_blocker_;
 };
@@ -128,12 +138,12 @@ class Add_symbols : public Task
   Add_symbols(Input_objects* input_objects, Symbol_table* symtab,
              Layout* layout, Dirsearch* dirpath, int dirindex,
              Mapfile* mapfile, const Input_argument* input_argument,
-             Input_group* input_group, Object* object,
+             Object* object,
              Read_symbols_data* sd, Task_token* this_blocker,
              Task_token* next_blocker)
     : input_objects_(input_objects), symtab_(symtab), layout_(layout),
       dirpath_(dirpath), dirindex_(dirindex), mapfile_(mapfile),
-      input_argument_(input_argument), input_group_(input_group),
+      input_argument_(input_argument),
       object_(object), sd_(sd), this_blocker_(this_blocker),
       next_blocker_(next_blocker)
   { }
@@ -163,7 +173,6 @@ private:
   int dirindex_;
   Mapfile* mapfile_;
   const Input_argument* input_argument_;
-  Input_group* input_group_;
   Object* object_;
   Read_symbols_data* sd_;
   Task_token* this_blocker_;
@@ -182,6 +191,8 @@ class Input_group
     : archives_()
   { }
 
+  ~Input_group();
+
   // Add an archive to the group.
   void
   add_archive(Archive* arch)