Fix buglet in last patch.

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

diff --git a/gold/readsyms.h b/gold/readsyms.h
index 2348c3237c641860d5f6ff3063d6c4edc29f0c44..7a4db419cfb04588ab700820aac79911c6f78a0e 100644 (file)
--- a/gold/readsyms.h
+++ b/gold/readsyms.h
@@ -1,5 +1,25 @@
 // readsyms.h -- read input file symbols 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_READSYMS_H
 #define GOLD_READSYMS_H
 
@@ -35,11 +55,11 @@ class Read_symbols : public Task
   // NEXT_BLOCKER is used to block the next input file from adding
   // symbols.
   Read_symbols(const General_options& options, Input_objects* input_objects,
-              Symbol_table* symtab, Layout* layout, const Dirsearch& dirpath,
-              const Input_argument& input, Input_group* input_group,
+              Symbol_table* symtab, Layout* layout, Dirsearch* dirpath,
+              const Input_argument* input_argument, Input_group* input_group,
               Task_token* this_blocker, Task_token* next_blocker)
     : options_(options), input_objects_(input_objects), symtab_(symtab),
-      layout_(layout), dirpath_(dirpath), input_(input),
+      layout_(layout), dirpath_(dirpath), input_argument_(input_argument),
       input_group_(input_group), this_blocker_(this_blocker),
       next_blocker_(next_blocker)
   { }
@@ -48,26 +68,33 @@ class Read_symbols : public Task
 
   // The standard Task methods.
 
-  Is_runnable_type
-  is_runnable(Workqueue*);
+  Task_token*
+  is_runnable();
 
-  Task_locker*
-  locks(Workqueue*);
+  void
+  locks(Task_locker*);
 
   void
   run(Workqueue*);
 
+  std::string
+  get_name() const;
+
  private:
   // Handle an archive group.
   void
   do_group(Workqueue*);
 
+  // Open and identify the file.
+  bool
+  do_read_symbols(Workqueue*);
+
   const General_options& options_;
   Input_objects* input_objects_;
   Symbol_table* symtab_;
   Layout* layout_;
-  const Dirsearch& dirpath_;
-  const Input_argument& input_;
+  Dirsearch* dirpath_;
+  const Input_argument* input_argument_;
   Input_group* input_group_;
   Task_token* this_blocker_;
   Task_token* next_blocker_;
@@ -84,8 +111,9 @@ class Add_symbols : public Task
   // one for the previous input file.  NEXT_BLOCKER is used to prevent
   // the next task from running.
   Add_symbols(Input_objects* input_objects, Symbol_table* symtab,
-             Layout* layout, Object* object, Read_symbols_data* sd,
-             Task_token* this_blocker, Task_token* next_blocker)
+             Layout* layout, Object* object,
+             Read_symbols_data* sd, Task_token* this_blocker,
+             Task_token* next_blocker)
     : input_objects_(input_objects), symtab_(symtab), layout_(layout),
       object_(object), sd_(sd), this_blocker_(this_blocker),
       next_blocker_(next_blocker)
@@ -95,18 +123,20 @@ class Add_symbols : public Task
 
   // The standard Task methods.
 
-  Is_runnable_type
-  is_runnable(Workqueue*);
+  Task_token*
+  is_runnable();
 
-  Task_locker*
-  locks(Workqueue*);
+  void
+  locks(Task_locker*);
 
   void
   run(Workqueue*);
 
-private:
-  class Add_symbols_locker;
+  std::string
+  get_name() const
+  { return "Add_symbols " + this->object_->name(); }
 
+private:
   Input_objects* input_objects_;
   Symbol_table* symtab_;
   Layout* layout_;
@@ -157,24 +187,29 @@ class Finish_group : public Task
               Layout* layout, Input_group* input_group,
               int saw_undefined, Task_token* this_blocker,
               Task_token* next_blocker)
-    : input_objects_(input_objects), symtab_(symtab), layout_(layout),
-      input_group_(input_group), saw_undefined_(saw_undefined),
-      this_blocker_(this_blocker), next_blocker_(next_blocker)
+    : input_objects_(input_objects), symtab_(symtab),
+      layout_(layout), input_group_(input_group),
+      saw_undefined_(saw_undefined), this_blocker_(this_blocker),
+      next_blocker_(next_blocker)
   { }
 
   ~Finish_group();
 
   // The standard Task methods.
 
-  Is_runnable_type
-  is_runnable(Workqueue*);
+  Task_token*
+  is_runnable();
 
-  Task_locker*
-  locks(Workqueue*);
+  void
+  locks(Task_locker*);
 
   void
   run(Workqueue*);
 
+  std::string
+  get_name() const
+  { return "Finish_group"; }
+
  private:
   Input_objects* input_objects_;
   Symbol_table* symtab_;