2006-09-29 19:58:17 +00:00
|
|
|
// archive.cc -- archive support for gold
|
|
|
|
|
2010-02-12 03:23:26 +00:00
|
|
|
// Copyright 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
|
2007-09-22 21:02:10 +00: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-09-29 19:58:17 +00:00
|
|
|
#include "gold.h"
|
|
|
|
|
|
|
|
#include <cerrno>
|
|
|
|
#include <cstring>
|
|
|
|
#include <climits>
|
|
|
|
#include <vector>
|
2008-04-01 20:57:36 +00:00
|
|
|
#include "libiberty.h"
|
|
|
|
#include "filenames.h"
|
2006-09-29 19:58:17 +00:00
|
|
|
|
|
|
|
#include "elfcpp.h"
|
2007-09-21 07:20:01 +00:00
|
|
|
#include "options.h"
|
2008-05-21 21:37:44 +00:00
|
|
|
#include "mapfile.h"
|
2006-09-29 19:58:17 +00:00
|
|
|
#include "fileread.h"
|
2006-11-03 18:26:11 +00:00
|
|
|
#include "readsyms.h"
|
2006-09-29 19:58:17 +00:00
|
|
|
#include "symtab.h"
|
|
|
|
#include "object.h"
|
2010-08-02 13:34:33 +00:00
|
|
|
#include "layout.h"
|
2006-09-29 19:58:17 +00:00
|
|
|
#include "archive.h"
|
2008-09-19 22:54:57 +00:00
|
|
|
#include "plugin.h"
|
2010-08-12 22:01:11 +00:00
|
|
|
#include "incremental.h"
|
2006-09-29 19:58:17 +00:00
|
|
|
|
|
|
|
namespace gold
|
|
|
|
{
|
|
|
|
|
|
|
|
// The header of an entry in the archive. This is all readable text,
|
|
|
|
// padded with spaces where necesary. If the contents of an archive
|
|
|
|
// are all text file, the entire archive is readable.
|
|
|
|
|
|
|
|
struct Archive::Archive_header
|
|
|
|
{
|
|
|
|
// The entry name.
|
|
|
|
char ar_name[16];
|
|
|
|
// The file modification time.
|
|
|
|
char ar_date[12];
|
|
|
|
// The user's UID in decimal.
|
|
|
|
char ar_uid[6];
|
|
|
|
// The user's GID in decimal.
|
|
|
|
char ar_gid[6];
|
|
|
|
// The file mode in octal.
|
|
|
|
char ar_mode[8];
|
|
|
|
// The file size in decimal.
|
|
|
|
char ar_size[10];
|
|
|
|
// The final magic code.
|
|
|
|
char ar_fmag[2];
|
|
|
|
};
|
|
|
|
|
2008-08-07 17:02:11 +00:00
|
|
|
// Class Archive static variables.
|
|
|
|
unsigned int Archive::total_archives;
|
|
|
|
unsigned int Archive::total_members;
|
|
|
|
unsigned int Archive::total_members_loaded;
|
|
|
|
|
2006-09-29 19:58:17 +00:00
|
|
|
// Archive methods.
|
|
|
|
|
|
|
|
const char Archive::armag[sarmag] =
|
|
|
|
{
|
|
|
|
'!', '<', 'a', 'r', 'c', 'h', '>', '\n'
|
|
|
|
};
|
|
|
|
|
2008-04-01 20:57:36 +00:00
|
|
|
const char Archive::armagt[sarmag] =
|
|
|
|
{
|
|
|
|
'!', '<', 't', 'h', 'i', 'n', '>', '\n'
|
|
|
|
};
|
|
|
|
|
2006-09-29 19:58:17 +00:00
|
|
|
const char Archive::arfmag[2] = { '`', '\n' };
|
|
|
|
|
2009-12-14 19:53:05 +00:00
|
|
|
Archive::Archive(const std::string& name, Input_file* input_file,
|
|
|
|
bool is_thin_archive, Dirsearch* dirpath, Task* task)
|
|
|
|
: name_(name), input_file_(input_file), armap_(), armap_names_(),
|
2009-05-19 22:14:17 +00:00
|
|
|
extended_names_(), armap_checked_(), seen_offsets_(), members_(),
|
2009-12-14 19:53:05 +00:00
|
|
|
is_thin_archive_(is_thin_archive), included_member_(false),
|
2010-08-12 22:01:11 +00:00
|
|
|
nested_archives_(), dirpath_(dirpath), task_(task), num_members_(0),
|
|
|
|
incremental_info_(NULL)
|
2009-05-19 22:14:17 +00:00
|
|
|
{
|
|
|
|
this->no_export_ =
|
2009-12-14 19:53:05 +00:00
|
|
|
parameters->options().check_excluded_libs(input_file->found_name());
|
2009-05-19 22:14:17 +00:00
|
|
|
}
|
|
|
|
|
2006-09-29 19:58:17 +00:00
|
|
|
// Set up the archive: read the symbol map and the extended name
|
|
|
|
// table.
|
|
|
|
|
|
|
|
void
|
* 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 05:56:46 +00:00
|
|
|
Archive::setup()
|
2006-09-29 19:58:17 +00:00
|
|
|
{
|
2007-11-16 18:44:20 +00:00
|
|
|
// We need to ignore empty archives.
|
|
|
|
if (this->input_file_->file().filesize() == sarmag)
|
2008-04-01 20:57:36 +00:00
|
|
|
return;
|
2007-11-16 18:44:20 +00:00
|
|
|
|
2006-09-29 19:58:17 +00:00
|
|
|
// The first member of the archive should be the symbol table.
|
|
|
|
std::string armap_name;
|
2007-12-18 00:48:04 +00:00
|
|
|
section_size_type armap_size =
|
2008-01-02 23:48:49 +00:00
|
|
|
convert_to_section_size_type(this->read_header(sarmag, false,
|
2008-04-01 20:57:36 +00:00
|
|
|
&armap_name, NULL));
|
2007-10-14 06:49:14 +00:00
|
|
|
off_t off = sarmag;
|
2007-08-21 23:37:56 +00:00
|
|
|
if (armap_name.empty())
|
|
|
|
{
|
|
|
|
this->read_armap(sarmag + sizeof(Archive_header), armap_size);
|
|
|
|
off = sarmag + sizeof(Archive_header) + armap_size;
|
|
|
|
}
|
2008-02-26 21:45:30 +00:00
|
|
|
else if (!this->input_file_->options().whole_archive())
|
2007-10-14 06:49:14 +00:00
|
|
|
gold_error(_("%s: no archive symbol table (run ranlib)"),
|
|
|
|
this->name().c_str());
|
2007-08-21 23:37:56 +00:00
|
|
|
|
2008-01-02 23:48:49 +00:00
|
|
|
// See if there is an extended name table. We cache these views
|
|
|
|
// because it is likely that we will want to read the following
|
|
|
|
// header in the add_symbols routine.
|
2007-08-21 23:37:56 +00:00
|
|
|
if ((off & 1) != 0)
|
|
|
|
++off;
|
|
|
|
std::string xname;
|
2008-01-02 23:48:49 +00:00
|
|
|
section_size_type extended_size =
|
2008-04-01 20:57:36 +00:00
|
|
|
convert_to_section_size_type(this->read_header(off, true, &xname, NULL));
|
2007-08-21 23:37:56 +00:00
|
|
|
if (xname == "/")
|
|
|
|
{
|
|
|
|
const unsigned char* p = this->get_view(off + sizeof(Archive_header),
|
2008-04-02 20:58:21 +00:00
|
|
|
extended_size, false, true);
|
2007-08-21 23:37:56 +00:00
|
|
|
const char* px = reinterpret_cast<const char*>(p);
|
|
|
|
this->extended_names_.assign(px, extended_size);
|
|
|
|
}
|
2008-08-07 17:02:11 +00:00
|
|
|
bool preread_syms = (parameters->options().threads()
|
|
|
|
&& parameters->options().preread_archive_symbols());
|
|
|
|
#ifndef ENABLE_THREADS
|
|
|
|
preread_syms = false;
|
2008-09-19 22:54:57 +00:00
|
|
|
#else
|
|
|
|
if (parameters->options().has_plugins())
|
|
|
|
preread_syms = false;
|
2008-08-07 17:02:11 +00:00
|
|
|
#endif
|
|
|
|
if (preread_syms)
|
* 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 05:56:46 +00:00
|
|
|
this->read_all_symbols();
|
2008-04-01 20:57:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Unlock any nested archives.
|
2007-08-21 23:37:56 +00:00
|
|
|
|
2008-04-01 20:57:36 +00:00
|
|
|
void
|
|
|
|
Archive::unlock_nested_archives()
|
|
|
|
{
|
|
|
|
for (Nested_archive_table::iterator p = this->nested_archives_.begin();
|
|
|
|
p != this->nested_archives_.end();
|
|
|
|
++p)
|
|
|
|
{
|
|
|
|
p->second->unlock(this->task_);
|
|
|
|
}
|
2007-08-21 23:37:56 +00:00
|
|
|
}
|
2006-09-29 19:58:17 +00:00
|
|
|
|
2007-08-21 23:37:56 +00:00
|
|
|
// Read the archive symbol map.
|
|
|
|
|
|
|
|
void
|
2007-12-18 00:48:04 +00:00
|
|
|
Archive::read_armap(off_t start, section_size_type size)
|
2007-08-21 23:37:56 +00:00
|
|
|
{
|
2008-08-07 17:02:11 +00:00
|
|
|
// To count the total number of archive members, we'll just count
|
|
|
|
// the number of times the file offset changes. Since most archives
|
|
|
|
// group the symbols in the armap by object, this ought to give us
|
|
|
|
// an accurate count.
|
|
|
|
off_t last_seen_offset = -1;
|
|
|
|
|
2006-09-29 19:58:17 +00:00
|
|
|
// Read in the entire armap.
|
2008-04-02 20:58:21 +00:00
|
|
|
const unsigned char* p = this->get_view(start, size, true, false);
|
2006-09-29 19:58:17 +00:00
|
|
|
|
|
|
|
// Numbers in the armap are always big-endian.
|
|
|
|
const elfcpp::Elf_Word* pword = reinterpret_cast<const elfcpp::Elf_Word*>(p);
|
2006-11-06 22:46:08 +00:00
|
|
|
unsigned int nsyms = elfcpp::Swap<32, true>::readval(pword);
|
2006-09-29 19:58:17 +00:00
|
|
|
++pword;
|
|
|
|
|
|
|
|
// Note that the addition is in units of sizeof(elfcpp::Elf_Word).
|
|
|
|
const char* pnames = reinterpret_cast<const char*>(pword + nsyms);
|
2007-12-18 00:48:04 +00:00
|
|
|
section_size_type names_size =
|
|
|
|
reinterpret_cast<const char*>(p) + size - pnames;
|
2007-09-25 17:50:26 +00:00
|
|
|
this->armap_names_.assign(pnames, names_size);
|
2006-09-29 19:58:17 +00:00
|
|
|
|
|
|
|
this->armap_.resize(nsyms);
|
|
|
|
|
2007-12-18 00:48:04 +00:00
|
|
|
section_offset_type name_offset = 0;
|
2006-09-29 19:58:17 +00:00
|
|
|
for (unsigned int i = 0; i < nsyms; ++i)
|
|
|
|
{
|
2007-09-25 17:50:26 +00:00
|
|
|
this->armap_[i].name_offset = name_offset;
|
|
|
|
this->armap_[i].file_offset = elfcpp::Swap<32, true>::readval(pword);
|
|
|
|
name_offset += strlen(pnames + name_offset) + 1;
|
2006-09-29 19:58:17 +00:00
|
|
|
++pword;
|
2008-08-07 17:02:11 +00:00
|
|
|
if (this->armap_[i].file_offset != last_seen_offset)
|
|
|
|
{
|
|
|
|
last_seen_offset = this->armap_[i].file_offset;
|
|
|
|
++this->num_members_;
|
|
|
|
}
|
2006-09-29 19:58:17 +00:00
|
|
|
}
|
|
|
|
|
2007-12-18 00:48:04 +00:00
|
|
|
if (static_cast<section_size_type>(name_offset) > names_size)
|
2007-10-14 06:49:14 +00:00
|
|
|
gold_error(_("%s: bad archive symbol table names"),
|
|
|
|
this->name().c_str());
|
2007-09-20 05:56:14 +00:00
|
|
|
|
|
|
|
// This array keeps track of which symbols are for archive elements
|
|
|
|
// which we have already included in the link.
|
|
|
|
this->armap_checked_.resize(nsyms);
|
2006-09-29 19:58:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Read the header of an archive member at OFF. Fail if something
|
|
|
|
// goes wrong. Return the size of the member. Set *PNAME to the name
|
|
|
|
// of the member.
|
|
|
|
|
|
|
|
off_t
|
2008-04-01 20:57:36 +00:00
|
|
|
Archive::read_header(off_t off, bool cache, std::string* pname,
|
|
|
|
off_t* nested_off)
|
2006-09-29 19:58:17 +00:00
|
|
|
{
|
2008-04-02 20:58:21 +00:00
|
|
|
const unsigned char* p = this->get_view(off, sizeof(Archive_header), true,
|
|
|
|
cache);
|
2006-09-29 19:58:17 +00:00
|
|
|
const Archive_header* hdr = reinterpret_cast<const Archive_header*>(p);
|
2008-04-01 20:57:36 +00:00
|
|
|
return this->interpret_header(hdr, off, pname, nested_off);
|
2007-08-21 23:37:56 +00:00
|
|
|
}
|
2006-09-29 19:58:17 +00:00
|
|
|
|
2007-08-21 23:37:56 +00:00
|
|
|
// Interpret the header of HDR, the header of the archive member at
|
|
|
|
// file offset OFF. Fail if something goes wrong. Return the size of
|
|
|
|
// the member. Set *PNAME to the name of the member.
|
|
|
|
|
|
|
|
off_t
|
|
|
|
Archive::interpret_header(const Archive_header* hdr, off_t off,
|
2008-07-22 22:08:43 +00:00
|
|
|
std::string* pname, off_t* nested_off) const
|
2007-08-21 23:37:56 +00:00
|
|
|
{
|
2006-09-29 19:58:17 +00:00
|
|
|
if (memcmp(hdr->ar_fmag, arfmag, sizeof arfmag) != 0)
|
|
|
|
{
|
2007-10-14 06:49:14 +00:00
|
|
|
gold_error(_("%s: malformed archive header at %zu"),
|
|
|
|
this->name().c_str(), static_cast<size_t>(off));
|
|
|
|
return this->input_file_->file().filesize() - off;
|
2006-09-29 19:58:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
const int size_string_size = sizeof hdr->ar_size;
|
|
|
|
char size_string[size_string_size + 1];
|
|
|
|
memcpy(size_string, hdr->ar_size, size_string_size);
|
|
|
|
char* ps = size_string + size_string_size;
|
|
|
|
while (ps[-1] == ' ')
|
|
|
|
--ps;
|
|
|
|
*ps = '\0';
|
|
|
|
|
|
|
|
errno = 0;
|
2009-12-14 19:53:05 +00:00
|
|
|
char* end;
|
|
|
|
off_t member_size = strtol(size_string, &end, 10);
|
|
|
|
if (*end != '\0'
|
2006-09-29 19:58:17 +00:00
|
|
|
|| member_size < 0
|
|
|
|
|| (member_size == LONG_MAX && errno == ERANGE))
|
|
|
|
{
|
2007-10-14 06:49:14 +00:00
|
|
|
gold_error(_("%s: malformed archive header size at %zu"),
|
|
|
|
this->name().c_str(), static_cast<size_t>(off));
|
|
|
|
return this->input_file_->file().filesize() - off;
|
2006-09-29 19:58:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (hdr->ar_name[0] != '/')
|
|
|
|
{
|
|
|
|
const char* name_end = strchr(hdr->ar_name, '/');
|
|
|
|
if (name_end == NULL
|
|
|
|
|| name_end - hdr->ar_name >= static_cast<int>(sizeof hdr->ar_name))
|
|
|
|
{
|
2007-10-14 06:57:58 +00:00
|
|
|
gold_error(_("%s: malformed archive header name at %zu"),
|
2007-10-14 06:49:14 +00:00
|
|
|
this->name().c_str(), static_cast<size_t>(off));
|
|
|
|
return this->input_file_->file().filesize() - off;
|
2006-09-29 19:58:17 +00:00
|
|
|
}
|
|
|
|
pname->assign(hdr->ar_name, name_end - hdr->ar_name);
|
2008-04-01 20:57:36 +00:00
|
|
|
if (nested_off != NULL)
|
|
|
|
*nested_off = 0;
|
2006-09-29 19:58:17 +00:00
|
|
|
}
|
|
|
|
else if (hdr->ar_name[1] == ' ')
|
|
|
|
{
|
|
|
|
// This is the symbol table.
|
2010-02-12 03:23:26 +00:00
|
|
|
if (!pname->empty())
|
|
|
|
pname->clear();
|
2006-09-29 19:58:17 +00:00
|
|
|
}
|
|
|
|
else if (hdr->ar_name[1] == '/')
|
|
|
|
{
|
|
|
|
// This is the extended name table.
|
|
|
|
pname->assign(1, '/');
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
errno = 0;
|
2009-12-14 19:53:05 +00:00
|
|
|
long x = strtol(hdr->ar_name + 1, &end, 10);
|
2008-04-01 20:57:36 +00:00
|
|
|
long y = 0;
|
2009-12-14 19:53:05 +00:00
|
|
|
if (*end == ':')
|
|
|
|
y = strtol(end + 1, &end, 10);
|
|
|
|
if (*end != ' '
|
2006-09-29 19:58:17 +00:00
|
|
|
|| x < 0
|
|
|
|
|| (x == LONG_MAX && errno == ERANGE)
|
|
|
|
|| static_cast<size_t>(x) >= this->extended_names_.size())
|
|
|
|
{
|
2007-10-14 06:49:14 +00:00
|
|
|
gold_error(_("%s: bad extended name index at %zu"),
|
|
|
|
this->name().c_str(), static_cast<size_t>(off));
|
|
|
|
return this->input_file_->file().filesize() - off;
|
2006-09-29 19:58:17 +00:00
|
|
|
}
|
|
|
|
|
2009-12-14 19:53:05 +00:00
|
|
|
const char* name = this->extended_names_.data() + x;
|
|
|
|
const char* name_end = strchr(name, '\n');
|
|
|
|
if (static_cast<size_t>(name_end - name) > this->extended_names_.size()
|
2008-04-01 20:57:36 +00:00
|
|
|
|| name_end[-1] != '/')
|
2006-09-29 19:58:17 +00:00
|
|
|
{
|
2007-10-14 06:49:14 +00:00
|
|
|
gold_error(_("%s: bad extended name entry at header %zu"),
|
|
|
|
this->name().c_str(), static_cast<size_t>(off));
|
|
|
|
return this->input_file_->file().filesize() - off;
|
2006-09-29 19:58:17 +00:00
|
|
|
}
|
2009-12-14 19:53:05 +00:00
|
|
|
pname->assign(name, name_end - 1 - name);
|
2008-04-01 20:57:36 +00:00
|
|
|
if (nested_off != NULL)
|
|
|
|
*nested_off = y;
|
2006-09-29 19:58:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return member_size;
|
|
|
|
}
|
|
|
|
|
2008-07-22 22:08:43 +00:00
|
|
|
// An archive member iterator.
|
|
|
|
|
|
|
|
class Archive::const_iterator
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
// The header of an archive member. This is what this iterator
|
|
|
|
// points to.
|
|
|
|
struct Header
|
|
|
|
{
|
|
|
|
// The name of the member.
|
|
|
|
std::string name;
|
|
|
|
// The file offset of the member.
|
|
|
|
off_t off;
|
|
|
|
// The file offset of a nested archive member.
|
|
|
|
off_t nested_off;
|
|
|
|
// The size of the member.
|
|
|
|
off_t size;
|
|
|
|
};
|
|
|
|
|
2008-07-25 04:25:49 +00:00
|
|
|
const_iterator(Archive* archive, off_t off)
|
2008-07-22 22:08:43 +00:00
|
|
|
: archive_(archive), off_(off)
|
|
|
|
{ this->read_next_header(); }
|
|
|
|
|
|
|
|
const Header&
|
|
|
|
operator*() const
|
|
|
|
{ return this->header_; }
|
|
|
|
|
|
|
|
const Header*
|
|
|
|
operator->() const
|
|
|
|
{ return &this->header_; }
|
|
|
|
|
|
|
|
const_iterator&
|
|
|
|
operator++()
|
|
|
|
{
|
|
|
|
if (this->off_ == this->archive_->file().filesize())
|
|
|
|
return *this;
|
|
|
|
this->off_ += sizeof(Archive_header);
|
|
|
|
if (!this->archive_->is_thin_archive())
|
|
|
|
this->off_ += this->header_.size;
|
|
|
|
if ((this->off_ & 1) != 0)
|
|
|
|
++this->off_;
|
|
|
|
this->read_next_header();
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
|
|
|
const_iterator
|
|
|
|
operator++(int)
|
|
|
|
{
|
|
|
|
const_iterator ret = *this;
|
|
|
|
++*this;
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool
|
|
|
|
operator==(const const_iterator p) const
|
|
|
|
{ return this->off_ == p->off; }
|
|
|
|
|
|
|
|
bool
|
|
|
|
operator!=(const const_iterator p) const
|
|
|
|
{ return this->off_ != p->off; }
|
|
|
|
|
|
|
|
private:
|
|
|
|
void
|
|
|
|
read_next_header();
|
|
|
|
|
|
|
|
// The underlying archive.
|
2008-07-25 04:25:49 +00:00
|
|
|
Archive* archive_;
|
2008-07-22 22:08:43 +00:00
|
|
|
// The current offset in the file.
|
|
|
|
off_t off_;
|
|
|
|
// The current archive header.
|
|
|
|
Header header_;
|
|
|
|
};
|
|
|
|
|
|
|
|
// Read the next archive header.
|
2007-08-21 23:37:56 +00:00
|
|
|
|
|
|
|
void
|
2008-07-22 22:08:43 +00:00
|
|
|
Archive::const_iterator::read_next_header()
|
2007-08-21 23:37:56 +00:00
|
|
|
{
|
2008-07-22 22:08:43 +00:00
|
|
|
off_t filesize = this->archive_->file().filesize();
|
2007-08-21 23:37:56 +00:00
|
|
|
while (true)
|
|
|
|
{
|
2008-07-22 22:08:43 +00:00
|
|
|
if (filesize - this->off_ < static_cast<off_t>(sizeof(Archive_header)))
|
|
|
|
{
|
|
|
|
if (filesize != this->off_)
|
|
|
|
{
|
|
|
|
gold_error(_("%s: short archive header at %zu"),
|
|
|
|
this->archive_->filename().c_str(),
|
|
|
|
static_cast<size_t>(this->off_));
|
|
|
|
this->off_ = filesize;
|
|
|
|
}
|
|
|
|
this->header_.off = filesize;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
unsigned char buf[sizeof(Archive_header)];
|
|
|
|
this->archive_->file().read(this->off_, sizeof(Archive_header), buf);
|
|
|
|
|
|
|
|
const Archive_header* hdr = reinterpret_cast<const Archive_header*>(buf);
|
|
|
|
this->header_.size =
|
|
|
|
this->archive_->interpret_header(hdr, this->off_, &this->header_.name,
|
|
|
|
&this->header_.nested_off);
|
|
|
|
this->header_.off = this->off_;
|
|
|
|
|
|
|
|
// Skip special members.
|
|
|
|
if (!this->header_.name.empty() && this->header_.name != "/")
|
|
|
|
return;
|
|
|
|
|
|
|
|
this->off_ += sizeof(Archive_header) + this->header_.size;
|
|
|
|
if ((this->off_ & 1) != 0)
|
|
|
|
++this->off_;
|
2007-08-21 23:37:56 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-07-22 22:08:43 +00:00
|
|
|
// Initial iterator.
|
|
|
|
|
|
|
|
Archive::const_iterator
|
2008-07-25 04:25:49 +00:00
|
|
|
Archive::begin()
|
2008-07-22 22:08:43 +00:00
|
|
|
{
|
|
|
|
return Archive::const_iterator(this, sarmag);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Final iterator.
|
|
|
|
|
|
|
|
Archive::const_iterator
|
2008-07-25 04:25:49 +00:00
|
|
|
Archive::end()
|
2008-07-22 22:08:43 +00:00
|
|
|
{
|
|
|
|
return Archive::const_iterator(this, this->input_file_->file().filesize());
|
|
|
|
}
|
|
|
|
|
2008-08-07 17:02:11 +00:00
|
|
|
// Get the file and offset for an archive member, which may be an
|
|
|
|
// external member of a thin archive. Set *INPUT_FILE to the
|
|
|
|
// file containing the actual member, *MEMOFF to the offset
|
|
|
|
// within that file (0 if not a nested archive), and *MEMBER_NAME
|
|
|
|
// to the name of the archive member. Return TRUE on success.
|
|
|
|
|
|
|
|
bool
|
2009-12-14 19:53:05 +00:00
|
|
|
Archive::get_file_and_offset(off_t off, Input_file** input_file, off_t* memoff,
|
2008-09-19 22:54:57 +00:00
|
|
|
off_t* memsize, std::string* member_name)
|
2008-08-07 17:02:11 +00:00
|
|
|
{
|
|
|
|
off_t nested_off;
|
|
|
|
|
2008-09-19 22:54:57 +00:00
|
|
|
*memsize = this->read_header(off, false, member_name, &nested_off);
|
2008-08-07 17:02:11 +00:00
|
|
|
|
2009-12-14 19:53:05 +00:00
|
|
|
*input_file = this->input_file_;
|
2008-08-07 17:02:11 +00:00
|
|
|
*memoff = off + static_cast<off_t>(sizeof(Archive_header));
|
|
|
|
|
|
|
|
if (!this->is_thin_archive_)
|
|
|
|
return true;
|
|
|
|
|
|
|
|
// Adjust a relative pathname so that it is relative
|
|
|
|
// to the directory containing the archive.
|
|
|
|
if (!IS_ABSOLUTE_PATH(member_name->c_str()))
|
|
|
|
{
|
2008-09-29 21:23:02 +00:00
|
|
|
const char* arch_path = this->filename().c_str();
|
2008-08-07 17:02:11 +00:00
|
|
|
const char* basename = lbasename(arch_path);
|
|
|
|
if (basename > arch_path)
|
|
|
|
member_name->replace(0, 0,
|
2008-09-29 21:23:02 +00:00
|
|
|
this->filename().substr(0, basename - arch_path));
|
2008-08-07 17:02:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (nested_off > 0)
|
|
|
|
{
|
|
|
|
// This is a member of a nested archive. Open the containing
|
|
|
|
// archive if we don't already have it open, then do a recursive
|
|
|
|
// call to include the member from that archive.
|
|
|
|
Archive* arch;
|
|
|
|
Nested_archive_table::const_iterator p =
|
|
|
|
this->nested_archives_.find(*member_name);
|
|
|
|
if (p != this->nested_archives_.end())
|
|
|
|
arch = p->second;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
Input_file_argument* input_file_arg =
|
2009-10-10 07:39:04 +00:00
|
|
|
new Input_file_argument(member_name->c_str(),
|
|
|
|
Input_file_argument::INPUT_FILE_TYPE_FILE,
|
|
|
|
"", false, parameters->options());
|
2009-12-14 19:53:05 +00:00
|
|
|
*input_file = new Input_file(input_file_arg);
|
* 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 05:56:46 +00:00
|
|
|
int dummy = 0;
|
2009-12-14 19:53:05 +00:00
|
|
|
if (!(*input_file)->open(*this->dirpath_, this->task_, &dummy))
|
2008-08-07 17:02:11 +00:00
|
|
|
return false;
|
2009-12-14 19:53:05 +00:00
|
|
|
arch = new Archive(*member_name, *input_file, false, this->dirpath_,
|
2008-08-07 17:02:11 +00:00
|
|
|
this->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 05:56:46 +00:00
|
|
|
arch->setup();
|
2008-08-07 17:02:11 +00:00
|
|
|
std::pair<Nested_archive_table::iterator, bool> ins =
|
|
|
|
this->nested_archives_.insert(std::make_pair(*member_name, arch));
|
|
|
|
gold_assert(ins.second);
|
|
|
|
}
|
2009-12-14 19:53:05 +00:00
|
|
|
return arch->get_file_and_offset(nested_off, input_file, memoff,
|
* 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 05:56:46 +00:00
|
|
|
memsize, member_name);
|
2008-08-07 17:02:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// This is an external member of a thin archive. Open the
|
|
|
|
// file as a regular relocatable object file.
|
|
|
|
Input_file_argument* input_file_arg =
|
2009-10-10 07:39:04 +00:00
|
|
|
new Input_file_argument(member_name->c_str(),
|
|
|
|
Input_file_argument::INPUT_FILE_TYPE_FILE,
|
|
|
|
"", false, this->input_file_->options());
|
2009-12-14 19:53:05 +00:00
|
|
|
*input_file = new Input_file(input_file_arg);
|
* 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 05:56:46 +00:00
|
|
|
int dummy = 0;
|
2009-12-14 19:53:05 +00:00
|
|
|
if (!(*input_file)->open(*this->dirpath_, this->task_, &dummy))
|
2008-08-07 17:02:11 +00:00
|
|
|
return false;
|
|
|
|
|
|
|
|
*memoff = 0;
|
2009-12-14 19:53:05 +00:00
|
|
|
*memsize = (*input_file)->file().filesize();
|
2008-08-07 17:02:11 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
* 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 05:56:46 +00:00
|
|
|
// Return an ELF object for the member at offset OFF. If the ELF
|
|
|
|
// object has an unsupported target type, set *PUNCONFIGURED to true
|
|
|
|
// and return NULL.
|
2008-08-07 17:02:11 +00:00
|
|
|
|
|
|
|
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 05:56:46 +00:00
|
|
|
Archive::get_elf_object_for_member(off_t off, bool* punconfigured)
|
2008-08-07 17:02:11 +00:00
|
|
|
{
|
* 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 05:56:46 +00:00
|
|
|
*punconfigured = false;
|
|
|
|
|
2009-12-14 19:53:05 +00:00
|
|
|
Input_file* input_file;
|
2008-08-07 17:02:11 +00:00
|
|
|
off_t memoff;
|
2008-09-19 22:54:57 +00:00
|
|
|
off_t memsize;
|
* 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 05:56:46 +00:00
|
|
|
std::string member_name;
|
2009-12-14 19:53:05 +00:00
|
|
|
if (!this->get_file_and_offset(off, &input_file, &memoff, &memsize,
|
* 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 05:56:46 +00:00
|
|
|
&member_name))
|
2008-08-07 17:02:11 +00:00
|
|
|
return NULL;
|
|
|
|
|
2008-09-19 22:54:57 +00:00
|
|
|
if (parameters->options().has_plugins())
|
|
|
|
{
|
2009-12-14 19:53:05 +00:00
|
|
|
Object* obj = parameters->options().plugins()->claim_file(input_file,
|
2008-09-19 22:54:57 +00:00
|
|
|
memoff,
|
|
|
|
memsize);
|
|
|
|
if (obj != NULL)
|
|
|
|
{
|
|
|
|
// The input file was claimed by a plugin, and its symbols
|
|
|
|
// have been provided by the plugin.
|
|
|
|
return obj;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-03-24 18:42:10 +00:00
|
|
|
const unsigned char* ehdr;
|
|
|
|
int read_size;
|
2009-12-14 19:53:05 +00:00
|
|
|
if (!is_elf_object(input_file, memoff, &ehdr, &read_size))
|
2008-08-07 17:02:11 +00:00
|
|
|
{
|
|
|
|
gold_error(_("%s: member at %zu is not an ELF object"),
|
|
|
|
this->name().c_str(), static_cast<size_t>(off));
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2010-08-25 08:36:54 +00:00
|
|
|
Object* obj = make_elf_object((std::string(this->input_file_->filename())
|
2009-05-19 22:14:17 +00:00
|
|
|
+ "(" + member_name + ")"),
|
2009-12-14 19:53:05 +00:00
|
|
|
input_file, memoff, ehdr, read_size,
|
2009-05-19 22:14:17 +00:00
|
|
|
punconfigured);
|
2009-09-30 22:21:13 +00:00
|
|
|
if (obj == NULL)
|
|
|
|
return NULL;
|
2009-05-19 22:14:17 +00:00
|
|
|
obj->set_no_export(this->no_export());
|
|
|
|
return obj;
|
2008-08-07 17:02:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Read the symbols from all the archive members in the link.
|
|
|
|
|
|
|
|
void
|
* 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 05:56:46 +00:00
|
|
|
Archive::read_all_symbols()
|
2008-08-07 17:02:11 +00:00
|
|
|
{
|
|
|
|
for (Archive::const_iterator p = this->begin();
|
|
|
|
p != this->end();
|
|
|
|
++p)
|
* 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 05:56:46 +00:00
|
|
|
this->read_symbols(p->off);
|
2008-08-07 17:02:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Read the symbols from an archive member in the link. OFF is the file
|
|
|
|
// offset of the member header.
|
|
|
|
|
|
|
|
void
|
* 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 05:56:46 +00:00
|
|
|
Archive::read_symbols(off_t off)
|
2008-08-07 17:02:11 +00:00
|
|
|
{
|
* 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 05:56:46 +00:00
|
|
|
bool dummy;
|
|
|
|
Object* obj = this->get_elf_object_for_member(off, &dummy);
|
2008-08-07 17:02:11 +00:00
|
|
|
|
|
|
|
if (obj == NULL)
|
|
|
|
return;
|
|
|
|
|
|
|
|
Read_symbols_data* sd = new Read_symbols_data;
|
|
|
|
obj->read_symbols(sd);
|
|
|
|
Archive_member member(obj, sd);
|
|
|
|
this->members_[off] = member;
|
|
|
|
}
|
|
|
|
|
2010-03-22 14:18:24 +00:00
|
|
|
Archive::Should_include
|
2010-08-02 13:34:33 +00:00
|
|
|
Archive::should_include_member(Symbol_table* symtab, Layout* layout,
|
|
|
|
const char* sym_name, Symbol** symp,
|
|
|
|
std::string* why, char** tmpbufp,
|
2010-03-22 14:18:24 +00:00
|
|
|
size_t* tmpbuflen)
|
2010-03-09 19:17:14 +00:00
|
|
|
{
|
|
|
|
// In an object file, and therefore in an archive map, an
|
|
|
|
// '@' in the name separates the symbol name from the
|
|
|
|
// version name. If there are two '@' characters, this is
|
|
|
|
// the default version.
|
|
|
|
char* tmpbuf = *tmpbufp;
|
|
|
|
const char* ver = strchr(sym_name, '@');
|
|
|
|
bool def = false;
|
|
|
|
if (ver != NULL)
|
|
|
|
{
|
|
|
|
size_t symlen = ver - sym_name;
|
|
|
|
if (symlen + 1 > *tmpbuflen)
|
|
|
|
{
|
|
|
|
tmpbuf = static_cast<char*>(xrealloc(tmpbuf, symlen + 1));
|
|
|
|
*tmpbufp = tmpbuf;
|
|
|
|
*tmpbuflen = symlen + 1;
|
|
|
|
}
|
|
|
|
memcpy(tmpbuf, sym_name, symlen);
|
|
|
|
tmpbuf[symlen] = '\0';
|
|
|
|
sym_name = tmpbuf;
|
|
|
|
|
|
|
|
++ver;
|
|
|
|
if (*ver == '@')
|
|
|
|
{
|
|
|
|
++ver;
|
|
|
|
def = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
Symbol* sym = symtab->lookup(sym_name, ver);
|
|
|
|
if (def
|
|
|
|
&& ver != NULL
|
|
|
|
&& (sym == NULL
|
|
|
|
|| !sym->is_undefined()
|
|
|
|
|| sym->binding() == elfcpp::STB_WEAK))
|
|
|
|
sym = symtab->lookup(sym_name, NULL);
|
|
|
|
|
|
|
|
*symp = sym;
|
|
|
|
|
|
|
|
if (sym == NULL)
|
|
|
|
{
|
|
|
|
// Check whether the symbol was named in a -u option.
|
2010-08-02 13:34:33 +00:00
|
|
|
if (parameters->options().is_undefined(sym_name))
|
2010-03-09 19:17:14 +00:00
|
|
|
{
|
|
|
|
*why = "-u ";
|
|
|
|
*why += sym_name;
|
|
|
|
}
|
2010-08-02 13:34:33 +00:00
|
|
|
else if (layout->script_options()->is_referenced(sym_name))
|
|
|
|
{
|
|
|
|
size_t alc = 100 + strlen(sym_name);
|
|
|
|
char* buf = new char[alc];
|
|
|
|
snprintf(buf, alc, _("script or expression reference to %s"),
|
|
|
|
sym_name);
|
|
|
|
*why = buf;
|
|
|
|
delete[] buf;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
return Archive::SHOULD_INCLUDE_UNKNOWN;
|
2010-03-09 19:17:14 +00:00
|
|
|
}
|
|
|
|
else if (!sym->is_undefined())
|
2010-03-22 14:18:24 +00:00
|
|
|
return Archive::SHOULD_INCLUDE_NO;
|
2010-03-09 19:17:14 +00:00
|
|
|
else if (sym->binding() == elfcpp::STB_WEAK)
|
2010-03-22 14:18:24 +00:00
|
|
|
return Archive::SHOULD_INCLUDE_UNKNOWN;
|
2010-03-09 19:17:14 +00:00
|
|
|
|
2010-03-22 14:18:24 +00:00
|
|
|
return Archive::SHOULD_INCLUDE_YES;
|
2010-03-09 19:17:14 +00:00
|
|
|
}
|
|
|
|
|
2008-08-07 17:02:11 +00:00
|
|
|
// Select members from the archive and add them to the link. We walk
|
|
|
|
// through the elements in the archive map, and look each one up in
|
|
|
|
// the symbol table. If it exists as a strong undefined symbol, we
|
|
|
|
// pull in the corresponding element. We have to do this in a loop,
|
|
|
|
// since pulling in one element may create new undefined symbols which
|
* 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 05:56:46 +00:00
|
|
|
// may be satisfied by other objects in the archive. Return true in
|
|
|
|
// the normal case, false if the first member we tried to add from
|
|
|
|
// this archive had an incompatible target.
|
2008-08-07 17:02:11 +00:00
|
|
|
|
* 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 05:56:46 +00:00
|
|
|
bool
|
2008-08-07 17:02:11 +00:00
|
|
|
Archive::add_symbols(Symbol_table* symtab, Layout* layout,
|
|
|
|
Input_objects* input_objects, Mapfile* mapfile)
|
|
|
|
{
|
|
|
|
++Archive::total_archives;
|
|
|
|
|
|
|
|
if (this->input_file_->options().whole_archive())
|
|
|
|
return this->include_all_members(symtab, layout, input_objects,
|
|
|
|
mapfile);
|
|
|
|
|
|
|
|
Archive::total_members += this->num_members_;
|
|
|
|
|
|
|
|
input_objects->archive_start(this);
|
|
|
|
|
|
|
|
const size_t armap_size = this->armap_.size();
|
|
|
|
|
|
|
|
// This is a quick optimization, since we usually see many symbols
|
|
|
|
// in a row with the same offset. last_seen_offset holds the last
|
|
|
|
// offset we saw that was present in the seen_offsets_ set.
|
|
|
|
off_t last_seen_offset = -1;
|
|
|
|
|
|
|
|
// Track which symbols in the symbol table we've already found to be
|
|
|
|
// defined.
|
|
|
|
|
2009-03-18 05:09:52 +00:00
|
|
|
char* tmpbuf = NULL;
|
|
|
|
size_t tmpbuflen = 0;
|
2008-08-07 17:02:11 +00:00
|
|
|
bool added_new_object;
|
|
|
|
do
|
|
|
|
{
|
|
|
|
added_new_object = false;
|
|
|
|
for (size_t i = 0; i < armap_size; ++i)
|
|
|
|
{
|
|
|
|
if (this->armap_checked_[i])
|
|
|
|
continue;
|
|
|
|
if (this->armap_[i].file_offset == last_seen_offset)
|
|
|
|
{
|
|
|
|
this->armap_checked_[i] = true;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (this->seen_offsets_.find(this->armap_[i].file_offset)
|
|
|
|
!= this->seen_offsets_.end())
|
|
|
|
{
|
|
|
|
this->armap_checked_[i] = true;
|
|
|
|
last_seen_offset = this->armap_[i].file_offset;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
const char* sym_name = (this->armap_names_.data()
|
|
|
|
+ this->armap_[i].name_offset);
|
2009-03-18 05:09:52 +00:00
|
|
|
|
2010-03-09 19:17:14 +00:00
|
|
|
Symbol* sym;
|
|
|
|
std::string why;
|
2010-03-22 14:18:24 +00:00
|
|
|
Archive::Should_include t =
|
2010-08-02 13:34:33 +00:00
|
|
|
Archive::should_include_member(symtab, layout, sym_name, &sym,
|
|
|
|
&why, &tmpbuf, &tmpbuflen);
|
2009-03-18 05:09:52 +00:00
|
|
|
|
2010-03-22 14:18:24 +00:00
|
|
|
if (t == Archive::SHOULD_INCLUDE_NO
|
|
|
|
|| t == Archive::SHOULD_INCLUDE_YES)
|
2010-03-09 19:17:14 +00:00
|
|
|
this->armap_checked_[i] = true;
|
2009-03-18 05:09:52 +00:00
|
|
|
|
2010-03-22 14:18:24 +00:00
|
|
|
if (t != Archive::SHOULD_INCLUDE_YES)
|
2008-08-07 17:02:11 +00:00
|
|
|
continue;
|
|
|
|
|
|
|
|
// We want to include this object in the link.
|
|
|
|
last_seen_offset = this->armap_[i].file_offset;
|
|
|
|
this->seen_offsets_.insert(last_seen_offset);
|
|
|
|
|
* 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 05:56:46 +00:00
|
|
|
if (!this->include_member(symtab, layout, input_objects,
|
|
|
|
last_seen_offset, mapfile, sym,
|
|
|
|
why.c_str()))
|
2009-03-18 05:09:52 +00:00
|
|
|
{
|
|
|
|
if (tmpbuf != NULL)
|
|
|
|
free(tmpbuf);
|
|
|
|
return false;
|
|
|
|
}
|
2008-08-07 17:02:11 +00:00
|
|
|
|
|
|
|
added_new_object = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
while (added_new_object);
|
|
|
|
|
2009-03-18 05:09:52 +00:00
|
|
|
if (tmpbuf != NULL)
|
|
|
|
free(tmpbuf);
|
|
|
|
|
2008-08-07 17:02:11 +00:00
|
|
|
input_objects->archive_stop(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 05:56:46 +00:00
|
|
|
|
|
|
|
return true;
|
2008-08-07 17:02:11 +00:00
|
|
|
}
|
|
|
|
|
2008-07-22 22:08:43 +00:00
|
|
|
// Include all the archive members in the link. This is for --whole-archive.
|
|
|
|
|
* 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 05:56:46 +00:00
|
|
|
bool
|
2008-07-22 22:08:43 +00:00
|
|
|
Archive::include_all_members(Symbol_table* symtab, Layout* layout,
|
|
|
|
Input_objects* input_objects, Mapfile* mapfile)
|
|
|
|
{
|
|
|
|
input_objects->archive_start(this);
|
|
|
|
|
2008-08-07 17:02:11 +00:00
|
|
|
if (this->members_.size() > 0)
|
|
|
|
{
|
|
|
|
std::map<off_t, Archive_member>::const_iterator p;
|
|
|
|
for (p = this->members_.begin();
|
|
|
|
p != this->members_.end();
|
|
|
|
++p)
|
|
|
|
{
|
* 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 05:56:46 +00:00
|
|
|
if (!this->include_member(symtab, layout, input_objects, p->first,
|
|
|
|
mapfile, NULL, "--whole-archive"))
|
|
|
|
return false;
|
2008-08-07 17:02:11 +00:00
|
|
|
++Archive::total_members;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
for (Archive::const_iterator p = this->begin();
|
|
|
|
p != this->end();
|
|
|
|
++p)
|
|
|
|
{
|
* 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 05:56:46 +00:00
|
|
|
if (!this->include_member(symtab, layout, input_objects, p->off,
|
|
|
|
mapfile, NULL, "--whole-archive"))
|
|
|
|
return false;
|
2008-08-07 17:02:11 +00:00
|
|
|
++Archive::total_members;
|
|
|
|
}
|
|
|
|
}
|
2008-07-22 22:08:43 +00:00
|
|
|
|
|
|
|
input_objects->archive_stop(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 05:56:46 +00:00
|
|
|
|
|
|
|
return true;
|
2008-07-22 22:08:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Return the number of members in the archive. This is only used for
|
|
|
|
// reports.
|
|
|
|
|
|
|
|
size_t
|
2008-07-25 04:25:49 +00:00
|
|
|
Archive::count_members()
|
2008-07-22 22:08:43 +00:00
|
|
|
{
|
|
|
|
size_t ret = 0;
|
|
|
|
for (Archive::const_iterator p = this->begin();
|
|
|
|
p != this->end();
|
|
|
|
++p)
|
|
|
|
++ret;
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2006-09-29 19:58:17 +00:00
|
|
|
// Include an archive member in the link. OFF is the file offset of
|
2008-05-21 21:37:44 +00:00
|
|
|
// the member header. WHY is the reason we are including this member.
|
* 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 05:56:46 +00:00
|
|
|
// Return true if we added the member or if we had an error, return
|
|
|
|
// false if this was the first member we tried to add from this
|
|
|
|
// archive and it had an incompatible format.
|
2006-09-29 19:58:17 +00:00
|
|
|
|
* 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 05:56:46 +00:00
|
|
|
bool
|
2007-09-21 07:20:01 +00:00
|
|
|
Archive::include_member(Symbol_table* symtab, Layout* layout,
|
2008-05-21 21:37:44 +00:00
|
|
|
Input_objects* input_objects, off_t off,
|
|
|
|
Mapfile* mapfile, Symbol* sym, const char* why)
|
2006-09-29 19:58:17 +00:00
|
|
|
{
|
2008-08-07 17:02:11 +00:00
|
|
|
++Archive::total_members_loaded;
|
2008-05-21 21:37:44 +00:00
|
|
|
|
2008-08-07 17:02:11 +00:00
|
|
|
std::map<off_t, Archive_member>::const_iterator p = this->members_.find(off);
|
|
|
|
if (p != this->members_.end())
|
2008-04-01 20:57:36 +00:00
|
|
|
{
|
2010-08-25 08:36:54 +00:00
|
|
|
Object* obj = p->second.obj_;
|
* 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 05:56:46 +00:00
|
|
|
|
2010-08-25 08:36:54 +00:00
|
|
|
Read_symbols_data* sd = p->second.sd_;
|
2008-08-07 17:02:11 +00:00
|
|
|
if (mapfile != NULL)
|
|
|
|
mapfile->report_include_archive_member(obj->name(), sym, why);
|
|
|
|
if (input_objects->add_object(obj))
|
2008-04-01 20:57:36 +00:00
|
|
|
{
|
2008-08-07 17:02:11 +00:00
|
|
|
obj->layout(symtab, layout, sd);
|
2009-02-13 19:04:45 +00:00
|
|
|
obj->add_symbols(symtab, sd, 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 05:56:46 +00:00
|
|
|
this->included_member_ = true;
|
2008-04-01 20:57:36 +00:00
|
|
|
}
|
2008-08-07 17:02:11 +00:00
|
|
|
delete sd;
|
* 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 05:56:46 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool unconfigured;
|
|
|
|
Object* obj = this->get_elf_object_for_member(off, &unconfigured);
|
|
|
|
|
|
|
|
if (!this->included_member_
|
|
|
|
&& this->searched_for()
|
2009-09-30 22:21:13 +00:00
|
|
|
&& obj == NULL
|
|
|
|
&& unconfigured)
|
2010-07-13 07:56:08 +00:00
|
|
|
return false;
|
2006-09-29 19:58:17 +00:00
|
|
|
|
2008-08-07 17:02:11 +00:00
|
|
|
if (obj == 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 05:56:46 +00:00
|
|
|
return true;
|
2006-09-29 19:58:17 +00:00
|
|
|
|
2008-08-07 17:02:11 +00:00
|
|
|
if (mapfile != NULL)
|
|
|
|
mapfile->report_include_archive_member(obj->name(), sym, why);
|
2006-09-29 19:58:17 +00:00
|
|
|
|
2008-09-19 22:54:57 +00:00
|
|
|
Pluginobj* pluginobj = obj->pluginobj();
|
|
|
|
if (pluginobj != NULL)
|
|
|
|
{
|
2009-02-13 19:04:45 +00:00
|
|
|
pluginobj->add_symbols(symtab, NULL, 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 05:56:46 +00:00
|
|
|
this->included_member_ = true;
|
|
|
|
return true;
|
2008-09-19 22:54:57 +00:00
|
|
|
}
|
|
|
|
|
* 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 05:56:46 +00:00
|
|
|
if (!input_objects->add_object(obj))
|
2010-07-13 07:56:08 +00:00
|
|
|
{
|
|
|
|
// If this is an external member of a thin archive, unlock the
|
|
|
|
// file.
|
|
|
|
if (obj->offset() == 0)
|
|
|
|
obj->unlock(this->task_);
|
|
|
|
delete obj;
|
|
|
|
}
|
* 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 05:56:46 +00:00
|
|
|
else
|
2007-11-07 00:31:32 +00:00
|
|
|
{
|
2010-04-07 22:58:23 +00:00
|
|
|
{
|
2010-08-12 22:01:11 +00:00
|
|
|
if (layout->incremental_inputs() != NULL)
|
|
|
|
layout->incremental_inputs()->report_object(obj, this);
|
2010-04-07 22:58:23 +00:00
|
|
|
Read_symbols_data sd;
|
|
|
|
obj->read_symbols(&sd);
|
|
|
|
obj->layout(symtab, layout, &sd);
|
|
|
|
obj->add_symbols(symtab, &sd, layout);
|
|
|
|
}
|
2008-09-29 21:23:02 +00:00
|
|
|
|
|
|
|
// If this is an external member of a thin archive, unlock the file
|
|
|
|
// for the next task.
|
|
|
|
if (obj->offset() == 0)
|
|
|
|
obj->unlock(this->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 05:56:46 +00:00
|
|
|
|
|
|
|
this->included_member_ = true;
|
2007-11-07 00:31:32 +00:00
|
|
|
}
|
* 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 05:56:46 +00:00
|
|
|
|
|
|
|
return true;
|
2008-08-07 17:02:11 +00:00
|
|
|
}
|
2006-09-29 19:58:17 +00:00
|
|
|
|
2008-08-07 17:02:11 +00:00
|
|
|
// Print statistical information to stderr. This is used for --stats.
|
|
|
|
|
|
|
|
void
|
|
|
|
Archive::print_stats()
|
|
|
|
{
|
|
|
|
fprintf(stderr, _("%s: archive libraries: %u\n"),
|
|
|
|
program_name, Archive::total_archives);
|
|
|
|
fprintf(stderr, _("%s: total archive members: %u\n"),
|
|
|
|
program_name, Archive::total_members);
|
|
|
|
fprintf(stderr, _("%s: loaded archive members: %u\n"),
|
|
|
|
program_name, Archive::total_members_loaded);
|
2006-09-29 19:58:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Add_archive_symbols methods.
|
|
|
|
|
|
|
|
Add_archive_symbols::~Add_archive_symbols()
|
|
|
|
{
|
|
|
|
if (this->this_blocker_ != NULL)
|
|
|
|
delete this->this_blocker_;
|
|
|
|
// next_blocker_ is deleted by the task associated with the next
|
|
|
|
// input file.
|
|
|
|
}
|
|
|
|
|
|
|
|
// Return whether we can add the archive symbols. We are blocked by
|
|
|
|
// this_blocker_. We block next_blocker_. We also lock the file.
|
|
|
|
|
2007-12-14 19:00:21 +00:00
|
|
|
Task_token*
|
|
|
|
Add_archive_symbols::is_runnable()
|
2006-09-29 19:58:17 +00:00
|
|
|
{
|
|
|
|
if (this->this_blocker_ != NULL && this->this_blocker_->is_blocked())
|
2007-12-14 19:00:21 +00:00
|
|
|
return this->this_blocker_;
|
|
|
|
return NULL;
|
2006-09-29 19:58:17 +00:00
|
|
|
}
|
|
|
|
|
2007-12-14 19:00:21 +00:00
|
|
|
void
|
|
|
|
Add_archive_symbols::locks(Task_locker* tl)
|
2006-09-29 19:58:17 +00:00
|
|
|
{
|
2007-12-14 19:00:21 +00:00
|
|
|
tl->add(this, this->next_blocker_);
|
|
|
|
tl->add(this, this->archive_->token());
|
2006-09-29 19:58:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
* 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 05:56:46 +00:00
|
|
|
Add_archive_symbols::run(Workqueue* workqueue)
|
2006-09-29 19:58:17 +00:00
|
|
|
{
|
2010-08-12 22:01:11 +00:00
|
|
|
// For an incremental link, begin recording layout information.
|
|
|
|
Incremental_inputs* incremental_inputs = this->layout_->incremental_inputs();
|
|
|
|
if (incremental_inputs != NULL)
|
|
|
|
incremental_inputs->report_archive_begin(this->archive_);
|
|
|
|
|
* 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 05:56:46 +00:00
|
|
|
bool added = this->archive_->add_symbols(this->symtab_, this->layout_,
|
|
|
|
this->input_objects_,
|
|
|
|
this->mapfile_);
|
2008-04-01 20:57:36 +00:00
|
|
|
this->archive_->unlock_nested_archives();
|
|
|
|
|
2007-12-14 19:00:21 +00:00
|
|
|
this->archive_->release();
|
2008-04-02 20:58:21 +00:00
|
|
|
this->archive_->clear_uncached_views();
|
2007-12-14 19:00:21 +00:00
|
|
|
|
* 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 05:56:46 +00:00
|
|
|
if (!added)
|
|
|
|
{
|
|
|
|
// This archive holds object files which are incompatible with
|
|
|
|
// our output file.
|
|
|
|
Read_symbols::incompatible_warning(this->input_argument_,
|
|
|
|
this->archive_->input_file());
|
|
|
|
Read_symbols::requeue(workqueue, this->input_objects_, this->symtab_,
|
|
|
|
this->layout_, this->dirpath_, this->dirindex_,
|
|
|
|
this->mapfile_, this->input_argument_,
|
|
|
|
this->input_group_, this->next_blocker_);
|
|
|
|
delete this->archive_;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2006-11-03 18:26:11 +00:00
|
|
|
if (this->input_group_ != NULL)
|
|
|
|
this->input_group_->add_archive(this->archive_);
|
|
|
|
else
|
|
|
|
{
|
2010-08-12 22:01:11 +00: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(this->archive_);
|
|
|
|
|
2006-11-03 18:26:11 +00:00
|
|
|
// We no longer need to know about this archive.
|
|
|
|
delete this->archive_;
|
2007-11-22 00:05:51 +00:00
|
|
|
this->archive_ = NULL;
|
2006-11-03 18:26:11 +00:00
|
|
|
}
|
2006-09-29 19:58:17 +00:00
|
|
|
}
|
|
|
|
|
2010-03-22 14:18:24 +00:00
|
|
|
// Class Lib_group static variables.
|
|
|
|
unsigned int Lib_group::total_lib_groups;
|
|
|
|
unsigned int Lib_group::total_members;
|
|
|
|
unsigned int Lib_group::total_members_loaded;
|
|
|
|
|
|
|
|
Lib_group::Lib_group(const Input_file_lib* lib, Task* task)
|
|
|
|
: lib_(lib), task_(task), members_()
|
|
|
|
{
|
|
|
|
this->members_.resize(lib->size());
|
|
|
|
}
|
|
|
|
|
|
|
|
// Select members from the lib group and add them to the link. We walk
|
|
|
|
// through the the members, and check if each one up should be included.
|
|
|
|
// If the object says it should be included, we do so. We have to do
|
|
|
|
// this in a loop, since including one member may create new undefined
|
|
|
|
// symbols which may be satisfied by other members.
|
|
|
|
|
|
|
|
void
|
|
|
|
Lib_group::add_symbols(Symbol_table* symtab, Layout* layout,
|
|
|
|
Input_objects* input_objects)
|
|
|
|
{
|
|
|
|
++Lib_group::total_lib_groups;
|
|
|
|
|
|
|
|
Lib_group::total_members += this->members_.size();
|
|
|
|
|
|
|
|
bool added_new_object;
|
|
|
|
do
|
|
|
|
{
|
|
|
|
added_new_object = false;
|
|
|
|
unsigned int i = 0;
|
|
|
|
while (i < this->members_.size())
|
|
|
|
{
|
|
|
|
const Archive_member& member = this->members_[i];
|
2010-08-25 08:36:54 +00:00
|
|
|
Object* obj = member.obj_;
|
2010-03-22 14:18:24 +00:00
|
|
|
std::string why;
|
|
|
|
|
|
|
|
// Skip files with no symbols. Plugin objects have
|
|
|
|
// member.sd_ == NULL.
|
|
|
|
if (obj != NULL
|
|
|
|
&& (member.sd_ == NULL || member.sd_->symbol_names != NULL))
|
|
|
|
{
|
|
|
|
Archive::Should_include t = obj->should_include_member(symtab,
|
2010-08-02 13:34:33 +00:00
|
|
|
layout,
|
2010-03-22 14:18:24 +00:00
|
|
|
member.sd_,
|
|
|
|
&why);
|
|
|
|
|
|
|
|
if (t != Archive::SHOULD_INCLUDE_YES)
|
|
|
|
{
|
|
|
|
++i;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
this->include_member(symtab, layout, input_objects, member);
|
|
|
|
|
|
|
|
added_new_object = true;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (member.sd_ != NULL)
|
2010-08-23 20:28:24 +00:00
|
|
|
{
|
|
|
|
// The file must be locked in order to destroy the views
|
|
|
|
// associated with it.
|
|
|
|
gold_assert(obj != NULL);
|
|
|
|
obj->lock(this->task_);
|
|
|
|
delete member.sd_;
|
|
|
|
obj->unlock(this->task_);
|
|
|
|
}
|
2010-03-22 14:18:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
this->members_[i] = this->members_.back();
|
|
|
|
this->members_.pop_back();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
while (added_new_object);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Include a lib group member in the link.
|
|
|
|
|
|
|
|
void
|
|
|
|
Lib_group::include_member(Symbol_table* symtab, Layout* layout,
|
|
|
|
Input_objects* input_objects,
|
|
|
|
const Archive_member& member)
|
|
|
|
{
|
|
|
|
++Lib_group::total_members_loaded;
|
|
|
|
|
|
|
|
Object* obj = member.obj_;
|
|
|
|
gold_assert(obj != NULL);
|
|
|
|
|
|
|
|
Pluginobj* pluginobj = obj->pluginobj();
|
|
|
|
if (pluginobj != NULL)
|
|
|
|
{
|
|
|
|
pluginobj->add_symbols(symtab, NULL, layout);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
Read_symbols_data* sd = member.sd_;
|
|
|
|
gold_assert(sd != NULL);
|
|
|
|
obj->lock(this->task_);
|
|
|
|
if (input_objects->add_object(obj))
|
|
|
|
{
|
2010-08-12 22:01:11 +00:00
|
|
|
// FIXME: Record incremental link info for --start-lib/--end-lib.
|
|
|
|
if (layout->incremental_inputs() != NULL)
|
|
|
|
layout->incremental_inputs()->report_object(obj, NULL);
|
2010-03-22 14:18:24 +00:00
|
|
|
obj->layout(symtab, layout, sd);
|
|
|
|
obj->add_symbols(symtab, sd, layout);
|
|
|
|
}
|
|
|
|
delete sd;
|
2010-08-23 20:28:24 +00:00
|
|
|
// Unlock the file for the next task.
|
|
|
|
obj->unlock(this->task_);
|
2010-03-22 14:18:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Print statistical information to stderr. This is used for --stats.
|
|
|
|
|
|
|
|
void
|
|
|
|
Lib_group::print_stats()
|
|
|
|
{
|
|
|
|
fprintf(stderr, _("%s: lib groups: %u\n"),
|
|
|
|
program_name, Lib_group::total_lib_groups);
|
|
|
|
fprintf(stderr, _("%s: total lib groups members: %u\n"),
|
|
|
|
program_name, Lib_group::total_members);
|
|
|
|
fprintf(stderr, _("%s: loaded lib groups members: %u\n"),
|
|
|
|
program_name, Lib_group::total_members_loaded);
|
|
|
|
}
|
|
|
|
|
|
|
|
Task_token*
|
|
|
|
Add_lib_group_symbols::is_runnable()
|
|
|
|
{
|
2010-08-20 00:35:13 +00:00
|
|
|
if (this->readsyms_blocker_ != NULL && this->readsyms_blocker_->is_blocked())
|
|
|
|
return this->readsyms_blocker_;
|
2010-03-22 14:18:24 +00:00
|
|
|
if (this->this_blocker_ != NULL && this->this_blocker_->is_blocked())
|
|
|
|
return this->this_blocker_;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
Add_lib_group_symbols::locks(Task_locker* tl)
|
|
|
|
{
|
|
|
|
tl->add(this, this->next_blocker_);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
Add_lib_group_symbols::run(Workqueue*)
|
|
|
|
{
|
|
|
|
this->lib_->add_symbols(this->symtab_, this->layout_, this->input_objects_);
|
2010-08-12 22:01:11 +00:00
|
|
|
|
|
|
|
// FIXME: Record incremental link info for --start_lib/--end_lib.
|
2010-03-22 14:18:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
Add_lib_group_symbols::~Add_lib_group_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-29 19:58:17 +00:00
|
|
|
} // End namespace gold.
|