aboutsummaryrefslogtreecommitdiff
path: root/gold/script.cc
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@airs.com>2009-03-13 21:30:06 +0000
committerIan Lance Taylor <ian@airs.com>2009-03-13 21:30:06 +0000
commitf1ed28fb810fb8c43821bd18a94826e56973c235 (patch)
treebfd1c393f5e10958b0552e54bef19984d7440158 /gold/script.cc
parent9ee6bb930d0c1e44c3970965e0c981fa4c06dd8b (diff)
downloadgdb-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/script.cc')
-rw-r--r--gold/script.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/gold/script.cc b/gold/script.cc
index 442c412..4462c95 100644
--- a/gold/script.cc
+++ b/gold/script.cc
@@ -1321,8 +1321,7 @@ class Parser_closure
// as a script. Return true if the file was handled.
bool
-read_input_script(Workqueue* workqueue, const General_options& options,
- Symbol_table* symtab, Layout* layout,
+read_input_script(Workqueue* workqueue, Symbol_table* symtab, Layout* layout,
Dirsearch* dirsearch, Input_objects* input_objects,
Mapfile* mapfile, Input_group* input_group,
const Input_argument* input_argument,
@@ -1363,7 +1362,7 @@ read_input_script(Workqueue* workqueue, const General_options& options,
nb = new Task_token(true);
nb->add_blocker();
}
- workqueue->queue_soon(new Read_symbols(options, input_objects, symtab,
+ workqueue->queue_soon(new Read_symbols(input_objects, symtab,
layout, dirsearch, mapfile, &*p,
input_group, this_blocker, nb));
this_blocker = nb;
@@ -1398,7 +1397,7 @@ read_script_file(const char* filename, Command_line* cmdline,
posdep.set_format_enum(General_options::OBJECT_FORMAT_ELF);
Input_file_argument input_argument(filename, false, "", false, posdep);
Input_file input_file(&input_argument);
- if (!input_file.open(cmdline->options(), dirsearch, task))
+ if (!input_file.open(dirsearch, task))
return false;
std::string input_string;