diff options
author | Ian Lance Taylor <ian@airs.com> | 2009-03-14 05:56:46 +0000 |
---|---|---|
committer | Ian Lance Taylor <ian@airs.com> | 2009-03-14 05:56:46 +0000 |
commit | 15f8229bbf3f6fff866cbc04b07ddde9f6e41941 (patch) | |
tree | baff1a2307ed76fd05a8c579ada97c1605affcb4 /gold/dirsearch.cc | |
parent | 2f563b5100820d5ca2d8ca0d3dd399e5ba6c798b (diff) | |
download | gdb-15f8229bbf3f6fff866cbc04b07ddde9f6e41941.zip gdb-15f8229bbf3f6fff866cbc04b07ddde9f6e41941.tar.gz gdb-15f8229bbf3f6fff866cbc04b07ddde9f6e41941.tar.bz2 |
* 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.
Diffstat (limited to 'gold/dirsearch.cc')
-rw-r--r-- | gold/dirsearch.cc | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/gold/dirsearch.cc b/gold/dirsearch.cc index eb57f99..84e1b32 100644 --- a/gold/dirsearch.cc +++ b/gold/dirsearch.cc @@ -220,6 +220,8 @@ Dir_cache_task::run(gold::Workqueue*) namespace gold { +// Initialize. + void Dirsearch::initialize(Workqueue* workqueue, const General_options::Dir_list* directories) @@ -236,25 +238,28 @@ Dirsearch::initialize(Workqueue* workqueue, } } -// NOTE: we only log failed file-lookup attempts here. Successfully -// lookups will eventually get logged in File_read::open. +// Search for a file. NOTE: we only log failed file-lookup attempts +// here. Successfully lookups will eventually get logged in +// File_read::open. std::string Dirsearch::find(const std::string& n1, const std::string& n2, - bool *is_in_sysroot) const + bool* is_in_sysroot, int* pindex) const { gold_assert(!this->token_.is_blocked()); + gold_assert(*pindex >= 0); - for (General_options::Dir_list::const_iterator p = - this->directories_->begin(); - p != this->directories_->end(); - ++p) + for (unsigned int i = static_cast<unsigned int>(*pindex); + i < this->directories_->size(); + ++i) { + const Search_directory* p = &this->directories_->at(i); Dir_cache* pdc = caches->lookup(p->name().c_str()); gold_assert(pdc != NULL); if (pdc->find(n1)) { *is_in_sysroot = p->is_in_sysroot(); + *pindex = i; return p->name() + '/' + n1; } else @@ -266,6 +271,7 @@ Dirsearch::find(const std::string& n1, const std::string& n2, if (pdc->find(n2)) { *is_in_sysroot = p->is_in_sysroot(); + *pindex = i; return p->name() + '/' + n2; } else @@ -274,6 +280,7 @@ Dirsearch::find(const std::string& n1, const std::string& n2, } } + *pindex = -2; return std::string(); } |