diff options
| author | Ian Lance Taylor <ian@airs.com> | 2009-03-13 21:30:06 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@airs.com> | 2009-03-13 21:30:06 +0000 |
| commit | 666c06a2f4607902e8f5ef2b92907e4f3ef276a5 (patch) | |
| tree | 49fd8b732eb1dccb867e3a2d729328f1e230cbcc /gold/readsyms.h | |
| parent | bc85550b78c28c72c87713de590419c6c6f9bed5 (diff) | |
| download | binutils-redhat-666c06a2f4607902e8f5ef2b92907e4f3ef276a5.tar.gz | |
* fileread.cc (Input_file::open): Remove options parameter.
Change all callers.
(Input_file::open_binary): Likewise.
* script.cc (read_input_script): Likewise.
* readsyms.h (class Read_symbols): Remove options_ field. Remove
options parameter from constructor. Change all callers.
(class Read_script): Likewise.
* fileread.h (class Input_file): Update declarations.
* script.h (read_input_script): Update declaration.
Diffstat (limited to 'gold/readsyms.h')
| -rw-r--r-- | gold/readsyms.h | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/gold/readsyms.h b/gold/readsyms.h index f93d6dbc99..c8ac6cc7b1 100644 --- a/gold/readsyms.h +++ b/gold/readsyms.h @@ -54,15 +54,15 @@ class Read_symbols : public Task // 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, Dirsearch* dirpath, - Mapfile* mapfile, const Input_argument* input_argument, + Read_symbols(Input_objects* input_objects, 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), mapfile_(mapfile), - input_argument_(input_argument), input_group_(input_group), - this_blocker_(this_blocker), next_blocker_(next_blocker) + : input_objects_(input_objects), symtab_(symtab), layout_(layout), + dirpath_(dirpath), mapfile_(mapfile), input_argument_(input_argument), + input_group_(input_group), this_blocker_(this_blocker), + next_blocker_(next_blocker) { } ~Read_symbols(); @@ -90,7 +90,6 @@ class Read_symbols : public Task bool do_read_symbols(Workqueue*); - const General_options& options_; Input_objects* input_objects_; Symbol_table* symtab_; Layout* layout_; @@ -230,13 +229,12 @@ class Finish_group : public Task 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, + Read_script(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), + : 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), @@ -260,7 +258,6 @@ class Read_script : public Task get_name() const; private: - const General_options& options_; Symbol_table* symtab_; Layout* layout_; Dirsearch* dirpath_; |