2006-08-05 07:10:59 +08:00
|
|
|
// readsyms.cc -- read input file symbols for gold
|
|
|
|
|
2011-01-25 05:48:40 +08:00
|
|
|
// Copyright 2006, 2007, 2008, 2009, 2010, 2011 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
|
|
|
#include "gold.h"
|
|
|
|
|
|
|
|
#include <cstring>
|
|
|
|
|
|
|
|
#include "elfcpp.h"
|
|
|
|
#include "options.h"
|
|
|
|
#include "dirsearch.h"
|
2006-11-07 06:46:08 +08:00
|
|
|
#include "symtab.h"
|
2006-09-22 06:13:18 +08:00
|
|
|
#include "object.h"
|
2006-09-30 03:58:17 +08:00
|
|
|
#include "archive.h"
|
2006-11-15 03:21:05 +08:00
|
|
|
#include "script.h"
|
2006-09-30 03:58:17 +08:00
|
|
|
#include "readsyms.h"
|
2008-09-20 06:54:57 +08:00
|
|
|
#include "plugin.h"
|
2009-05-16 01:01:04 +08:00
|
|
|
#include "layout.h"
|
|
|
|
#include "incremental.h"
|
2006-08-05 07:10:59 +08:00
|
|
|
|
|
|
|
namespace gold
|
|
|
|
{
|
|
|
|
|
2007-10-23 02:02:36 +08:00
|
|
|
// If we fail to open the object, then we won't create an Add_symbols
|
|
|
|
// task. However, we still need to unblock the token, or else the
|
|
|
|
// link won't proceed to generate more error messages. We can only
|
2007-12-15 03:00:21 +08:00
|
|
|
// unblock tokens when the workqueue lock is held, so we need a dummy
|
|
|
|
// task to do that. The dummy task has to maintain the right sequence
|
|
|
|
// of blocks, so we need both this_blocker and next_blocker.
|
2007-10-23 02:02:36 +08:00
|
|
|
|
|
|
|
class Unblock_token : public Task
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
Unblock_token(Task_token* this_blocker, Task_token* next_blocker)
|
|
|
|
: this_blocker_(this_blocker), next_blocker_(next_blocker)
|
|
|
|
{ }
|
|
|
|
|
|
|
|
~Unblock_token()
|
|
|
|
{
|
|
|
|
if (this->this_blocker_ != NULL)
|
|
|
|
delete this->this_blocker_;
|
|
|
|
}
|
|
|
|
|
2007-12-15 03:00:21 +08:00
|
|
|
Task_token*
|
|
|
|
is_runnable()
|
2007-10-23 02:02:36 +08:00
|
|
|
{
|
|
|
|
if (this->this_blocker_ != NULL && this->this_blocker_->is_blocked())
|
2007-12-15 03:00:21 +08:00
|
|
|
return this->this_blocker_;
|
|
|
|
return NULL;
|
2007-10-23 02:02:36 +08:00
|
|
|
}
|
|
|
|
|
2007-12-15 03:00:21 +08:00
|
|
|
void
|
|
|
|
locks(Task_locker* tl)
|
|
|
|
{ tl->add(this, this->next_blocker_); }
|
2007-10-23 02:02:36 +08:00
|
|
|
|
|
|
|
void
|
|
|
|
run(Workqueue*)
|
|
|
|
{ }
|
|
|
|
|
2007-11-22 08:05:51 +08:00
|
|
|
std::string
|
|
|
|
get_name() const
|
|
|
|
{ return "Unblock_token"; }
|
|
|
|
|
2007-10-23 02:02:36 +08:00
|
|
|
private:
|
|
|
|
Task_token* this_blocker_;
|
|
|
|
Task_token* next_blocker_;
|
|
|
|
};
|
|
|
|
|
2006-08-05 07:10:59 +08:00
|
|
|
// Class read_symbols.
|
|
|
|
|
|
|
|
Read_symbols::~Read_symbols()
|
|
|
|
{
|
|
|
|
// The this_blocker_ and next_blocker_ pointers are passed on to the
|
|
|
|
// Add_symbols task.
|
|
|
|
}
|
|
|
|
|
* 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
|
|
|
|
// file.
|
|
|
|
|
|
|
|
void
|
|
|
|
Read_symbols::incompatible_warning(const Input_argument* input_argument,
|
|
|
|
const Input_file* input_file)
|
|
|
|
{
|
|
|
|
if (parameters->options().warn_search_mismatch())
|
|
|
|
gold_warning("skipping incompatible %s while searching for %s",
|
|
|
|
input_file->filename().c_str(),
|
|
|
|
input_argument->file().name());
|
|
|
|
}
|
|
|
|
|
|
|
|
// Requeue a Read_symbols task to search for the next object with the
|
|
|
|
// same name.
|
|
|
|
|
|
|
|
void
|
|
|
|
Read_symbols::requeue(Workqueue* workqueue, Input_objects* input_objects,
|
|
|
|
Symbol_table* symtab, Layout* layout, Dirsearch* dirpath,
|
|
|
|
int dirindex, Mapfile* mapfile,
|
|
|
|
const Input_argument* input_argument,
|
|
|
|
Input_group* input_group, Task_token* next_blocker)
|
|
|
|
{
|
|
|
|
// Bump the directory search index.
|
|
|
|
++dirindex;
|
|
|
|
|
|
|
|
// We don't need to worry about this_blocker, since we already
|
|
|
|
// reached it. However, we are removing the blocker on next_blocker
|
|
|
|
// because the calling task is completing. So we need to add a new
|
|
|
|
// blocker. Since next_blocker may be shared by several tasks, we
|
|
|
|
// need to increment the count with the workqueue lock held.
|
|
|
|
workqueue->add_blocker(next_blocker);
|
|
|
|
|
|
|
|
workqueue->queue(new Read_symbols(input_objects, symtab, layout, dirpath,
|
|
|
|
dirindex, mapfile, input_argument,
|
2010-03-22 22:18:24 +08:00
|
|
|
input_group, NULL, NULL, 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
|
|
|
}
|
|
|
|
|
2006-11-04 02:26:11 +08:00
|
|
|
// Return whether a Read_symbols task is runnable. We can read an
|
|
|
|
// ordinary input file immediately. For an archive specified using
|
|
|
|
// -l, we have to wait until the search path is complete.
|
2006-08-05 07:10:59 +08:00
|
|
|
|
2007-12-15 03:00:21 +08:00
|
|
|
Task_token*
|
|
|
|
Read_symbols::is_runnable()
|
2006-08-05 07:10:59 +08:00
|
|
|
{
|
2006-11-15 03:21:05 +08:00
|
|
|
if (this->input_argument_->is_file()
|
2007-10-03 05:24:41 +08:00
|
|
|
&& this->input_argument_->file().may_need_search()
|
2007-12-15 03:00:21 +08:00
|
|
|
&& this->dirpath_->token()->is_blocked())
|
|
|
|
return this->dirpath_->token();
|
2006-08-05 07:10:59 +08:00
|
|
|
|
2007-12-15 03:00:21 +08:00
|
|
|
return NULL;
|
2006-08-05 07:10:59 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
// Return a Task_locker for a Read_symbols task. We don't need any
|
|
|
|
// locks here.
|
|
|
|
|
2007-12-15 03:00:21 +08:00
|
|
|
void
|
2010-03-22 22:18:24 +08:00
|
|
|
Read_symbols::locks(Task_locker* tl)
|
2006-08-05 07:10:59 +08:00
|
|
|
{
|
2010-03-22 22:18:24 +08:00
|
|
|
if (this->member_ != NULL)
|
|
|
|
tl->add(this, this->next_blocker_);
|
2006-08-05 07:10:59 +08:00
|
|
|
}
|
|
|
|
|
2007-10-23 02:02:36 +08:00
|
|
|
// Run a Read_symbols task.
|
2006-08-05 07:10:59 +08:00
|
|
|
|
|
|
|
void
|
|
|
|
Read_symbols::run(Workqueue* workqueue)
|
2007-10-23 02:02:36 +08:00
|
|
|
{
|
|
|
|
// If we didn't queue a new task, then we need to explicitly unblock
|
|
|
|
// the token.
|
|
|
|
if (!this->do_read_symbols(workqueue))
|
2008-02-29 03:46:06 +08:00
|
|
|
workqueue->queue_soon(new Unblock_token(this->this_blocker_,
|
|
|
|
this->next_blocker_));
|
2007-10-23 02:02:36 +08:00
|
|
|
}
|
|
|
|
|
2010-12-15 03:03:30 +08:00
|
|
|
// Handle a whole lib group. Other than collecting statistics, this just
|
2010-03-22 22:18:24 +08:00
|
|
|
// mimics what we do for regular object files in the command line.
|
|
|
|
|
|
|
|
bool
|
|
|
|
Read_symbols::do_whole_lib_group(Workqueue* workqueue)
|
|
|
|
{
|
|
|
|
const Input_file_lib* lib_group = this->input_argument_->lib();
|
|
|
|
|
|
|
|
++Lib_group::total_lib_groups;
|
|
|
|
|
|
|
|
Task_token* this_blocker = this->this_blocker_;
|
|
|
|
for (Input_file_lib::const_iterator i = lib_group->begin();
|
|
|
|
i != lib_group->end();
|
|
|
|
++i)
|
|
|
|
{
|
|
|
|
++Lib_group::total_members;
|
|
|
|
++Lib_group::total_members_loaded;
|
|
|
|
|
|
|
|
const Input_argument* arg = &*i;
|
|
|
|
|
|
|
|
Task_token* next_blocker;
|
|
|
|
if (i != lib_group->end() - 1)
|
|
|
|
{
|
|
|
|
next_blocker = new Task_token(true);
|
|
|
|
next_blocker->add_blocker();
|
|
|
|
}
|
|
|
|
else
|
|
|
|
next_blocker = this->next_blocker_;
|
|
|
|
|
|
|
|
workqueue->queue_soon(new Read_symbols(this->input_objects_,
|
|
|
|
this->symtab_, this->layout_,
|
|
|
|
this->dirpath_, this->dirindex_,
|
|
|
|
this->mapfile_, arg, NULL,
|
|
|
|
NULL, this_blocker, next_blocker));
|
|
|
|
this_blocker = next_blocker;
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Handle a lib group. We set Read_symbols Tasks as usual, but have them
|
|
|
|
// just record the symbol data instead of adding the objects. We also start
|
|
|
|
// a Add_lib_group_symbols Task which runs after we've read all the symbols.
|
|
|
|
// In that task we process the members in a loop until we are done.
|
|
|
|
|
|
|
|
bool
|
|
|
|
Read_symbols::do_lib_group(Workqueue* workqueue)
|
|
|
|
{
|
|
|
|
const Input_file_lib* lib_group = this->input_argument_->lib();
|
|
|
|
|
|
|
|
if (lib_group->options().whole_archive())
|
|
|
|
return this->do_whole_lib_group(workqueue);
|
|
|
|
|
|
|
|
Lib_group* lib = new Lib_group(lib_group, this);
|
|
|
|
|
|
|
|
Add_lib_group_symbols* add_lib_group_symbols =
|
|
|
|
new Add_lib_group_symbols(this->symtab_, this->layout_,
|
|
|
|
this->input_objects_,
|
|
|
|
lib, this->next_blocker_);
|
|
|
|
|
|
|
|
|
|
|
|
Task_token* next_blocker = new Task_token(true);
|
|
|
|
int j = 0;
|
|
|
|
for (Input_file_lib::const_iterator i = lib_group->begin();
|
|
|
|
i != lib_group->end();
|
|
|
|
++i, ++j)
|
|
|
|
{
|
|
|
|
const Input_argument* arg = &*i;
|
|
|
|
Archive_member* m = lib->get_member(j);
|
|
|
|
|
|
|
|
next_blocker->add_blocker();
|
|
|
|
|
|
|
|
// Since this Read_symbols will not create an Add_symbols,
|
|
|
|
// just pass NULL as this_blocker.
|
|
|
|
workqueue->queue_soon(new Read_symbols(this->input_objects_,
|
|
|
|
this->symtab_, this->layout_,
|
|
|
|
this->dirpath_, this->dirindex_,
|
|
|
|
this->mapfile_, arg, NULL,
|
|
|
|
m, NULL, next_blocker));
|
|
|
|
}
|
|
|
|
|
2010-08-20 08:35:13 +08:00
|
|
|
add_lib_group_symbols->set_blocker(next_blocker, this->this_blocker_);
|
2010-03-22 22:18:24 +08:00
|
|
|
workqueue->queue_soon(add_lib_group_symbols);
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2007-10-23 02:02:36 +08:00
|
|
|
// Open the file and read the symbols. Return true if a new task was
|
|
|
|
// queued, false if that could not happen due to some error.
|
|
|
|
|
|
|
|
bool
|
|
|
|
Read_symbols::do_read_symbols(Workqueue* workqueue)
|
2006-08-05 07:10:59 +08:00
|
|
|
{
|
2006-11-15 03:21:05 +08:00
|
|
|
if (this->input_argument_->is_group())
|
2006-11-04 02:26:11 +08:00
|
|
|
{
|
2006-11-30 01:56:40 +08:00
|
|
|
gold_assert(this->input_group_ == NULL);
|
2006-11-04 02:26:11 +08:00
|
|
|
this->do_group(workqueue);
|
2007-10-23 02:02:36 +08:00
|
|
|
return true;
|
2006-11-04 02:26:11 +08:00
|
|
|
}
|
|
|
|
|
2010-03-22 22:18:24 +08:00
|
|
|
if (this->input_argument_->is_lib())
|
|
|
|
return this->do_lib_group(workqueue);
|
|
|
|
|
2006-12-01 07:52:50 +08:00
|
|
|
Input_file* input_file = new Input_file(&this->input_argument_->file());
|
* 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 (!input_file->open(*this->dirpath_, this, &this->dirindex_))
|
2007-10-23 02:02:36 +08:00
|
|
|
return false;
|
2006-08-05 07:10:59 +08:00
|
|
|
|
|
|
|
// Read enough of the file to pick up the entire ELF header.
|
|
|
|
|
2007-09-25 14:43:17 +08:00
|
|
|
off_t filesize = input_file->file().filesize();
|
2007-09-25 13:16:35 +08:00
|
|
|
|
2007-09-25 14:43:17 +08:00
|
|
|
if (filesize == 0)
|
|
|
|
{
|
2007-10-14 14:49:14 +08:00
|
|
|
gold_error(_("%s: file is empty"),
|
|
|
|
input_file->file().filename().c_str());
|
2007-10-23 02:02:36 +08:00
|
|
|
return false;
|
2007-09-25 14:43:17 +08:00
|
|
|
}
|
|
|
|
|
2009-03-25 02:42:10 +08:00
|
|
|
const unsigned char* ehdr;
|
|
|
|
int read_size;
|
|
|
|
bool is_elf = is_elf_object(input_file, 0, &ehdr, &read_size);
|
2007-09-25 14:43:17 +08:00
|
|
|
|
2008-09-20 06:54:57 +08:00
|
|
|
if (read_size >= Archive::sarmag)
|
|
|
|
{
|
|
|
|
bool is_thin_archive
|
|
|
|
= memcmp(ehdr, Archive::armagt, Archive::sarmag) == 0;
|
2009-05-16 01:01:04 +08:00
|
|
|
if (is_thin_archive
|
2008-09-20 06:54:57 +08:00
|
|
|
|| memcmp(ehdr, Archive::armag, Archive::sarmag) == 0)
|
|
|
|
{
|
|
|
|
// This is an archive.
|
|
|
|
Archive* arch = new Archive(this->input_argument_->file().name(),
|
|
|
|
input_file, is_thin_archive,
|
|
|
|
this->dirpath_, this);
|
* 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
|
|
|
arch->setup();
|
2009-05-16 01:01:04 +08:00
|
|
|
|
2008-09-20 06:54:57 +08:00
|
|
|
// Unlock the archive so it can be used in the next task.
|
|
|
|
arch->unlock(this);
|
|
|
|
|
|
|
|
workqueue->queue_next(new Add_archive_symbols(this->symtab_,
|
|
|
|
this->layout_,
|
|
|
|
this->input_objects_,
|
* 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
|
|
|
this->dirpath_,
|
|
|
|
this->dirindex_,
|
2008-09-20 06:54:57 +08:00
|
|
|
this->mapfile_,
|
* 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
|
|
|
this->input_argument_,
|
2008-09-20 06:54:57 +08:00
|
|
|
arch,
|
|
|
|
this->input_group_,
|
|
|
|
this->this_blocker_,
|
|
|
|
this->next_blocker_));
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (parameters->options().has_plugins())
|
|
|
|
{
|
|
|
|
Pluginobj* obj = parameters->options().plugins()->claim_file(input_file,
|
|
|
|
0, filesize);
|
|
|
|
if (obj != NULL)
|
|
|
|
{
|
|
|
|
// The input file was claimed by a plugin, and its symbols
|
|
|
|
// have been provided by the plugin.
|
2009-01-15 09:29:25 +08:00
|
|
|
|
|
|
|
// We are done with the file at this point, so unlock it.
|
|
|
|
obj->unlock(this);
|
|
|
|
|
2010-03-22 22:18:24 +08:00
|
|
|
if (this->member_ != NULL)
|
|
|
|
{
|
|
|
|
this->member_->sd_ = NULL;
|
|
|
|
this->member_->obj_ = obj;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2009-02-14 03:04:45 +08:00
|
|
|
workqueue->queue_next(new Add_symbols(this->input_objects_,
|
|
|
|
this->symtab_,
|
|
|
|
this->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
|
|
|
this->dirpath_,
|
|
|
|
this->dirindex_,
|
|
|
|
this->mapfile_,
|
|
|
|
this->input_argument_,
|
|
|
|
obj,
|
|
|
|
NULL,
|
2009-02-14 03:04:45 +08:00
|
|
|
this->this_blocker_,
|
|
|
|
this->next_blocker_));
|
2008-09-20 06:54:57 +08:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-03-25 02:42:10 +08:00
|
|
|
if (is_elf)
|
2006-08-05 07:10:59 +08:00
|
|
|
{
|
2009-03-25 02:42:10 +08:00
|
|
|
// This is an ELF object.
|
2006-09-22 06:13:18 +08:00
|
|
|
|
2009-10-01 06:21:13 +08:00
|
|
|
bool unconfigured = false;
|
|
|
|
bool* punconfigured = (input_file->will_search_for()
|
|
|
|
? &unconfigured
|
|
|
|
: NULL);
|
2009-03-25 02:42:10 +08:00
|
|
|
Object* obj = make_elf_object(input_file->filename(),
|
|
|
|
input_file, 0, ehdr, read_size,
|
2009-10-01 06:21:13 +08:00
|
|
|
punconfigured);
|
2009-03-25 02:42:10 +08:00
|
|
|
if (obj == NULL)
|
|
|
|
{
|
2009-10-01 06:21:13 +08:00
|
|
|
if (unconfigured)
|
* 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
|
|
|
{
|
2009-03-25 02:42:10 +08:00
|
|
|
Read_symbols::incompatible_warning(this->input_argument_,
|
|
|
|
input_file);
|
|
|
|
input_file->file().release();
|
|
|
|
input_file->file().unlock(this);
|
|
|
|
delete input_file;
|
|
|
|
++this->dirindex_;
|
|
|
|
return this->do_read_symbols(workqueue);
|
* 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
|
|
|
}
|
2009-03-25 02:42:10 +08:00
|
|
|
return false;
|
|
|
|
}
|
2006-11-15 03:21:05 +08:00
|
|
|
|
2009-03-25 02:42:10 +08:00
|
|
|
Read_symbols_data* sd = new Read_symbols_data;
|
|
|
|
obj->read_symbols(sd);
|
|
|
|
|
|
|
|
// Opening the file locked it, so now we need to unlock it. We
|
|
|
|
// need to unlock it before queuing the Add_symbols task,
|
|
|
|
// because the workqueue doesn't know about our lock on the
|
|
|
|
// file. If we queue the Add_symbols task first, it will be
|
|
|
|
// stuck on the end of the file lock, but since the workqueue
|
|
|
|
// doesn't know about that lock, it will never release the
|
|
|
|
// Add_symbols task.
|
|
|
|
|
|
|
|
input_file->file().unlock(this);
|
|
|
|
|
2010-03-22 22:18:24 +08:00
|
|
|
if (this->member_ != NULL)
|
|
|
|
{
|
|
|
|
this->member_->sd_ = sd;
|
|
|
|
this->member_->obj_ = obj;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2009-03-25 02:42:10 +08:00
|
|
|
// We use queue_next because everything is cached for this
|
|
|
|
// task to run right away if possible.
|
|
|
|
|
|
|
|
workqueue->queue_next(new Add_symbols(this->input_objects_,
|
|
|
|
this->symtab_, this->layout_,
|
|
|
|
this->dirpath_,
|
|
|
|
this->dirindex_,
|
|
|
|
this->mapfile_,
|
|
|
|
this->input_argument_,
|
|
|
|
obj,
|
|
|
|
sd,
|
|
|
|
this->this_blocker_,
|
|
|
|
this->next_blocker_));
|
2006-08-05 07:10:59 +08:00
|
|
|
|
2009-03-25 02:42:10 +08:00
|
|
|
return true;
|
2006-08-05 07:10:59 +08:00
|
|
|
}
|
|
|
|
|
2008-02-29 03:46:06 +08:00
|
|
|
// Queue up a task to try to parse this file as a script. We use a
|
|
|
|
// separate task so that the script will be read in order with other
|
|
|
|
// objects named on the command line. Also so that we don't try to
|
|
|
|
// read multiple scripts simultaneously, which could lead to
|
|
|
|
// unpredictable changes to the General_options structure.
|
|
|
|
|
2009-03-14 05:30:06 +08:00
|
|
|
workqueue->queue_soon(new Read_script(this->symtab_,
|
2008-02-29 03:46:06 +08:00
|
|
|
this->layout_,
|
|
|
|
this->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
|
|
|
this->dirindex_,
|
2008-02-29 03:46:06 +08:00
|
|
|
this->input_objects_,
|
2008-05-22 05:37:44 +08:00
|
|
|
this->mapfile_,
|
2008-02-29 03:46:06 +08:00
|
|
|
this->input_group_,
|
|
|
|
this->input_argument_,
|
|
|
|
input_file,
|
|
|
|
this->this_blocker_,
|
|
|
|
this->next_blocker_));
|
|
|
|
return true;
|
2006-08-05 07:10:59 +08:00
|
|
|
}
|
|
|
|
|
2006-11-04 02:26:11 +08:00
|
|
|
// Handle a group. We need to walk through the arguments over and
|
|
|
|
// over until we don't see any new undefined symbols. We do this by
|
|
|
|
// setting off Read_symbols Tasks as usual, but recording the archive
|
|
|
|
// entries instead of deleting them. We also start a Finish_group
|
|
|
|
// Task which runs after we've read all the symbols. In that task we
|
|
|
|
// process the archives in a loop until we are done.
|
|
|
|
|
|
|
|
void
|
|
|
|
Read_symbols::do_group(Workqueue* workqueue)
|
|
|
|
{
|
|
|
|
Input_group* input_group = new Input_group();
|
|
|
|
|
2006-11-15 03:21:05 +08:00
|
|
|
const Input_file_group* group = this->input_argument_->group();
|
2006-11-04 02:26:11 +08:00
|
|
|
Task_token* this_blocker = this->this_blocker_;
|
2007-12-15 03:00:21 +08:00
|
|
|
|
2010-02-12 11:23:26 +08:00
|
|
|
Finish_group* finish_group = new Finish_group(this->input_objects_,
|
|
|
|
this->symtab_,
|
|
|
|
this->layout_,
|
|
|
|
this->mapfile_,
|
|
|
|
input_group,
|
|
|
|
this->next_blocker_);
|
|
|
|
|
|
|
|
Task_token* next_blocker = new Task_token(true);
|
|
|
|
next_blocker->add_blocker();
|
|
|
|
workqueue->queue_soon(new Start_group(this->symtab_, finish_group,
|
|
|
|
this_blocker, next_blocker));
|
|
|
|
this_blocker = next_blocker;
|
|
|
|
|
2006-11-04 02:26:11 +08:00
|
|
|
for (Input_file_group::const_iterator p = group->begin();
|
|
|
|
p != group->end();
|
|
|
|
++p)
|
|
|
|
{
|
2006-11-15 03:21:05 +08:00
|
|
|
const Input_argument* arg = &*p;
|
2006-11-30 01:56:40 +08:00
|
|
|
gold_assert(arg->is_file());
|
2006-11-04 02:26:11 +08:00
|
|
|
|
2010-02-12 11:23:26 +08:00
|
|
|
next_blocker = new Task_token(true);
|
2006-11-04 02:26:11 +08:00
|
|
|
next_blocker->add_blocker();
|
2009-03-14 05:30:06 +08:00
|
|
|
workqueue->queue_soon(new Read_symbols(this->input_objects_,
|
2008-02-29 03:46:06 +08:00
|
|
|
this->symtab_, this->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
|
|
|
this->dirpath_, this->dirindex_,
|
|
|
|
this->mapfile_, arg, input_group,
|
2010-03-22 22:18:24 +08:00
|
|
|
NULL, this_blocker, next_blocker));
|
2006-11-04 02:26:11 +08:00
|
|
|
this_blocker = next_blocker;
|
|
|
|
}
|
|
|
|
|
2010-02-12 11:23:26 +08:00
|
|
|
finish_group->set_blocker(this_blocker);
|
|
|
|
|
|
|
|
workqueue->queue_soon(finish_group);
|
2006-11-04 02:26:11 +08:00
|
|
|
}
|
|
|
|
|
2007-11-22 08:05:51 +08:00
|
|
|
// Return a debugging name for a Read_symbols task.
|
|
|
|
|
|
|
|
std::string
|
|
|
|
Read_symbols::get_name() const
|
|
|
|
{
|
2010-03-22 22:18:24 +08:00
|
|
|
if (this->input_argument_->is_group())
|
|
|
|
{
|
|
|
|
std::string ret("Read_symbols group (");
|
|
|
|
bool add_space = false;
|
|
|
|
const Input_file_group* group = this->input_argument_->group();
|
|
|
|
for (Input_file_group::const_iterator p = group->begin();
|
|
|
|
p != group->end();
|
|
|
|
++p)
|
|
|
|
{
|
|
|
|
if (add_space)
|
|
|
|
ret += ' ';
|
|
|
|
ret += p->file().name();
|
|
|
|
add_space = true;
|
|
|
|
}
|
|
|
|
return ret + ')';
|
|
|
|
}
|
|
|
|
else if (this->input_argument_->is_lib())
|
|
|
|
{
|
|
|
|
std::string ret("Read_symbols lib (");
|
|
|
|
bool add_space = false;
|
|
|
|
const Input_file_lib* lib = this->input_argument_->lib();
|
|
|
|
for (Input_file_lib::const_iterator p = lib->begin();
|
|
|
|
p != lib->end();
|
|
|
|
++p)
|
|
|
|
{
|
|
|
|
if (add_space)
|
|
|
|
ret += ' ';
|
|
|
|
ret += p->file().name();
|
|
|
|
add_space = true;
|
|
|
|
}
|
|
|
|
return ret + ')';
|
|
|
|
}
|
|
|
|
else
|
2007-11-22 08:05:51 +08:00
|
|
|
{
|
|
|
|
std::string ret("Read_symbols ");
|
|
|
|
if (this->input_argument_->file().is_lib())
|
|
|
|
ret += "-l";
|
2009-10-10 15:39:04 +08:00
|
|
|
else if (this->input_argument_->file().is_searched_file())
|
|
|
|
ret += "-l:";
|
2007-11-22 08:05:51 +08:00
|
|
|
ret += this->input_argument_->file().name();
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-08-05 07:10:59 +08:00
|
|
|
// Class Add_symbols.
|
|
|
|
|
|
|
|
Add_symbols::~Add_symbols()
|
|
|
|
{
|
|
|
|
if (this->this_blocker_ != NULL)
|
|
|
|
delete this->this_blocker_;
|
|
|
|
// next_blocker_ is deleted by the task associated with the next
|
|
|
|
// input file.
|
|
|
|
}
|
|
|
|
|
2006-09-22 06:13:18 +08:00
|
|
|
// We are blocked by this_blocker_. We block next_blocker_. We also
|
|
|
|
// lock the file.
|
2006-08-05 07:10:59 +08:00
|
|
|
|
2007-12-15 03:00:21 +08:00
|
|
|
Task_token*
|
|
|
|
Add_symbols::is_runnable()
|
2006-08-05 07:10:59 +08:00
|
|
|
{
|
|
|
|
if (this->this_blocker_ != NULL && this->this_blocker_->is_blocked())
|
2007-12-15 03:00:21 +08:00
|
|
|
return this->this_blocker_;
|
2006-09-22 06:13:18 +08:00
|
|
|
if (this->object_->is_locked())
|
2007-12-15 03:00:21 +08:00
|
|
|
return this->object_->token();
|
|
|
|
return NULL;
|
2006-08-05 07:10:59 +08:00
|
|
|
}
|
|
|
|
|
2007-12-15 03:00:21 +08:00
|
|
|
void
|
|
|
|
Add_symbols::locks(Task_locker* tl)
|
2006-08-05 07:10:59 +08:00
|
|
|
{
|
2007-12-15 03:00:21 +08:00
|
|
|
tl->add(this, this->next_blocker_);
|
|
|
|
tl->add(this, this->object_->token());
|
2006-08-05 07:10:59 +08:00
|
|
|
}
|
|
|
|
|
2006-11-04 02:26:11 +08:00
|
|
|
// Add the symbols in the object to the symbol table.
|
|
|
|
|
2006-08-05 07:10:59 +08:00
|
|
|
void
|
2009-10-01 06:21:13 +08:00
|
|
|
Add_symbols::run(Workqueue*)
|
2006-08-05 07:10:59 +08:00
|
|
|
{
|
2009-02-14 03:04:45 +08:00
|
|
|
Pluginobj* pluginobj = this->object_->pluginobj();
|
|
|
|
if (pluginobj != NULL)
|
|
|
|
{
|
|
|
|
this->object_->add_symbols(this->symtab_, this->sd_, this->layout_);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2009-10-01 06:21:13 +08:00
|
|
|
if (!this->input_objects_->add_object(this->object_))
|
* 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
|
|
|
{
|
2010-03-11 01:37:11 +08:00
|
|
|
delete this->sd_;
|
|
|
|
this->sd_ = NULL;
|
* 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
|
|
|
this->object_->release();
|
2006-12-06 14:28:56 +08:00
|
|
|
delete this->object_;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2010-08-13 06:01:11 +08:00
|
|
|
Incremental_inputs* incremental_inputs =
|
|
|
|
this->layout_->incremental_inputs();
|
|
|
|
if (incremental_inputs != NULL)
|
|
|
|
incremental_inputs->report_object(this->object_, NULL);
|
2007-09-21 15:20:01 +08:00
|
|
|
this->object_->layout(this->symtab_, this->layout_, this->sd_);
|
2009-02-14 03:04:45 +08:00
|
|
|
this->object_->add_symbols(this->symtab_, this->sd_, this->layout_);
|
2010-03-11 01:37:11 +08:00
|
|
|
delete this->sd_;
|
|
|
|
this->sd_ = NULL;
|
2007-12-15 03:00:21 +08:00
|
|
|
this->object_->release();
|
2006-12-06 14:28:56 +08:00
|
|
|
}
|
2006-08-05 07:10:59 +08:00
|
|
|
}
|
|
|
|
|
2011-01-25 05:48:40 +08:00
|
|
|
// Class Input_group.
|
|
|
|
|
|
|
|
// When we delete an Input_group we can delete the archive
|
|
|
|
// information.
|
|
|
|
|
|
|
|
Input_group::~Input_group()
|
|
|
|
{
|
|
|
|
for (Input_group::const_iterator p = this->begin();
|
|
|
|
p != this->end();
|
|
|
|
++p)
|
|
|
|
delete *p;
|
|
|
|
}
|
|
|
|
|
2010-02-12 11:23:26 +08:00
|
|
|
// Class Start_group.
|
|
|
|
|
|
|
|
Start_group::~Start_group()
|
|
|
|
{
|
|
|
|
if (this->this_blocker_ != NULL)
|
|
|
|
delete this->this_blocker_;
|
|
|
|
// next_blocker_ is deleted by the task associated with the first
|
|
|
|
// file in the group.
|
|
|
|
}
|
|
|
|
|
|
|
|
// We need to wait for THIS_BLOCKER_ and unblock NEXT_BLOCKER_.
|
|
|
|
|
|
|
|
Task_token*
|
|
|
|
Start_group::is_runnable()
|
|
|
|
{
|
|
|
|
if (this->this_blocker_ != NULL && this->this_blocker_->is_blocked())
|
|
|
|
return this->this_blocker_;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
Start_group::locks(Task_locker* tl)
|
|
|
|
{
|
|
|
|
tl->add(this, this->next_blocker_);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Store the number of undefined symbols we see now.
|
|
|
|
|
|
|
|
void
|
|
|
|
Start_group::run(Workqueue*)
|
|
|
|
{
|
|
|
|
this->finish_group_->set_saw_undefined(this->symtab_->saw_undefined());
|
|
|
|
}
|
|
|
|
|
2006-11-04 02:26:11 +08:00
|
|
|
// Class Finish_group.
|
|
|
|
|
|
|
|
Finish_group::~Finish_group()
|
|
|
|
{
|
|
|
|
if (this->this_blocker_ != NULL)
|
|
|
|
delete this->this_blocker_;
|
|
|
|
// next_blocker_ is deleted by the task associated with the next
|
|
|
|
// input file following the group.
|
|
|
|
}
|
|
|
|
|
|
|
|
// We need to wait for THIS_BLOCKER_ and unblock NEXT_BLOCKER_.
|
|
|
|
|
2007-12-15 03:00:21 +08:00
|
|
|
Task_token*
|
|
|
|
Finish_group::is_runnable()
|
2006-11-04 02:26:11 +08:00
|
|
|
{
|
|
|
|
if (this->this_blocker_ != NULL && this->this_blocker_->is_blocked())
|
2007-12-15 03:00:21 +08:00
|
|
|
return this->this_blocker_;
|
|
|
|
return NULL;
|
2006-11-04 02:26:11 +08:00
|
|
|
}
|
|
|
|
|
2007-12-15 03:00:21 +08:00
|
|
|
void
|
|
|
|
Finish_group::locks(Task_locker* tl)
|
2006-11-04 02:26:11 +08:00
|
|
|
{
|
2007-12-15 03:00:21 +08:00
|
|
|
tl->add(this, this->next_blocker_);
|
2006-11-04 02:26:11 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
// Loop over the archives until there are no new undefined symbols.
|
|
|
|
|
|
|
|
void
|
|
|
|
Finish_group::run(Workqueue*)
|
|
|
|
{
|
2010-02-12 11:23:26 +08:00
|
|
|
size_t saw_undefined = this->saw_undefined_;
|
2006-11-04 02:26:11 +08:00
|
|
|
while (saw_undefined != this->symtab_->saw_undefined())
|
|
|
|
{
|
|
|
|
saw_undefined = this->symtab_->saw_undefined();
|
|
|
|
|
|
|
|
for (Input_group::const_iterator p = this->input_group_->begin();
|
|
|
|
p != this->input_group_->end();
|
|
|
|
++p)
|
|
|
|
{
|
2007-12-15 03:00:21 +08:00
|
|
|
Task_lock_obj<Archive> tl(this, *p);
|
2006-11-04 02:26:11 +08:00
|
|
|
|
2007-09-21 15:20:01 +08:00
|
|
|
(*p)->add_symbols(this->symtab_, this->layout_,
|
2008-05-22 05:37:44 +08:00
|
|
|
this->input_objects_, this->mapfile_);
|
2006-11-04 02:26:11 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-01-25 05:48:40 +08:00
|
|
|
// Now that we're done with the archives, record the incremental
|
|
|
|
// layout information.
|
2006-11-04 02:26:11 +08:00
|
|
|
for (Input_group::const_iterator p = this->input_group_->begin();
|
|
|
|
p != this->input_group_->end();
|
|
|
|
++p)
|
2010-08-13 06:01:11 +08:00
|
|
|
{
|
|
|
|
// For an incremental link, finish recording the layout information.
|
|
|
|
Incremental_inputs* incremental_inputs =
|
|
|
|
this->layout_->incremental_inputs();
|
|
|
|
if (incremental_inputs != NULL)
|
|
|
|
incremental_inputs->report_archive_end(*p);
|
|
|
|
}
|
2011-01-25 05:48:40 +08:00
|
|
|
|
|
|
|
if (parameters->options().has_plugins())
|
|
|
|
parameters->options().plugins()->save_input_group(this->input_group_);
|
|
|
|
else
|
|
|
|
delete this->input_group_;
|
2006-11-04 02:26:11 +08:00
|
|
|
}
|
|
|
|
|
2008-02-29 03:46:06 +08:00
|
|
|
// Class Read_script
|
|
|
|
|
|
|
|
Read_script::~Read_script()
|
|
|
|
{
|
|
|
|
if (this->this_blocker_ != NULL)
|
|
|
|
delete this->this_blocker_;
|
|
|
|
// next_blocker_ is deleted by the task associated with the next
|
|
|
|
// input file.
|
|
|
|
}
|
|
|
|
|
|
|
|
// We are blocked by this_blocker_.
|
|
|
|
|
|
|
|
Task_token*
|
|
|
|
Read_script::is_runnable()
|
|
|
|
{
|
|
|
|
if (this->this_blocker_ != NULL && this->this_blocker_->is_blocked())
|
|
|
|
return this->this_blocker_;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
// We don't unlock next_blocker_ here. If the script names any input
|
|
|
|
// files, then the last file will be responsible for unlocking it.
|
|
|
|
|
|
|
|
void
|
|
|
|
Read_script::locks(Task_locker*)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
// Read the script, if it is a script.
|
|
|
|
|
|
|
|
void
|
|
|
|
Read_script::run(Workqueue* workqueue)
|
|
|
|
{
|
|
|
|
bool used_next_blocker;
|
2009-03-14 05:30:06 +08:00
|
|
|
if (!read_input_script(workqueue, this->symtab_, this->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
|
|
|
this->dirpath_, this->dirindex_, this->input_objects_,
|
2008-05-22 05:37:44 +08:00
|
|
|
this->mapfile_, this->input_group_,
|
|
|
|
this->input_argument_, this->input_file_,
|
|
|
|
this->next_blocker_, &used_next_blocker))
|
2008-02-29 03:46:06 +08:00
|
|
|
{
|
|
|
|
// Here we have to handle any other input file types we need.
|
|
|
|
gold_error(_("%s: not an object or archive"),
|
|
|
|
this->input_file_->file().filename().c_str());
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!used_next_blocker)
|
|
|
|
{
|
|
|
|
// Queue up a task to unlock next_blocker. We can't just unlock
|
|
|
|
// it here, as we don't hold the workqueue lock.
|
|
|
|
workqueue->queue_soon(new Unblock_token(NULL, this->next_blocker_));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Return a debugging name for a Read_script task.
|
|
|
|
|
|
|
|
std::string
|
|
|
|
Read_script::get_name() const
|
|
|
|
{
|
|
|
|
std::string ret("Read_script ");
|
|
|
|
if (this->input_argument_->file().is_lib())
|
|
|
|
ret += "-l";
|
2009-10-10 15:39:04 +08:00
|
|
|
else if (this->input_argument_->file().is_searched_file())
|
|
|
|
ret += "-l:";
|
2008-02-29 03:46:06 +08:00
|
|
|
ret += this->input_argument_->file().name();
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2006-08-05 07:10:59 +08:00
|
|
|
} // End namespace gold.
|