// archive.cc -- archive support for gold
-// Copyright 2006, 2007 Free Software Foundation, Inc.
+// Copyright 2006, 2007, 2008 Free Software Foundation, Inc.
// Written by Ian Lance Taylor <iant@google.com>.
// This file is part of gold.
#include <cstring>
#include <climits>
#include <vector>
+#include "libiberty.h"
+#include "filenames.h"
#include "elfcpp.h"
#include "options.h"
+#include "mapfile.h"
#include "fileread.h"
#include "readsyms.h"
#include "symtab.h"
'!', '<', 'a', 'r', 'c', 'h', '>', '\n'
};
+const char Archive::armagt[sarmag] =
+{
+ '!', '<', 't', 'h', 'i', 'n', '>', '\n'
+};
+
const char Archive::arfmag[2] = { '`', '\n' };
// Set up the archive: read the symbol map and the extended name
void
Archive::setup()
{
+ // We need to ignore empty archives.
+ if (this->input_file_->file().filesize() == sarmag)
+ 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);
+ section_size_type armap_size =
+ convert_to_section_size_type(this->read_header(sarmag, false,
+ &armap_name, NULL));
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())
+ else if (!this->input_file_->options().whole_archive())
gold_error(_("%s: no archive symbol table (run ranlib)"),
this->name().c_str());
- // See if there is an extended name table.
+ // 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;
- off_t extended_size = this->read_header(off, &xname);
+ section_size_type extended_size =
+ convert_to_section_size_type(this->read_header(off, true, &xname, NULL));
if (xname == "/")
{
const unsigned char* p = this->get_view(off + sizeof(Archive_header),
- extended_size, false);
+ extended_size, false, true);
const char* px = reinterpret_cast<const char*>(p);
this->extended_names_.assign(px, extended_size);
}
+}
+
+// Unlock any nested archives.
- // Opening the file locked it. Unlock it now.
- this->input_file_->file().unlock();
+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_);
+ }
}
// Read the archive symbol map.
void
-Archive::read_armap(off_t start, off_t size)
+Archive::read_armap(off_t start, section_size_type size)
{
// Read in the entire armap.
- const unsigned char* p = this->get_view(start, size, false);
+ const unsigned char* p = this->get_view(start, size, true, false);
// Numbers in the armap are always big-endian.
const elfcpp::Elf_Word* pword = reinterpret_cast<const elfcpp::Elf_Word*>(p);
// Note that the addition is in units of sizeof(elfcpp::Elf_Word).
const char* pnames = reinterpret_cast<const char*>(pword + nsyms);
- off_t names_size = reinterpret_cast<const char*>(p) + size - pnames;
+ section_size_type names_size =
+ reinterpret_cast<const char*>(p) + size - pnames;
this->armap_names_.assign(pnames, names_size);
this->armap_.resize(nsyms);
- off_t name_offset = 0;
+ section_offset_type name_offset = 0;
for (unsigned int i = 0; i < nsyms; ++i)
{
this->armap_[i].name_offset = name_offset;
++pword;
}
- if (reinterpret_cast<const unsigned char*>(pnames) - p > size)
+ if (static_cast<section_size_type>(name_offset) > names_size)
gold_error(_("%s: bad archive symbol table names"),
this->name().c_str());
// 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,
+ off_t* nested_off)
{
- const unsigned char* p = this->get_view(off, sizeof(Archive_header), false);
+ const unsigned char* p = this->get_view(off, sizeof(Archive_header), true,
+ cache);
const Archive_header* hdr = reinterpret_cast<const Archive_header*>(p);
- return this->interpret_header(hdr, off, pname);
+ return this->interpret_header(hdr, off, pname, nested_off);
}
// Interpret the header of HDR, the header of the archive member at
off_t
Archive::interpret_header(const Archive_header* hdr, off_t off,
- std::string* pname)
+ std::string* pname, off_t* nested_off) const
{
if (memcmp(hdr->ar_fmag, arfmag, sizeof arfmag) != 0)
{
if (name_end == NULL
|| name_end - hdr->ar_name >= static_cast<int>(sizeof hdr->ar_name))
{
- gold_error(_("%s: malformed archive header name at %zu\n"),
+ 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);
+ if (nested_off != NULL)
+ *nested_off = 0;
}
else if (hdr->ar_name[1] == ' ')
{
{
errno = 0;
long x = strtol(hdr->ar_name + 1, &end, 10);
+ long y = 0;
+ if (*end == ':')
+ y = strtol(end + 1, &end, 10);
if (*end != ' '
|| x < 0
|| (x == LONG_MAX && errno == ERANGE)
}
const char* name = this->extended_names_.data() + x;
- const char* name_end = strchr(name, '/');
+ const char* name_end = strchr(name, '\n');
if (static_cast<size_t>(name_end - name) > this->extended_names_.size()
- || name_end[1] != '\n')
+ || name_end[-1] != '/')
{
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);
+ pname->assign(name, name_end - 1 - name);
+ if (nested_off != NULL)
+ *nested_off = y;
}
return member_size;
void
Archive::add_symbols(Symbol_table* symtab, Layout* layout,
- Input_objects* input_objects)
+ Input_objects* input_objects, Mapfile* mapfile)
{
- if (this->input_file_->options().include_whole_archive())
- return this->include_all_members(symtab, layout, input_objects);
+ if (this->input_file_->options().whole_archive())
+ return this->include_all_members(symtab, layout, input_objects,
+ mapfile);
+
+ input_objects->archive_start(this);
const size_t armap_size = this->armap_.size();
+ this->armap_[i].name_offset);
Symbol* sym = symtab->lookup(sym_name);
if (sym == NULL)
- continue;
+ {
+ // Check whether the symbol was named in a -u option.
+ if (!parameters->options().is_undefined(sym_name))
+ continue;
+ }
else if (!sym->is_undefined())
{
this->armap_checked_[i] = true;
last_seen_offset = this->armap_[i].file_offset;
this->seen_offsets_.insert(last_seen_offset);
this->armap_checked_[i] = true;
+
+ std::string why;
+ if (sym == NULL)
+ {
+ why = "-u ";
+ why += sym_name;
+ }
this->include_member(symtab, layout, input_objects,
- last_seen_offset);
+ last_seen_offset, mapfile, sym, why.c_str());
+
added_new_object = true;
}
}
while (added_new_object);
+
+ input_objects->archive_stop(this);
}
-// Include all the archive members in the link. This is for --whole-archive.
+// 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;
+ };
+
+ const_iterator(const Archive* archive, off_t off)
+ : 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.
+ const Archive* archive_;
+ // The current offset in the file.
+ off_t off_;
+ // The current archive header.
+ Header header_;
+};
+
+// Read the next archive header.
void
-Archive::include_all_members(Symbol_table* symtab, Layout* layout,
- Input_objects* input_objects)
+Archive::const_iterator::read_next_header()
{
- off_t off = sarmag;
- off_t filesize = this->input_file_->file().filesize();
+ off_t filesize = this->archive_->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;
- }
+ 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 hdr_buf[sizeof(Archive_header)];
- this->input_file_->file().read(off, sizeof(Archive_header), hdr_buf);
+ 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*>(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);
+ 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;
- off += sizeof(Archive_header) + size;
- if ((off & 1) != 0)
- ++off;
+ this->off_ += sizeof(Archive_header) + this->header_.size;
+ if ((this->off_ & 1) != 0)
+ ++this->off_;
}
}
+// Initial iterator.
+
+Archive::const_iterator
+Archive::begin() const
+{
+ return Archive::const_iterator(this, sarmag);
+}
+
+// Final iterator.
+
+Archive::const_iterator
+Archive::end() const
+{
+ return Archive::const_iterator(this, this->input_file_->file().filesize());
+}
+
+// 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, Mapfile* mapfile)
+{
+ input_objects->archive_start(this);
+
+ for (Archive::const_iterator p = this->begin();
+ p != this->end();
+ ++p)
+ this->include_member(symtab, layout, input_objects, p->off,
+ mapfile, NULL, "--whole-archive");
+
+ input_objects->archive_stop(this);
+}
+
+// Return the number of members in the archive. This is only used for
+// reports.
+
+size_t
+Archive::count_members() const
+{
+ size_t ret = 0;
+ for (Archive::const_iterator p = this->begin();
+ p != this->end();
+ ++p)
+ ++ret;
+ return ret;
+}
+
// Include an archive member in the link. OFF is the file offset of
-// the member header.
+// the member header. WHY is the reason we are including this member.
void
Archive::include_member(Symbol_table* symtab, Layout* layout,
- Input_objects* input_objects, off_t off)
+ Input_objects* input_objects, off_t off,
+ Mapfile* mapfile, Symbol* sym, const char* why)
{
std::string n;
- this->read_header(off, &n);
+ off_t nested_off;
+ this->read_header(off, false, &n, &nested_off);
+
+ if (mapfile != NULL)
+ mapfile->report_include_archive_member(this, n, sym, why);
- const off_t memoff = off + static_cast<off_t>(sizeof(Archive_header));
+ Input_file* input_file;
+ off_t memoff;
- // Read enough of the file to pick up the entire ELF header.
- unsigned char ehdr_buf[elfcpp::Elf_sizes<64>::ehdr_size];
+ if (!this->is_thin_archive_)
+ {
+ input_file = this->input_file_;
+ memoff = off + static_cast<off_t>(sizeof(Archive_header));
+ }
+ else
+ {
+ // Adjust a relative pathname so that it is relative
+ // to the directory containing the archive.
+ if (!IS_ABSOLUTE_PATH(n.c_str()))
+ {
+ const char *arch_path = this->name().c_str();
+ const char *basename = lbasename(arch_path);
+ if (basename > arch_path)
+ n.replace(0, 0, this->name().substr(0, basename - arch_path));
+ }
+ 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(n);
+ if (p != this->nested_archives_.end())
+ arch = p->second;
+ else
+ {
+ Input_file_argument* input_file_arg =
+ new Input_file_argument(n.c_str(), false, "", false,
+ parameters->options());
+ input_file = new Input_file(input_file_arg);
+ if (!input_file->open(parameters->options(), *this->dirpath_,
+ this->task_))
+ return;
+ arch = new Archive(n, input_file, false, this->dirpath_,
+ this->task_);
+ arch->setup();
+ std::pair<Nested_archive_table::iterator, bool> ins =
+ this->nested_archives_.insert(std::make_pair(n, arch));
+ gold_assert(ins.second);
+ }
+ arch->include_member(symtab, layout, input_objects, nested_off,
+ NULL, NULL, NULL);
+ return;
+ }
+ // This is an external member of a thin archive. Open the
+ // file as a regular relocatable object file.
+ Input_file_argument* input_file_arg =
+ new Input_file_argument(n.c_str(), false, "", false,
+ this->input_file_->options());
+ input_file = new Input_file(input_file_arg);
+ if (!input_file->open(parameters->options(), *this->dirpath_,
+ this->task_))
+ {
+ return;
+ }
+ memoff = 0;
+ }
- off_t filesize = this->input_file_->file().filesize();
+ off_t filesize = input_file->file().filesize();
int read_size = elfcpp::Elf_sizes<64>::ehdr_size;
if (filesize - memoff < read_size)
read_size = filesize - memoff;
return;
}
- this->input_file_->file().read(memoff, read_size, ehdr_buf);
+ const unsigned char* ehdr = input_file->file().get_view(memoff, 0, read_size,
+ true, false);
static unsigned char elfmagic[4] =
{
elfcpp::ELFMAG0, elfcpp::ELFMAG1,
elfcpp::ELFMAG2, elfcpp::ELFMAG3
};
- if (memcmp(ehdr_buf, elfmagic, 4) != 0)
+ if (memcmp(ehdr, elfmagic, 4) != 0)
{
gold_error(_("%s: member at %zu is not an ELF object"),
this->name().c_str(), static_cast<size_t>(off));
Object* obj = make_elf_object((std::string(this->input_file_->filename())
+ "(" + n + ")"),
- this->input_file_, memoff, ehdr_buf,
- read_size);
+ input_file, memoff, ehdr, 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(symtab, layout, &sd);
- obj->add_symbols(symtab, &sd);
+ if (this->is_thin_archive_)
+ {
+ // Opening the file locked it. Unlock it now.
+ input_file->file().unlock(this->task_);
+ }
}
// 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,
- File_read& file)
- : blocker_(token, workqueue), filelock_(file)
- { }
-
- private:
- Task_locker_block blocker_;
- Task_locker_obj<File_read> filelock_;
-};
-
-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_->file());
+ tl->add(this, this->next_blocker_);
+ tl->add(this, this->archive_->token());
}
void
Add_archive_symbols::run(Workqueue*)
{
this->archive_->add_symbols(this->symtab_, this->layout_,
- this->input_objects_);
+ this->input_objects_, this->mapfile_);
+
+ this->archive_->unlock_nested_archives();
+
+ this->archive_->release();
+ this->archive_->clear_uncached_views();
if (this->input_group_ != NULL)
this->input_group_->add_archive(this->archive_);
{
// We no longer need to know about this archive.
delete this->archive_;
+ this->archive_ = NULL;
}
}
projects / binutils-gdb.git / blobdiff