2006-08-05 07:10:59 +08:00
|
|
|
// readsyms.h -- read input file symbols for gold -*- C++ -*-
|
|
|
|
|
2016-01-01 19:25:12 +08:00
|
|
|
// Copyright (C) 2006-2016 Free Software Foundation, Inc.
|
2007-09-23 05:02:10 +08:00
|
|
|
// 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.
|
|
|
|
|
2006-08-05 07:10:59 +08:00
|
|
|
#ifndef GOLD_READSYMS_H
|
|
|
|
#define GOLD_READSYMS_H
|
|
|
|
|
2006-11-04 02:26:11 +08:00
|
|
|
#include <vector>
|
|
|
|
|
2006-08-05 07:10:59 +08:00
|
|
|
#include "workqueue.h"
|
|
|
|
#include "object.h"
|
2011-04-12 08:44:48 +08:00
|
|
|
#include "incremental.h"
|
2006-08-05 07:10:59 +08:00
|
|
|
|
|
|
|
namespace gold
|
|
|
|
{
|
|
|
|
|
2006-09-27 05:00:34 +08:00
|
|
|
class Input_objects;
|
|
|
|
class Symbol_table;
|
2006-11-04 02:26:11 +08:00
|
|
|
class Input_group;
|
|
|
|
class Archive;
|
2010-02-12 11:23:26 +08:00
|
|
|
class Finish_group;
|
2006-09-27 05:00:34 +08:00
|
|
|
|
2006-08-05 07:10:59 +08:00
|
|
|
// This Task is responsible for reading the symbols from an input
|
|
|
|
// file. This also includes reading the relocations so that we can
|
|
|
|
// check for any that require a PLT and/or a GOT. After the data has
|
|
|
|
// been read, this queues up another task to actually add the symbols
|
|
|
|
// to the symbol table. The tasks are separated because the file
|
|
|
|
// reading can occur in parallel but adding the symbols must be done
|
|
|
|
// in the order of the input files.
|
|
|
|
|
|
|
|
class Read_symbols : public Task
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
// DIRPATH is the list of directories to search for libraries.
|
2006-11-04 02:26:11 +08:00
|
|
|
// INPUT is the file to read. INPUT_GROUP is not NULL if we are in
|
|
|
|
// the middle of an input group. THIS_BLOCKER is used to prevent
|
|
|
|
// the associated Add_symbols task from running before the previous
|
|
|
|
// one has completed; it will be NULL for the first task.
|
|
|
|
// NEXT_BLOCKER is used to block the next input file from adding
|
|
|
|
// symbols.
|
2009-03-14 05:30:06 +08:00
|
|
|
Read_symbols(Input_objects* input_objects, Symbol_table* symtab,
|
* 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.
2009-03-14 13:56:46 +08:00
|
|
|
Layout* layout, Dirsearch* dirpath, int dirindex,
|
|
|
|
Mapfile* mapfile, const Input_argument* input_argument,
|
2010-03-22 22:18:24 +08:00
|
|
|
Input_group* input_group, Archive_member* member,
|
|
|
|
Task_token* this_blocker, Task_token* next_blocker)
|
2009-03-14 05:30:06 +08:00
|
|
|
: input_objects_(input_objects), symtab_(symtab), layout_(layout),
|
* 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.
2009-03-14 13:56:46 +08:00
|
|
|
dirpath_(dirpath), dirindex_(dirindex), mapfile_(mapfile),
|
|
|
|
input_argument_(input_argument), input_group_(input_group),
|
2010-03-22 22:18:24 +08:00
|
|
|
member_(member), this_blocker_(this_blocker),
|
|
|
|
next_blocker_(next_blocker)
|
2006-08-05 07:10:59 +08:00
|
|
|
{ }
|
|
|
|
|
|
|
|
~Read_symbols();
|
|
|
|
|
* 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.
2009-03-14 13:56:46 +08:00
|
|
|
// If appropriate, issue a warning about skipping an incompatible
|
|
|
|
// object.
|
|
|
|
static void
|
|
|
|
incompatible_warning(const Input_argument*, const Input_file*);
|
|
|
|
|
|
|
|
// Requeue a Read_symbols task to search for the next object with
|
|
|
|
// the same name.
|
|
|
|
static void
|
|
|
|
requeue(Workqueue*, Input_objects*, Symbol_table*, Layout*, Dirsearch*,
|
|
|
|
int dirindex, Mapfile*, const Input_argument*, Input_group*,
|
|
|
|
Task_token* next_blocker);
|
|
|
|
|
2006-08-05 07:10:59 +08:00
|
|
|
// The standard Task methods.
|
|
|
|
|
2007-12-15 03:00:21 +08:00
|
|
|
Task_token*
|
|
|
|
is_runnable();
|
2006-08-05 07:10:59 +08:00
|
|
|
|
2007-12-15 03:00:21 +08:00
|
|
|
void
|
|
|
|
locks(Task_locker*);
|
2006-08-05 07:10:59 +08:00
|
|
|
|
|
|
|
void
|
|
|
|
run(Workqueue*);
|
|
|
|
|
2007-11-22 08:05:51 +08:00
|
|
|
std::string
|
|
|
|
get_name() const;
|
|
|
|
|
2006-08-05 07:10:59 +08:00
|
|
|
private:
|
2006-11-04 02:26:11 +08:00
|
|
|
// Handle an archive group.
|
|
|
|
void
|
|
|
|
do_group(Workqueue*);
|
|
|
|
|
2010-03-22 22:18:24 +08:00
|
|
|
// Handle --start-lib ... --end-lib
|
|
|
|
bool
|
|
|
|
do_lib_group(Workqueue*);
|
|
|
|
|
|
|
|
// Handle --whole-archive --start-lib ... --end-lib --no-whole-archive
|
|
|
|
bool
|
|
|
|
do_whole_lib_group(Workqueue*);
|
|
|
|
|
2007-10-23 02:02:36 +08:00
|
|
|
// Open and identify the file.
|
|
|
|
bool
|
|
|
|
do_read_symbols(Workqueue*);
|
|
|
|
|
2006-09-27 05:00:34 +08:00
|
|
|
Input_objects* input_objects_;
|
2006-08-19 06:29:20 +08:00
|
|
|
Symbol_table* symtab_;
|
2006-10-07 04:40:16 +08:00
|
|
|
Layout* layout_;
|
2007-12-15 03:00:21 +08:00
|
|
|
Dirsearch* dirpath_;
|
* 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.
2009-03-14 13:56:46 +08:00
|
|
|
int dirindex_;
|
2008-05-22 05:37:44 +08:00
|
|
|
Mapfile* mapfile_;
|
2006-11-15 03:21:05 +08:00
|
|
|
const Input_argument* input_argument_;
|
2006-11-04 02:26:11 +08:00
|
|
|
Input_group* input_group_;
|
2010-03-22 22:18:24 +08:00
|
|
|
Archive_member* member_;
|
2006-08-05 07:10:59 +08:00
|
|
|
Task_token* this_blocker_;
|
|
|
|
Task_token* next_blocker_;
|
|
|
|
};
|
|
|
|
|
|
|
|
// This Task handles adding the symbols to the symbol table. These
|
|
|
|
// tasks must be run in the same order as the arguments appear on the
|
|
|
|
// command line.
|
|
|
|
|
|
|
|
class Add_symbols : public Task
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
// THIS_BLOCKER is used to prevent this task from running before the
|
|
|
|
// one for the previous input file. NEXT_BLOCKER is used to prevent
|
|
|
|
// the next task from running.
|
2007-09-21 15:20:01 +08:00
|
|
|
Add_symbols(Input_objects* input_objects, Symbol_table* symtab,
|
2013-10-12 05:11:49 +08:00
|
|
|
Layout* layout, Dirsearch* /*dirpath*/, int /*dirindex*/,
|
|
|
|
Mapfile* /*mapfile*/, const Input_argument* input_argument,
|
2011-04-12 08:44:48 +08:00
|
|
|
Object* object, Incremental_library* library,
|
2006-11-07 06:46:08 +08:00
|
|
|
Read_symbols_data* sd, Task_token* this_blocker,
|
|
|
|
Task_token* next_blocker)
|
2007-09-21 15:20:01 +08:00
|
|
|
: input_objects_(input_objects), symtab_(symtab), layout_(layout),
|
2011-04-12 08:44:48 +08:00
|
|
|
input_argument_(input_argument), object_(object), library_(library),
|
|
|
|
sd_(sd), this_blocker_(this_blocker), next_blocker_(next_blocker)
|
2006-08-05 07:10:59 +08:00
|
|
|
{ }
|
|
|
|
|
|
|
|
~Add_symbols();
|
|
|
|
|
|
|
|
// The standard Task methods.
|
|
|
|
|
2007-12-15 03:00:21 +08:00
|
|
|
Task_token*
|
|
|
|
is_runnable();
|
2006-08-05 07:10:59 +08:00
|
|
|
|
2007-12-15 03:00:21 +08:00
|
|
|
void
|
|
|
|
locks(Task_locker*);
|
2006-08-05 07:10:59 +08:00
|
|
|
|
|
|
|
void
|
|
|
|
run(Workqueue*);
|
|
|
|
|
2007-11-22 08:05:51 +08:00
|
|
|
std::string
|
|
|
|
get_name() const
|
|
|
|
{ return "Add_symbols " + this->object_->name(); }
|
|
|
|
|
2006-08-05 07:10:59 +08:00
|
|
|
private:
|
2006-11-04 02:26:11 +08:00
|
|
|
Input_objects* input_objects_;
|
2006-08-19 06:29:20 +08:00
|
|
|
Symbol_table* symtab_;
|
2006-10-07 04:40:16 +08:00
|
|
|
Layout* layout_;
|
* 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.
2009-03-14 13:56:46 +08:00
|
|
|
const Input_argument* input_argument_;
|
2006-08-05 07:10:59 +08:00
|
|
|
Object* object_;
|
2011-04-12 08:44:48 +08:00
|
|
|
Incremental_library* library_;
|
2006-10-07 04:40:16 +08:00
|
|
|
Read_symbols_data* sd_;
|
2006-08-05 07:10:59 +08:00
|
|
|
Task_token* this_blocker_;
|
|
|
|
Task_token* next_blocker_;
|
|
|
|
};
|
|
|
|
|
2011-04-12 08:44:48 +08:00
|
|
|
// This Task is responsible for reading the symbols from an archive
|
|
|
|
// member that has changed since the last incremental link.
|
|
|
|
|
|
|
|
class Read_member : public Task
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
// INPUT is the file to read. INPUT_GROUP is not NULL if we are in
|
|
|
|
// the middle of an input group. THIS_BLOCKER is used to prevent
|
|
|
|
// the associated Add_symbols task from running before the previous
|
|
|
|
// one has completed; it will be NULL for the first task.
|
|
|
|
// NEXT_BLOCKER is used to block the next input file from adding
|
|
|
|
// symbols.
|
2013-10-12 05:11:49 +08:00
|
|
|
Read_member(Input_objects* /*input_objects*/, Symbol_table* /*symtab*/,
|
|
|
|
Layout* /*layout*/, Mapfile* /*mapfile*/,
|
2011-04-12 08:44:48 +08:00
|
|
|
const Incremental_binary::Input_reader* input_reader,
|
|
|
|
Task_token* this_blocker, Task_token* next_blocker)
|
2013-10-12 05:11:49 +08:00
|
|
|
: input_reader_(input_reader),
|
2011-04-12 08:44:48 +08:00
|
|
|
this_blocker_(this_blocker), next_blocker_(next_blocker)
|
|
|
|
{ }
|
|
|
|
|
|
|
|
~Read_member();
|
|
|
|
|
|
|
|
// The standard Task methods.
|
|
|
|
|
|
|
|
Task_token*
|
|
|
|
is_runnable();
|
|
|
|
|
|
|
|
void
|
|
|
|
locks(Task_locker*);
|
|
|
|
|
|
|
|
void
|
|
|
|
run(Workqueue*);
|
|
|
|
|
|
|
|
std::string
|
|
|
|
get_name() const
|
|
|
|
{
|
|
|
|
return (std::string("Read_member ") + this->input_reader_->filename());
|
|
|
|
}
|
|
|
|
|
|
|
|
private:
|
|
|
|
const Incremental_binary::Input_reader* input_reader_;
|
|
|
|
Task_token* this_blocker_;
|
|
|
|
Task_token* next_blocker_;
|
|
|
|
};
|
|
|
|
|
|
|
|
// This Task is responsible for processing an input script file that has
|
|
|
|
// not changed since the last incremental link.
|
|
|
|
|
|
|
|
class Check_script : public Task
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
Check_script(Layout* layout, Incremental_binary* ibase,
|
|
|
|
unsigned int input_file_index,
|
|
|
|
const Incremental_binary::Input_reader* input_reader,
|
|
|
|
Task_token* this_blocker, Task_token* next_blocker)
|
|
|
|
: layout_(layout), ibase_(ibase), input_file_index_(input_file_index),
|
|
|
|
input_reader_(input_reader), this_blocker_(this_blocker),
|
|
|
|
next_blocker_(next_blocker)
|
|
|
|
{
|
|
|
|
this->filename_ = std::string(this->input_reader_->filename());
|
|
|
|
}
|
|
|
|
|
|
|
|
~Check_script();
|
|
|
|
|
|
|
|
// The standard Task methods.
|
|
|
|
|
|
|
|
Task_token*
|
|
|
|
is_runnable();
|
|
|
|
|
|
|
|
void
|
|
|
|
locks(Task_locker*);
|
|
|
|
|
|
|
|
void
|
|
|
|
run(Workqueue*);
|
|
|
|
|
|
|
|
std::string
|
|
|
|
get_name() const
|
|
|
|
{
|
|
|
|
return (std::string("Check_script ") + this->input_reader_->filename());
|
|
|
|
}
|
|
|
|
|
|
|
|
private:
|
|
|
|
std::string filename_;
|
|
|
|
Layout* layout_;
|
|
|
|
Incremental_binary* ibase_;
|
|
|
|
unsigned int input_file_index_;
|
|
|
|
const Incremental_binary::Input_reader* input_reader_;
|
|
|
|
Task_token* this_blocker_;
|
|
|
|
Task_token* next_blocker_;
|
|
|
|
};
|
|
|
|
|
|
|
|
// This Task is responsible for processing an archive library that has
|
|
|
|
// not changed since the last incremental link.
|
|
|
|
|
|
|
|
class Check_library : public Task
|
|
|
|
{
|
|
|
|
public:
|
2013-10-12 05:11:49 +08:00
|
|
|
Check_library(Symbol_table* /*symtab*/, Layout* layout,
|
2011-04-12 08:44:48 +08:00
|
|
|
Incremental_binary* ibase,
|
|
|
|
unsigned int input_file_index,
|
|
|
|
const Incremental_binary::Input_reader* input_reader,
|
|
|
|
Task_token* this_blocker, Task_token* next_blocker)
|
2013-10-12 05:11:49 +08:00
|
|
|
: layout_(layout), ibase_(ibase),
|
2011-04-12 08:44:48 +08:00
|
|
|
input_file_index_(input_file_index), input_reader_(input_reader),
|
|
|
|
this_blocker_(this_blocker), next_blocker_(next_blocker)
|
|
|
|
{ }
|
|
|
|
|
|
|
|
~Check_library();
|
|
|
|
|
|
|
|
// The standard Task methods.
|
|
|
|
|
|
|
|
Task_token*
|
|
|
|
is_runnable();
|
|
|
|
|
|
|
|
void
|
|
|
|
locks(Task_locker*);
|
|
|
|
|
|
|
|
void
|
|
|
|
run(Workqueue*);
|
|
|
|
|
|
|
|
std::string
|
|
|
|
get_name() const
|
|
|
|
{
|
|
|
|
return (std::string("Check_library ") + this->input_reader_->filename());
|
|
|
|
}
|
|
|
|
|
|
|
|
private:
|
|
|
|
Layout* layout_;
|
|
|
|
Incremental_binary* ibase_;
|
|
|
|
unsigned int input_file_index_;
|
|
|
|
const Incremental_binary::Input_reader* input_reader_;
|
|
|
|
Task_token* this_blocker_;
|
|
|
|
Task_token* next_blocker_;
|
|
|
|
};
|
|
|
|
|
2006-11-04 02:26:11 +08:00
|
|
|
// This class is used to track the archives in a group.
|
|
|
|
|
|
|
|
class Input_group
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
typedef std::vector<Archive*> Archives;
|
|
|
|
typedef Archives::const_iterator const_iterator;
|
|
|
|
|
|
|
|
Input_group()
|
|
|
|
: archives_()
|
|
|
|
{ }
|
|
|
|
|
2011-01-25 05:48:40 +08:00
|
|
|
~Input_group();
|
|
|
|
|
2006-11-04 02:26:11 +08:00
|
|
|
// Add an archive to the group.
|
|
|
|
void
|
|
|
|
add_archive(Archive* arch)
|
|
|
|
{ this->archives_.push_back(arch); }
|
|
|
|
|
|
|
|
// Loop over the archives in the group.
|
|
|
|
|
|
|
|
const_iterator
|
|
|
|
begin() const
|
|
|
|
{ return this->archives_.begin(); }
|
|
|
|
|
|
|
|
const_iterator
|
|
|
|
end() const
|
|
|
|
{ return this->archives_.end(); }
|
|
|
|
|
|
|
|
private:
|
|
|
|
Archives archives_;
|
|
|
|
};
|
|
|
|
|
2010-02-12 11:23:26 +08:00
|
|
|
// This class starts the handling of a group. It exists only to pick
|
|
|
|
// up the number of undefined symbols at that point, so that we only
|
|
|
|
// run back through the group if we saw a new undefined symbol.
|
|
|
|
|
|
|
|
class Start_group : public Task
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
Start_group(Symbol_table* symtab, Finish_group* finish_group,
|
|
|
|
Task_token* this_blocker, Task_token* next_blocker)
|
|
|
|
: symtab_(symtab), finish_group_(finish_group),
|
|
|
|
this_blocker_(this_blocker), next_blocker_(next_blocker)
|
|
|
|
{ }
|
|
|
|
|
|
|
|
~Start_group();
|
|
|
|
|
|
|
|
// The standard Task methods.
|
|
|
|
|
|
|
|
Task_token*
|
|
|
|
is_runnable();
|
|
|
|
|
|
|
|
void
|
|
|
|
locks(Task_locker*);
|
|
|
|
|
|
|
|
void
|
|
|
|
run(Workqueue*);
|
|
|
|
|
|
|
|
std::string
|
|
|
|
get_name() const
|
|
|
|
{ return "Start_group"; }
|
|
|
|
|
|
|
|
private:
|
|
|
|
Symbol_table* symtab_;
|
|
|
|
Finish_group* finish_group_;
|
|
|
|
Task_token* this_blocker_;
|
|
|
|
Task_token* next_blocker_;
|
|
|
|
};
|
|
|
|
|
2006-11-04 02:26:11 +08:00
|
|
|
// This class is used to finish up handling a group. It is just a
|
|
|
|
// closure.
|
|
|
|
|
|
|
|
class Finish_group : public Task
|
|
|
|
{
|
|
|
|
public:
|
2007-09-21 15:20:01 +08:00
|
|
|
Finish_group(Input_objects* input_objects, Symbol_table* symtab,
|
2008-05-22 05:37:44 +08:00
|
|
|
Layout* layout, Mapfile* mapfile, Input_group* input_group,
|
2006-11-04 02:26:11 +08:00
|
|
|
Task_token* next_blocker)
|
2007-09-21 15:20:01 +08:00
|
|
|
: input_objects_(input_objects), symtab_(symtab),
|
2008-05-22 05:37:44 +08:00
|
|
|
layout_(layout), mapfile_(mapfile), input_group_(input_group),
|
2010-02-12 11:23:26 +08:00
|
|
|
saw_undefined_(0), this_blocker_(NULL), next_blocker_(next_blocker)
|
2006-11-04 02:26:11 +08:00
|
|
|
{ }
|
|
|
|
|
|
|
|
~Finish_group();
|
|
|
|
|
2010-02-12 11:23:26 +08:00
|
|
|
// Set the number of undefined symbols when we start processing the
|
|
|
|
// group. This is called by the Start_group task.
|
|
|
|
void
|
|
|
|
set_saw_undefined(size_t saw_undefined)
|
|
|
|
{ this->saw_undefined_ = saw_undefined; }
|
|
|
|
|
|
|
|
// Set the blocker to use for this task.
|
|
|
|
void
|
|
|
|
set_blocker(Task_token* this_blocker)
|
|
|
|
{
|
|
|
|
gold_assert(this->this_blocker_ == NULL);
|
|
|
|
this->this_blocker_ = this_blocker;
|
|
|
|
}
|
|
|
|
|
2006-11-04 02:26:11 +08:00
|
|
|
// The standard Task methods.
|
|
|
|
|
2007-12-15 03:00:21 +08:00
|
|
|
Task_token*
|
|
|
|
is_runnable();
|
2006-11-04 02:26:11 +08:00
|
|
|
|
2007-12-15 03:00:21 +08:00
|
|
|
void
|
|
|
|
locks(Task_locker*);
|
2006-11-04 02:26:11 +08:00
|
|
|
|
|
|
|
void
|
|
|
|
run(Workqueue*);
|
|
|
|
|
2007-11-22 08:05:51 +08:00
|
|
|
std::string
|
|
|
|
get_name() const
|
|
|
|
{ return "Finish_group"; }
|
|
|
|
|
2006-11-04 02:26:11 +08:00
|
|
|
private:
|
|
|
|
Input_objects* input_objects_;
|
|
|
|
Symbol_table* symtab_;
|
|
|
|
Layout* layout_;
|
2008-05-22 05:37:44 +08:00
|
|
|
Mapfile* mapfile_;
|
2006-11-04 02:26:11 +08:00
|
|
|
Input_group* input_group_;
|
2010-02-12 11:23:26 +08:00
|
|
|
size_t saw_undefined_;
|
2006-11-04 02:26:11 +08:00
|
|
|
Task_token* this_blocker_;
|
|
|
|
Task_token* next_blocker_;
|
|
|
|
};
|
|
|
|
|
2008-02-29 03:46:06 +08:00
|
|
|
// This class is used to read a file which was not recognized as an
|
|
|
|
// object or archive. It tries to read it as a linker script, using
|
|
|
|
// the tokens to serialize with the calls to Add_symbols.
|
|
|
|
|
|
|
|
class Read_script : public Task
|
|
|
|
{
|
|
|
|
public:
|
2009-03-14 05:30:06 +08:00
|
|
|
Read_script(Symbol_table* symtab, Layout* layout, Dirsearch* dirpath,
|
* 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.
2009-03-14 13:56:46 +08:00
|
|
|
int dirindex, Input_objects* input_objects, Mapfile* mapfile,
|
2009-03-14 05:30:06 +08:00
|
|
|
Input_group* input_group, const Input_argument* input_argument,
|
2008-02-29 03:46:06 +08:00
|
|
|
Input_file* input_file, Task_token* this_blocker,
|
|
|
|
Task_token* next_blocker)
|
* 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.
2009-03-14 13:56:46 +08:00
|
|
|
: symtab_(symtab), layout_(layout), dirpath_(dirpath), dirindex_(dirindex),
|
2008-05-22 05:37:44 +08:00
|
|
|
input_objects_(input_objects), mapfile_(mapfile),
|
|
|
|
input_group_(input_group), input_argument_(input_argument),
|
|
|
|
input_file_(input_file), this_blocker_(this_blocker),
|
|
|
|
next_blocker_(next_blocker)
|
2008-02-29 03:46:06 +08:00
|
|
|
{ }
|
|
|
|
|
|
|
|
~Read_script();
|
|
|
|
|
|
|
|
// The standard Task methods.
|
|
|
|
|
|
|
|
Task_token*
|
|
|
|
is_runnable();
|
|
|
|
|
|
|
|
void
|
|
|
|
locks(Task_locker*);
|
|
|
|
|
|
|
|
void
|
|
|
|
run(Workqueue*);
|
|
|
|
|
|
|
|
std::string
|
|
|
|
get_name() const;
|
|
|
|
|
|
|
|
private:
|
|
|
|
Symbol_table* symtab_;
|
|
|
|
Layout* layout_;
|
|
|
|
Dirsearch* dirpath_;
|
* 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.
2009-03-14 13:56:46 +08:00
|
|
|
int dirindex_;
|
2008-02-29 03:46:06 +08:00
|
|
|
Input_objects* input_objects_;
|
2008-05-22 05:37:44 +08:00
|
|
|
Mapfile* mapfile_;
|
2008-02-29 03:46:06 +08:00
|
|
|
Input_group* input_group_;
|
|
|
|
const Input_argument* input_argument_;
|
|
|
|
Input_file* input_file_;
|
|
|
|
Task_token* this_blocker_;
|
|
|
|
Task_token* next_blocker_;
|
|
|
|
};
|
|
|
|
|
2006-08-05 07:10:59 +08:00
|
|
|
} // end namespace gold
|
|
|
|
|
|
|
|
#endif // !defined(GOLD_READSYMS_H)
|