#ifndef GOLD_READSYMS_H
#define GOLD_READSYMS_H
+#include <vector>
+
#include "workqueue.h"
#include "object.h"
class Input_objects;
class Symbol_table;
+class Input_group;
+class Archive;
// This Task is responsible for reading the symbols from an input
// file. This also includes reading the relocations so that we can
{
public:
// DIRPATH is the list of directories to search for libraries.
- // INPUT is the file to read. THIS_BLOCKER is used to prevent the
- // associated Add_symbols task from running before the previous one
- // has completed; it will be NULL for the first task. NEXT_BLOCKER
- // is used to block the next input file from adding symbols.
+ // INPUT is the file to read. INPUT_GROUP is not NULL if we are in
+ // the middle of an input group. THIS_BLOCKER is used to prevent
+ // the associated Add_symbols task from running before the previous
+ // one has completed; it will be NULL for the first 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,
+ 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),
- this_blocker_(this_blocker), next_blocker_(next_blocker)
+ layout_(layout), dirpath_(dirpath), input_argument_(input_argument),
+ input_group_(input_group), this_blocker_(this_blocker),
+ next_blocker_(next_blocker)
{ }
~Read_symbols();
run(Workqueue*);
private:
+ // Handle an archive group.
+ void
+ do_group(Workqueue*);
+
const General_options& options_;
Input_objects* input_objects_;
Symbol_table* symtab_;
Layout* layout_;
const Dirsearch& dirpath_;
- const Input_argument& input_;
+ const Input_argument* input_argument_;
+ Input_group* input_group_;
Task_token* this_blocker_;
Task_token* next_blocker_;
};
// THIS_BLOCKER is used to prevent this task from running before the
// one for the previous input file. NEXT_BLOCKER is used to prevent
// the next task from running.
- Add_symbols(Symbol_table* symtab, Layout* layout, Object* object,
+ Add_symbols(const General_options& options, Input_objects* input_objects,
+ Symbol_table* symtab, Layout* layout, Object* object,
Read_symbols_data* sd, Task_token* this_blocker,
Task_token* next_blocker)
- : symtab_(symtab), layout_(layout), object_(object), sd_(sd),
- this_blocker_(this_blocker), next_blocker_(next_blocker)
+ : options_(options), input_objects_(input_objects), symtab_(symtab),
+ layout_(layout), object_(object), sd_(sd), this_blocker_(this_blocker),
+ next_blocker_(next_blocker)
{ }
~Add_symbols();
private:
class Add_symbols_locker;
+ const General_options& options_;
+ Input_objects* input_objects_;
Symbol_table* symtab_;
Layout* layout_;
Object* object_;
Task_token* next_blocker_;
};
+// This class is used to track the archives in a group.
+
+class Input_group
+{
+ public:
+ typedef std::vector<Archive*> Archives;
+ typedef Archives::const_iterator const_iterator;
+
+ Input_group()
+ : archives_()
+ { }
+
+ // Add an archive to the group.
+ void
+ add_archive(Archive* arch)
+ { this->archives_.push_back(arch); }
+
+ // Loop over the archives in the group.
+
+ const_iterator
+ begin() const
+ { return this->archives_.begin(); }
+
+ const_iterator
+ end() const
+ { return this->archives_.end(); }
+
+ private:
+ Archives archives_;
+};
+
+// This class is used to finish up handling a group. It is just a
+// closure.
+
+class Finish_group : public Task
+{
+ public:
+ Finish_group(const General_options& options, Input_objects* input_objects,
+ Symbol_table* symtab, Layout* layout, Input_group* input_group,
+ int saw_undefined, Task_token* this_blocker,
+ Task_token* next_blocker)
+ : options_(options), 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_locker*
+ locks(Workqueue*);
+
+ void
+ run(Workqueue*);
+
+ private:
+ const General_options& options_;
+ Input_objects* input_objects_;
+ Symbol_table* symtab_;
+ Layout* layout_;
+ Input_group* input_group_;
+ int saw_undefined_;
+ Task_token* this_blocker_;
+ Task_token* next_blocker_;
+};
+
} // end namespace gold
#endif // !defined(GOLD_READSYMS_H)