Fix buglet in last patch.

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

diff --git a/gold/readsyms.h b/gold/readsyms.h
index d88446309dc208f2c046b495158b4f54479e96ae..7a4db419cfb04588ab700820aac79911c6f78a0e 100644 (file)
--- a/gold/readsyms.h
+++ b/gold/readsyms.h
@@ -55,7 +55,7 @@ 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,
+              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),
@@ -68,15 +68,18 @@ 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
@@ -90,7 +93,7 @@ class Read_symbols : public Task
   Input_objects* input_objects_;
   Symbol_table* symtab_;
   Layout* layout_;
-  const Dirsearch& dirpath_;
+  Dirsearch* dirpath_;
   const Input_argument* input_argument_;
   Input_group* input_group_;
   Task_token* this_blocker_;
@@ -120,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_;
@@ -192,15 +197,19 @@ class Finish_group : 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
+  { return "Finish_group"; }
+
  private:
   Input_objects* input_objects_;
   Symbol_table* symtab_;