* Makefile.am ($(srcdir)/ia64-asmtab.c): Remove line continuation.

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

diff --git a/gold/readsyms.h b/gold/readsyms.h
index c02a0ee4672952f140a14bfe08c84614ad0c8944..f93d6dbc99cd34c08fe082ab47737dd20c21a660 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 Free Software Foundation, Inc.
+// Copyright 2006, 2007, 2008 Free Software Foundation, Inc.
 // Written by Ian Lance Taylor <iant@google.com>.
 
 // This file is part of gold.
@@ -55,24 +55,25 @@ 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_argument, Input_group* input_group,
-              Task_token* this_blocker, Task_token* next_blocker)
+              Symbol_table* symtab, Layout* layout, Dirsearch* dirpath,
+              Mapfile* mapfile, 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_argument_(input_argument),
-      input_group_(input_group), this_blocker_(this_blocker),
-      next_blocker_(next_blocker)
+      layout_(layout), dirpath_(dirpath), mapfile_(mapfile),
+      input_argument_(input_argument), input_group_(input_group),
+      this_blocker_(this_blocker), next_blocker_(next_blocker)
   { }
 
   ~Read_symbols();
 
   // 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*);
@@ -93,7 +94,8 @@ class Read_symbols : public Task
   Input_objects* input_objects_;
   Symbol_table* symtab_;
   Layout* layout_;
-  const Dirsearch& dirpath_;
+  Dirsearch* dirpath_;
+  Mapfile* mapfile_;
   const Input_argument* input_argument_;
   Input_group* input_group_;
   Task_token* this_blocker_;
@@ -123,11 +125,11 @@ 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*);
@@ -137,8 +139,6 @@ class Add_symbols : public Task
   { return "Add_symbols " + this->object_->name(); }
 
 private:
-  class Add_symbols_locker;
-
   Input_objects* input_objects_;
   Symbol_table* symtab_;
   Layout* layout_;
@@ -186,11 +186,11 @@ class Finish_group : public Task
 {
  public:
   Finish_group(Input_objects* input_objects, Symbol_table* symtab,
-              Layout* layout, Input_group* input_group,
+              Layout* layout, Mapfile* mapfile, 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),
+      layout_(layout), mapfile_(mapfile), input_group_(input_group),
       saw_undefined_(saw_undefined), this_blocker_(this_blocker),
       next_blocker_(next_blocker)
   { }
@@ -199,11 +199,11 @@ 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*);
@@ -216,12 +216,63 @@ class Finish_group : public Task
   Input_objects* input_objects_;
   Symbol_table* symtab_;
   Layout* layout_;
+  Mapfile* mapfile_;
   Input_group* input_group_;
   int saw_undefined_;
   Task_token* this_blocker_;
   Task_token* next_blocker_;
 };
 
+// This class is used to read a file which was not recognized as an
+// object or archive.  It tries to read it as a linker script, using
+// the tokens to serialize with the calls to Add_symbols.
+
+class Read_script : public Task
+{
+ public:
+  Read_script(const General_options& options, Symbol_table* symtab,
+             Layout* layout, Dirsearch* dirpath, Input_objects* input_objects,
+             Mapfile* mapfile, Input_group* input_group,
+             const Input_argument* input_argument,
+             Input_file* input_file, Task_token* this_blocker,
+             Task_token* next_blocker)
+    : options_(options), symtab_(symtab), layout_(layout), dirpath_(dirpath),
+      input_objects_(input_objects), mapfile_(mapfile),
+      input_group_(input_group), input_argument_(input_argument),
+      input_file_(input_file), this_blocker_(this_blocker),
+      next_blocker_(next_blocker)
+  { }
+
+  ~Read_script();
+
+  // The standard Task methods.
+
+  Task_token*
+  is_runnable();
+
+  void
+  locks(Task_locker*);
+
+  void
+  run(Workqueue*);
+
+  std::string
+  get_name() const;
+
+ private:
+  const General_options& options_;
+  Symbol_table* symtab_;
+  Layout* layout_;
+  Dirsearch* dirpath_;
+  Input_objects* input_objects_;
+  Mapfile* mapfile_;
+  Input_group* input_group_;
+  const Input_argument* input_argument_;
+  Input_file* input_file_;
+  Task_token* this_blocker_;
+  Task_token* next_blocker_;
+};
+
 } // end namespace gold
 
 #endif // !defined(GOLD_READSYMS_H)