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 | f1ed28fb810fb8c43821bd18a94826e56973c235 (patch) | |
| tree | bfd1c393f5e10958b0552e54bef19984d7440158 /gold/readsyms.cc | |
| parent | 9ee6bb930d0c1e44c3970965e0c981fa4c06dd8b (diff) | |
| download | binutils-gdb-f1ed28fb810fb8c43821bd18a94826e56973c235.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.cc')
| -rw-r--r-- | gold/readsyms.cc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/gold/readsyms.cc b/gold/readsyms.cc index 8954837624f..4e126e78747 100644 --- a/gold/readsyms.cc +++ b/gold/readsyms.cc @@ -139,7 +139,7 @@ Read_symbols::do_read_symbols(Workqueue* workqueue) } Input_file* input_file = new Input_file(&this->input_argument_->file()); - if (!input_file->open(this->options_, *this->dirpath_, this)) + if (!input_file->open(*this->dirpath_, this)) return false; // Read enough of the file to pick up the entire ELF header. @@ -258,8 +258,7 @@ Read_symbols::do_read_symbols(Workqueue* workqueue) // read multiple scripts simultaneously, which could lead to // unpredictable changes to the General_options structure. - workqueue->queue_soon(new Read_script(this->options_, - this->symtab_, + workqueue->queue_soon(new Read_script(this->symtab_, this->layout_, this->dirpath_, this->input_objects_, @@ -296,8 +295,7 @@ Read_symbols::do_group(Workqueue* workqueue) Task_token* next_blocker = new Task_token(true); next_blocker->add_blocker(); - workqueue->queue_soon(new Read_symbols(this->options_, - this->input_objects_, + workqueue->queue_soon(new Read_symbols(this->input_objects_, this->symtab_, this->layout_, this->dirpath_, this->mapfile_, arg, input_group, @@ -491,8 +489,8 @@ void Read_script::run(Workqueue* workqueue) { bool used_next_blocker; - if (!read_input_script(workqueue, this->options_, this->symtab_, - this->layout_, this->dirpath_, this->input_objects_, + if (!read_input_script(workqueue, this->symtab_, this->layout_, + this->dirpath_, this->input_objects_, this->mapfile_, this->input_group_, this->input_argument_, this->input_file_, this->next_blocker_, &used_next_blocker)) |