15f8229bbf
(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.
84 lines
2.5 KiB
C++
84 lines
2.5 KiB
C++
// dirsearch.h -- directory searching for gold -*- C++ -*-
|
|
|
|
// Copyright 2006, 2007, 2008 Free Software Foundation, Inc.
|
|
// Written by Ian Lance Taylor <iant@google.com>.
|
|
|
|
// This file is part of gold.
|
|
|
|
// This program is free software; you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation; either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
|
|
// This program is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with this program; if not, write to the Free Software
|
|
// Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
|
|
// MA 02110-1301, USA.
|
|
|
|
#ifndef GOLD_DIRSEARCH_H
|
|
#define GOLD_DIRSEARCH_H
|
|
|
|
#include <string>
|
|
#include <list>
|
|
|
|
#include "options.h"
|
|
#include "token.h"
|
|
|
|
namespace gold
|
|
{
|
|
|
|
class General_options;
|
|
class Workqueue;
|
|
|
|
// A simple interface to manage directories to be searched for
|
|
// libraries.
|
|
|
|
class Dirsearch
|
|
{
|
|
public:
|
|
Dirsearch()
|
|
: directories_(NULL), token_(true)
|
|
{ }
|
|
|
|
// Set the list of directories to search.
|
|
void
|
|
initialize(Workqueue*, const General_options::Dir_list*);
|
|
|
|
// Search for a file, giving one or two names to search for (the
|
|
// second one may be empty). Return a full path name for the file,
|
|
// or the empty string if it could not be found. This may only be
|
|
// called if the token is not blocked. Set *IS_IN_SYSROOT if the
|
|
// file was found in a directory which is in the sysroot. *PINDEX
|
|
// should be set to zero the first time this is called; it will be
|
|
// updated with the index of the directory where the file is found,
|
|
// and that value plus one may be used to find the next file with
|
|
// the same name(s).
|
|
std::string
|
|
find(const std::string&, const std::string& n2, bool *is_in_sysroot,
|
|
int* pindex) const;
|
|
|
|
// Return the blocker token which controls access.
|
|
Task_token*
|
|
token()
|
|
{ return &this->token_; }
|
|
|
|
private:
|
|
// We can not copy this class.
|
|
Dirsearch(const Dirsearch&);
|
|
Dirsearch& operator=(const Dirsearch&);
|
|
|
|
// Directories to search.
|
|
const General_options::Dir_list* directories_;
|
|
// Blocker token to control access from tasks.
|
|
Task_token token_;
|
|
};
|
|
|
|
} // End namespace gold.
|
|
|
|
#endif // !defined(GOLD_DIRSEARCH_H)
|