From f1ed28fb810fb8c43821bd18a94826e56973c235 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Fri, 13 Mar 2009 21:30:06 +0000 Subject: * 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. --- gold/script.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gold/script.cc') 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; -- cgit v1.1