From 15f8229bbf3f6fff866cbc04b07ddde9f6e41941 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Sat, 14 Mar 2009 05:56:46 +0000 Subject: * readsyms.cc (Read_symbols::incompatible_warning): New function. (Read_symbols::requeue): New function. (Read_symbols::do_read_symbols): If make_elf_object fails because the target type is not configured, and the file was searched for, issue a warning and retry with the next directory. (Add_symbols::run): If the file has an incompatible format, and it was searched for, requeue the Read_symbols task. On error, release the object. * readsyms.h (class Read_symbols): Add dirindex_ field. Add dirindex parameter to constructor. Change all callers. Declare incompatible_warning and requeue. (class Add_symbols): Add dirpath_, dirindex_, mapfile_, input_argument_ and input_group_ fields. Add them to constructor. Change all callers. (class Read_script): Add dirindex_ field. Add it to constructor. Change all callers. * archive.cc (Archive::setup): Remove input_objects parameter. Change all callers. (Archive::get_file_and_offset): Likewise. (Archive::read_all_symbols): Likewise. (Archive::read_symbols): Likewise. (Archive::get_elf_object_for_member): Remove input_objects parameter. Add punconfigured parameter. Change all callers. (Archive::add_symbols): Change return type to bool. Check return value of include_member. (Archive::include_all_members): Likewise. (Archive::include_member): Change return type to bool. Return false if first included object has incompatible target. Set included_member_ field. (Add_archive_symbols::run): If add_symbols returns false, requeue Read_symbols task. * archive.h (class Archive): Add included_member_ field. Initialize it in constructor. Add input_file and searched_for methods. Update declarations. (class Add_archive_symbols): Add dirpath_, dirindex_, and input_argument_ fields. Add them to constructor. Change all callers. * script.cc: Include "target-select.h". (class Parser_closure): Add skip_on_incompatible_target_ and found_incompatible_target_ fields. Add skip_on_incompatible_target parameter to constructor. Change all callers. Add methods skip_on_incompatible_target, clear_skip_on_incompatible_target, found_incompatible_target, and set_found_incompatible_target. (read_input_script): Add dirindex parameter. Change all callers. If parser finds an incompatible target, requeue Read_symbols task. (script_set_symbol): Clear skip_on_incompatible_target in closure. (script_add_assertion, script_parse_option): Likewise. (script_start_sections, script_add_phdr): Likewise. (script_check_output_format): New function. * script.h (read_input_script): Update declaration. * script-c.h (script_check_output_format): Declare. * yyscript.y (file_cmd): Handle OUTPUT_FORMAT. (ignore_cmd): Remove OUTPUT_FORMAT. * fileread.cc (Input_file::Input_file): Add explicit this. (Input_file::will_search_for): New function. (Input_file::open): Add pindex parameter. Change all callers. * fileread.h (class Input_file): Add input_file_argument method. Declare will_search_for. Update declarations. * object.cc (make_elf_object): Add punconfigured parameter. Change all callers. * object.h (class Object): Make input_file public. Add searched_for method. (make_elf_object): Update declaration. * dirsearch.cc (Dirsearch::find): Add pindex parameter. Use it to restart search. * dirsearch.h (class Dirsearch): Update declaration. * options.h (class General_options): Add --warn-search-mismatch. * parameters.cc (Parameters::is_compatible_target): New function. * parameters.h (class Parameters): Declare is_compatible_target. * workqueue.cc (Workqueue::add_blocker): New function. * workqueue.h (class Workqueue): Declare add_blocker. --- gold/fileread.cc | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) (limited to 'gold/fileread.cc') diff --git a/gold/fileread.cc b/gold/fileread.cc index 98ba3be7a2c..a183bd69f0c 100644 --- a/gold/fileread.cc +++ b/gold/fileread.cc @@ -718,7 +718,7 @@ Input_file::Input_file(const Task* task, const char* name, this->input_argument_ = new Input_file_argument(name, false, "", false, Position_dependent_options()); - bool ok = file_.open(task, name, contents, size); + bool ok = this->file_.open(task, name, contents, size); gold_assert(ok); } @@ -756,6 +756,17 @@ Input_file::just_symbols() const return this->input_argument_->just_symbols(); } +// Return whether this is a file that we will search for in the list +// of directories. + +bool +Input_file::will_search_for() const +{ + return (!IS_ABSOLUTE_PATH(this->input_argument_->name()) + && (this->input_argument_->is_lib() + || this->input_argument_->extra_search_path() != NULL)); +} + // Open the file. // If the filename is not absolute, we assume it is in the current @@ -766,14 +777,14 @@ Input_file::just_symbols() const // the file location, rather than the current directory. bool -Input_file::open(const Dirsearch& dirpath, const Task* task) +Input_file::open(const Dirsearch& dirpath, const Task* task, int *pindex) { std::string name; // Case 1: name is an absolute file, just try to open it // Case 2: name is relative but is_lib is false and extra_search_path // is empty - if (IS_ABSOLUTE_PATH (this->input_argument_->name()) + if (IS_ABSOLUTE_PATH(this->input_argument_->name()) || (!this->input_argument_->is_lib() && this->input_argument_->extra_search_path() == NULL)) { @@ -796,7 +807,7 @@ Input_file::open(const Dirsearch& dirpath, const Task* task) n2 = n1 + ".a"; n1 += ".so"; } - name = dirpath.find(n1, n2, &this->is_in_sysroot_); + name = dirpath.find(n1, n2, &this->is_in_sysroot_, pindex); if (name.empty()) { gold_error(_("cannot find -l%s"), @@ -819,17 +830,21 @@ Input_file::open(const Dirsearch& dirpath, const Task* task) name += '/'; name += this->input_argument_->name(); struct stat dummy_stat; - if (::stat(name.c_str(), &dummy_stat) < 0) + if (*pindex > 0 || ::stat(name.c_str(), &dummy_stat) < 0) { // extra_search_path failed, so check the normal search-path. + int index = *pindex; + if (index > 0) + --index; name = dirpath.find(this->input_argument_->name(), "", - &this->is_in_sysroot_); + &this->is_in_sysroot_, &index); if (name.empty()) { gold_error(_("cannot find %s"), this->input_argument_->name()); return false; } + *pindex = index + 1; } this->found_name_ = this->input_argument_->name(); } -- cgit v1.2.1