// archive.cc -- archive support for gold
+// Copyright 2006, 2007 Free Software Foundation, Inc.
+// Written by Ian Lance Taylor <iant@google.com>.
+
+// This file is part of gold.
+
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+// MA 02110-1301, USA.
+
#include "gold.h"
#include <cerrno>
#include <vector>
#include "elfcpp.h"
+#include "options.h"
#include "fileread.h"
+#include "readsyms.h"
#include "symtab.h"
#include "object.h"
#include "archive.h"
const char Archive::arfmag[2] = { '`', '\n' };
-// Get a view into the underlying file.
-
-const unsigned char*
-Archive::get_view(off_t start, off_t size)
-{
- return this->input_file_->file().get_view(start, size);
-}
-
// Set up the archive: read the symbol map and the extended name
// table.
void
-Archive::setup()
+Archive::setup(Task* task)
{
+ // We need to ignore empty archives.
+ if (this->input_file_->file().filesize() == sarmag)
+ {
+ this->input_file_->file().unlock(task);
+ return;
+ }
+
// The first member of the archive should be the symbol table.
std::string armap_name;
- off_t armap_size = this->read_header(sarmag, &armap_name);
- if (!armap_name.empty())
+ section_size_type armap_size =
+ convert_to_section_size_type(this->read_header(sarmag, false,
+ &armap_name));
+ off_t off = sarmag;
+ if (armap_name.empty())
+ {
+ this->read_armap(sarmag + sizeof(Archive_header), armap_size);
+ off = sarmag + sizeof(Archive_header) + armap_size;
+ }
+ else if (!this->input_file_->options().include_whole_archive())
+ gold_error(_("%s: no archive symbol table (run ranlib)"),
+ this->name().c_str());
+
+ // 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.
+ if ((off & 1) != 0)
+ ++off;
+ std::string xname;
+ section_size_type extended_size =
+ convert_to_section_size_type(this->read_header(off, true, &xname));
+ if (xname == "/")
{
- fprintf(stderr, _("%s: %s: no archive symbol table (run ranlib)\n"),
- program_name, this->name().c_str());
- gold_exit(false);
+ const unsigned char* p = this->get_view(off + sizeof(Archive_header),
+ extended_size, true);
+ const char* px = reinterpret_cast<const char*>(p);
+ this->extended_names_.assign(px, extended_size);
}
+ // Opening the file locked it. Unlock it now.
+ this->input_file_->file().unlock(task);
+}
+
+// Read the archive symbol map.
+
+void
+Archive::read_armap(off_t start, section_size_type size)
+{
// Read in the entire armap.
- const unsigned char* p = this->get_view(sarmag + sizeof(Archive_header),
- armap_size);
+ const unsigned char* p = this->get_view(start, size, false);
// Numbers in the armap are always big-endian.
const elfcpp::Elf_Word* pword = reinterpret_cast<const elfcpp::Elf_Word*>(p);
- unsigned int nsyms = elfcpp::read_elf_word<true>(pword);
+ unsigned int nsyms = elfcpp::Swap<32, true>::readval(pword);
++pword;
// Note that the addition is in units of sizeof(elfcpp::Elf_Word).
const char* pnames = reinterpret_cast<const char*>(pword + nsyms);
+ section_size_type names_size =
+ reinterpret_cast<const char*>(p) + size - pnames;
+ this->armap_names_.assign(pnames, names_size);
this->armap_.resize(nsyms);
+ section_offset_type name_offset = 0;
for (unsigned int i = 0; i < nsyms; ++i)
{
- this->armap_[i].name = pnames;
- this->armap_[i].offset = elfcpp::read_elf_word<true>(pword);
- pnames += strlen(pnames) + 1;
+ 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;
++pword;
}
- if (reinterpret_cast<const unsigned char*>(pnames) - p > armap_size)
- {
- fprintf(stderr, _("%s: %s: bad archive symbol table names\n"),
- program_name, this->name().c_str());
- gold_exit(false);
- }
+ if (static_cast<section_size_type>(name_offset) > names_size)
+ gold_error(_("%s: bad archive symbol table names"),
+ this->name().c_str());
- // See if there is an extended name table.
- off_t off = sarmag + sizeof(Archive_header) + armap_size;
- if ((off & 1) != 0)
- ++off;
- std::string xname;
- off_t extended_size = this->read_header(off, &xname);
- if (xname == "/")
- {
- p = this->get_view(off + sizeof(Archive_header), extended_size);
- const char* px = reinterpret_cast<const char*>(p);
- this->extended_names_.assign(px, extended_size);
- }
-
- // Opening the file locked it. Unlock it now.
- this->input_file_->file().unlock();
+ // This array keeps track of which symbols are for archive elements
+ // which we have already included in the link.
+ this->armap_checked_.resize(nsyms);
}
// Read the header of an archive member at OFF. Fail if something
// of the member.
off_t
-Archive::read_header(off_t off, std::string* pname)
+Archive::read_header(off_t off, bool cache, std::string* pname)
{
- const unsigned char* p = this->get_view(off, sizeof(Archive_header));
+ const unsigned char* p = this->get_view(off, sizeof(Archive_header), cache);
const Archive_header* hdr = reinterpret_cast<const Archive_header*>(p);
+ return this->interpret_header(hdr, off, pname);
+}
+
+// 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,
+ std::string* pname)
+{
if (memcmp(hdr->ar_fmag, arfmag, sizeof arfmag) != 0)
{
- fprintf(stderr, _("%s; %s: malformed archive header at %ld\n"),
- program_name, this->name().c_str(),
- static_cast<long>(off));
- gold_exit(false);
+ gold_error(_("%s: malformed archive header at %zu"),
+ this->name().c_str(), static_cast<size_t>(off));
+ return this->input_file_->file().filesize() - off;
}
const int size_string_size = sizeof hdr->ar_size;
|| member_size < 0
|| (member_size == LONG_MAX && errno == ERANGE))
{
- fprintf(stderr, _("%s: %s: malformed archive header size at %ld\n"),
- program_name, this->name().c_str(),
- static_cast<long>(off));
- gold_exit(false);
+ 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;
}
if (hdr->ar_name[0] != '/')
if (name_end == NULL
|| name_end - hdr->ar_name >= static_cast<int>(sizeof hdr->ar_name))
{
- fprintf(stderr, _("%s: %s: malformed archive header name at %ld\n"),
- program_name, this->name().c_str(),
- static_cast<long>(off));
- gold_exit(false);
+ gold_error(_("%s: malformed archive header name at %zu"),
+ this->name().c_str(), static_cast<size_t>(off));
+ return this->input_file_->file().filesize() - off;
}
pname->assign(hdr->ar_name, name_end - hdr->ar_name);
}
|| (x == LONG_MAX && errno == ERANGE)
|| static_cast<size_t>(x) >= this->extended_names_.size())
{
- fprintf(stderr, _("%s: %s: bad extended name index at %ld\n"),
- program_name, this->name().c_str(),
- static_cast<long>(off));
- gold_exit(false);
+ 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;
}
const char* name = this->extended_names_.data() + x;
if (static_cast<size_t>(name_end - name) > this->extended_names_.size()
|| name_end[1] != '\n')
{
- fprintf(stderr, _("%s: %s: bad extended name entry at header %ld\n"),
- program_name, this->name().c_str(),
- static_cast<long>(off));
- gold_exit(false);
+ 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;
}
pname->assign(name, name_end - name);
}
Archive::add_symbols(Symbol_table* symtab, Layout* layout,
Input_objects* input_objects)
{
- size_t armap_size = this->armap_.size();
- std::vector<bool> seen;
- seen.resize(this->armap_.size());
- seen.clear();
+ if (this->input_file_->options().include_whole_archive())
+ return this->include_all_members(symtab, layout, input_objects);
+
+ 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.
bool added_new_object;
do
{
added_new_object = false;
- off_t last = -1;
for (size_t i = 0; i < armap_size; ++i)
{
- if (seen[i])
- continue;
- if (this->armap_[i].offset == last)
+ 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())
{
- seen[i] = true;
+ this->armap_checked_[i] = true;
+ last_seen_offset = this->armap_[i].file_offset;
continue;
}
- Symbol* sym = symtab->lookup(this->armap_[i].name);
+ const char* sym_name = (this->armap_names_.data()
+ + this->armap_[i].name_offset);
+ Symbol* sym = symtab->lookup(sym_name);
if (sym == NULL)
continue;
- else if (sym->shnum() != elfcpp::SHN_UNDEF)
+ else if (!sym->is_undefined())
{
- seen[i] = true;
+ this->armap_checked_[i] = true;
continue;
}
else if (sym->binding() == elfcpp::STB_WEAK)
continue;
// We want to include this object in the link.
- last = this->armap_[i].offset;
- this->include_member(symtab, layout, input_objects, last);
+ last_seen_offset = this->armap_[i].file_offset;
+ this->seen_offsets_.insert(last_seen_offset);
+ this->armap_checked_[i] = true;
+ this->include_member(symtab, layout, input_objects,
+ last_seen_offset);
added_new_object = true;
}
}
while (added_new_object);
}
+// Include all the archive members in the link. This is for --whole-archive.
+
+void
+Archive::include_all_members(Symbol_table* symtab, Layout* layout,
+ Input_objects* input_objects)
+{
+ off_t off = sarmag;
+ off_t filesize = this->input_file_->file().filesize();
+ while (true)
+ {
+ if (filesize - off < static_cast<off_t>(sizeof(Archive_header)))
+ {
+ if (filesize != off)
+ gold_error(_("%s: short archive header at %zu"),
+ this->name().c_str(), static_cast<size_t>(off));
+ break;
+ }
+
+ unsigned char hdr_buf[sizeof(Archive_header)];
+ this->input_file_->file().read(off, sizeof(Archive_header), hdr_buf);
+
+ const Archive_header* hdr =
+ reinterpret_cast<const Archive_header*>(hdr_buf);
+ std::string name;
+ off_t size = this->interpret_header(hdr, off, &name);
+ if (name.empty())
+ {
+ // Symbol table.
+ }
+ else if (name == "/")
+ {
+ // Extended name table.
+ }
+ else
+ this->include_member(symtab, layout, input_objects, off);
+
+ off += sizeof(Archive_header) + size;
+ if ((off & 1) != 0)
+ ++off;
+ }
+}
+
// Include an archive member in the link. OFF is the file offset of
// the member header.
Input_objects* input_objects, off_t off)
{
std::string n;
- this->read_header(off, &n);
+ this->read_header(off, false, &n);
- size_t memoff = off + sizeof(Archive_header);
+ const off_t memoff = off + static_cast<off_t>(sizeof(Archive_header));
// Read enough of the file to pick up the entire ELF header.
- int ehdr_size = elfcpp::Elf_sizes<64>::ehdr_size;
- off_t bytes;
- const unsigned char* p = this->input_file_->file().get_view(memoff,
- ehdr_size,
- &bytes);
- if (bytes < 4)
+ unsigned char ehdr_buf[elfcpp::Elf_sizes<64>::ehdr_size];
+
+ off_t filesize = this->input_file_->file().filesize();
+ int read_size = elfcpp::Elf_sizes<64>::ehdr_size;
+ if (filesize - memoff < read_size)
+ read_size = filesize - memoff;
+
+ if (read_size < 4)
{
- fprintf(stderr, _("%s: %s: member at %ld is not an ELF object"),
- program_name, this->name().c_str(),
- static_cast<long>(off));
- gold_exit(false);
+ gold_error(_("%s: member at %zu is not an ELF object"),
+ this->name().c_str(), static_cast<size_t>(off));
+ return;
}
+ this->input_file_->file().read(memoff, read_size, ehdr_buf);
+
static unsigned char elfmagic[4] =
{
elfcpp::ELFMAG0, elfcpp::ELFMAG1,
elfcpp::ELFMAG2, elfcpp::ELFMAG3
};
- if (memcmp(p, elfmagic, 4) != 0)
+ if (memcmp(ehdr_buf, elfmagic, 4) != 0)
{
- fprintf(stderr, _("%s: %s: member at %ld is not an ELF object"),
- program_name, this->name().c_str(),
- static_cast<long>(off));
- gold_exit(false);
+ gold_error(_("%s: member at %zu is not an ELF object"),
+ this->name().c_str(), static_cast<size_t>(off));
+ return;
}
Object* obj = make_elf_object((std::string(this->input_file_->filename())
+ "(" + n + ")"),
- this->input_file_, memoff, p, bytes);
+ this->input_file_, memoff, ehdr_buf,
+ read_size);
- input_objects->add_object(obj);
+ if (input_objects->add_object(obj))
+ {
+ Read_symbols_data sd;
+ obj->read_symbols(&sd);
+ obj->layout(symtab, layout, &sd);
+ obj->add_symbols(symtab, &sd);
+ }
+ else
+ {
+ // FIXME: We need to close the descriptor here.
+ delete obj;
+ }
- Read_symbols_data sd;
- obj->read_symbols(&sd);
- obj->layout(layout, &sd);
- obj->add_symbols(symtab, &sd);
}
// Add_archive_symbols methods.
// Return whether we can add the archive symbols. We are blocked by
// this_blocker_. We block next_blocker_. We also lock the file.
-Task::Is_runnable_type
-Add_archive_symbols::is_runnable(Workqueue*)
+Task_token*
+Add_archive_symbols::is_runnable()
{
if (this->this_blocker_ != NULL && this->this_blocker_->is_blocked())
- return IS_BLOCKED;
- return IS_RUNNABLE;
+ return this->this_blocker_;
+ return NULL;
}
-class Add_archive_symbols::Add_archive_symbols_locker : public Task_locker
-{
- public:
- Add_archive_symbols_locker(Task_token& token, Workqueue* workqueue,
- Archive* archive)
- : blocker_(token, workqueue), archlock_(*archive)
- { }
-
- private:
- Task_locker_block blocker_;
- Task_locker_obj<Archive> archlock_;
-};
-
-Task_locker*
-Add_archive_symbols::locks(Workqueue* workqueue)
+void
+Add_archive_symbols::locks(Task_locker* tl)
{
- return new Add_archive_symbols_locker(*this->next_blocker_,
- workqueue,
- this->archive_);
+ tl->add(this, this->next_blocker_);
+ tl->add(this, this->archive_->token());
}
void
{
this->archive_->add_symbols(this->symtab_, this->layout_,
this->input_objects_);
+
+ this->archive_->release();
+
+ if (this->input_group_ != NULL)
+ this->input_group_->add_archive(this->archive_);
+ else
+ {
+ // We no longer need to know about this archive.
+ delete this->archive_;
+ this->archive_ = NULL;
+ }
}
} // End namespace gold.
projects / deliverable / binutils-gdb.git / blobdiff