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/fileread.cc | |
| parent | 9ee6bb930d0c1e44c3970965e0c981fa4c06dd8b (diff) | |
| download | gdb-f1ed28fb810fb8c43821bd18a94826e56973c235.zip gdb-f1ed28fb810fb8c43821bd18a94826e56973c235.tar.gz gdb-f1ed28fb810fb8c43821bd18a94826e56973c235.tar.bz2 | |
* 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/fileread.cc')
| -rw-r--r-- | gold/fileread.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/gold/fileread.cc b/gold/fileread.cc index 13442ff..98ba3be 100644 --- a/gold/fileread.cc +++ b/gold/fileread.cc @@ -766,8 +766,7 @@ Input_file::just_symbols() const // the file location, rather than the current directory. bool -Input_file::open(const General_options& options, const Dirsearch& dirpath, - const Task* task) +Input_file::open(const Dirsearch& dirpath, const Task* task) { std::string name; @@ -789,7 +788,7 @@ Input_file::open(const General_options& options, const Dirsearch& dirpath, std::string n1("lib"); n1 += this->input_argument_->name(); std::string n2; - if (options.is_static() + if (parameters->options().is_static() || !this->input_argument_->options().Bdynamic()) n1 += ".a"; else @@ -845,7 +844,7 @@ Input_file::open(const General_options& options, const Dirsearch& dirpath, else { gold_assert(format == General_options::OBJECT_FORMAT_BINARY); - ok = this->open_binary(options, task, name); + ok = this->open_binary(task, name); } if (!ok) @@ -861,8 +860,7 @@ Input_file::open(const General_options& options, const Dirsearch& dirpath, // Open a file for --format binary. bool -Input_file::open_binary(const General_options&, - const Task* task, const std::string& name) +Input_file::open_binary(const Task* task, const std::string& name) { // In order to open a binary file, we need machine code, size, and // endianness. We may not have a valid target at this point, in |