2006-08-05 01:10:59 +02:00
|
|
|
// fileread.cc -- read files for gold
|
|
|
|
|
2010-02-12 04:23:26 +01:00
|
|
|
// Copyright 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
|
2007-09-22 23:02:10 +02:00
|
|
|
// Written by Ian Lance Taylor <iant@google.com>.
|
|
|
|
|
|
|
|
// This file is part of gold.
|
|
|
|
|
|
|
|
// This program is free software; you can redistribute it and/or modify
|
|
|
|
// it under the terms of the GNU General Public License as published by
|
|
|
|
// the Free Software Foundation; either version 3 of the License, or
|
|
|
|
// (at your option) any later version.
|
|
|
|
|
|
|
|
// This program is distributed in the hope that it will be useful,
|
|
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
// GNU General Public License for more details.
|
|
|
|
|
|
|
|
// You should have received a copy of the GNU General Public License
|
|
|
|
// along with this program; if not, write to the Free Software
|
|
|
|
// Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
|
|
|
|
// MA 02110-1301, USA.
|
|
|
|
|
2006-08-05 01:10:59 +02:00
|
|
|
#include "gold.h"
|
|
|
|
|
|
|
|
#include <cstring>
|
|
|
|
#include <cerrno>
|
|
|
|
#include <fcntl.h>
|
|
|
|
#include <unistd.h>
|
2007-09-26 01:08:30 +02:00
|
|
|
#include <sys/mman.h>
|
2008-01-03 00:48:49 +01:00
|
|
|
#include <sys/uio.h>
|
2009-06-23 20:10:42 +02:00
|
|
|
#include <sys/stat.h>
|
2007-10-02 23:24:41 +02:00
|
|
|
#include "filenames.h"
|
2006-08-05 01:10:59 +02:00
|
|
|
|
2008-03-13 02:46:17 +01:00
|
|
|
#include "debug.h"
|
2008-02-08 08:06:58 +01:00
|
|
|
#include "parameters.h"
|
2006-08-05 01:10:59 +02:00
|
|
|
#include "options.h"
|
|
|
|
#include "dirsearch.h"
|
2008-02-08 08:06:58 +01:00
|
|
|
#include "target.h"
|
|
|
|
#include "binary.h"
|
2008-07-25 06:25:49 +02:00
|
|
|
#include "descriptors.h"
|
2010-02-12 04:23:26 +01:00
|
|
|
#include "gold-threads.h"
|
2006-08-05 01:10:59 +02:00
|
|
|
#include "fileread.h"
|
|
|
|
|
2009-10-10 01:20:44 +02:00
|
|
|
#ifndef HAVE_READV
|
|
|
|
struct iovec { void* iov_base; size_t iov_len };
|
|
|
|
ssize_t
|
|
|
|
readv(int, const iovec*, int)
|
|
|
|
{
|
|
|
|
gold_unreachable();
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2006-08-05 01:10:59 +02:00
|
|
|
namespace gold
|
|
|
|
{
|
|
|
|
|
|
|
|
// Class File_read::View.
|
|
|
|
|
|
|
|
File_read::View::~View()
|
|
|
|
{
|
2006-11-29 18:56:40 +01:00
|
|
|
gold_assert(!this->is_locked());
|
2009-10-28 01:42:34 +01:00
|
|
|
switch (this->data_ownership_)
|
2007-09-26 01:08:30 +02:00
|
|
|
{
|
2009-10-28 01:42:34 +01:00
|
|
|
case DATA_ALLOCATED_ARRAY:
|
|
|
|
delete[] this->data_;
|
|
|
|
break;
|
|
|
|
case DATA_MMAPPED:
|
2007-09-26 01:08:30 +02:00
|
|
|
if (::munmap(const_cast<unsigned char*>(this->data_), this->size_) != 0)
|
2007-10-14 08:49:14 +02:00
|
|
|
gold_warning(_("munmap failed: %s"), strerror(errno));
|
2007-10-12 07:51:25 +02:00
|
|
|
File_read::current_mapped_bytes -= this->size_;
|
2009-10-28 01:42:34 +01:00
|
|
|
break;
|
|
|
|
case DATA_NOT_OWNED:
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
gold_unreachable();
|
2007-09-26 01:08:30 +02:00
|
|
|
}
|
2006-08-05 01:10:59 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
File_read::View::lock()
|
|
|
|
{
|
|
|
|
++this->lock_count_;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
File_read::View::unlock()
|
|
|
|
{
|
2006-11-29 18:56:40 +01:00
|
|
|
gold_assert(this->lock_count_ > 0);
|
2006-08-05 01:10:59 +02:00
|
|
|
--this->lock_count_;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool
|
|
|
|
File_read::View::is_locked()
|
|
|
|
{
|
|
|
|
return this->lock_count_ > 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Class File_read.
|
|
|
|
|
2010-02-12 04:23:26 +01:00
|
|
|
// A lock for the File_read static variables.
|
|
|
|
static Lock* file_counts_lock = NULL;
|
|
|
|
static Initialize_lock file_counts_initialize_lock(&file_counts_lock);
|
|
|
|
|
2007-10-12 07:51:25 +02:00
|
|
|
// The File_read static variables.
|
|
|
|
unsigned long long File_read::total_mapped_bytes;
|
|
|
|
unsigned long long File_read::current_mapped_bytes;
|
|
|
|
unsigned long long File_read::maximum_mapped_bytes;
|
|
|
|
|
2006-08-05 01:10:59 +02:00
|
|
|
File_read::~File_read()
|
|
|
|
{
|
2007-12-14 20:00:21 +01:00
|
|
|
gold_assert(this->token_.is_writable());
|
2008-07-25 06:25:49 +02:00
|
|
|
if (this->is_descriptor_opened_)
|
2006-08-05 01:10:59 +02:00
|
|
|
{
|
2008-07-25 06:25:49 +02:00
|
|
|
release_descriptor(this->descriptor_, true);
|
2006-08-05 01:10:59 +02:00
|
|
|
this->descriptor_ = -1;
|
2008-07-25 06:25:49 +02:00
|
|
|
this->is_descriptor_opened_ = false;
|
2006-08-05 01:10:59 +02:00
|
|
|
}
|
|
|
|
this->name_.clear();
|
2010-03-10 18:37:11 +01:00
|
|
|
this->clear_views(CLEAR_VIEWS_ALL);
|
2006-08-05 01:10:59 +02:00
|
|
|
}
|
|
|
|
|
2006-12-01 00:52:50 +01:00
|
|
|
// Open the file.
|
|
|
|
|
2006-08-05 01:10:59 +02:00
|
|
|
bool
|
2007-12-14 20:00:21 +01:00
|
|
|
File_read::open(const Task* task, const std::string& name)
|
2006-08-05 01:10:59 +02:00
|
|
|
{
|
2007-12-14 20:00:21 +01:00
|
|
|
gold_assert(this->token_.is_writable()
|
2006-11-29 18:56:40 +01:00
|
|
|
&& this->descriptor_ < 0
|
2008-07-25 06:25:49 +02:00
|
|
|
&& !this->is_descriptor_opened_
|
2006-11-29 18:56:40 +01:00
|
|
|
&& this->name_.empty());
|
2006-08-05 01:10:59 +02:00
|
|
|
this->name_ = name;
|
2007-09-25 08:43:17 +02:00
|
|
|
|
2008-07-25 06:25:49 +02:00
|
|
|
this->descriptor_ = open_descriptor(-1, this->name_.c_str(),
|
|
|
|
O_RDONLY);
|
2007-09-25 08:43:17 +02:00
|
|
|
|
|
|
|
if (this->descriptor_ >= 0)
|
|
|
|
{
|
2008-07-25 06:25:49 +02:00
|
|
|
this->is_descriptor_opened_ = true;
|
2007-09-25 08:43:17 +02:00
|
|
|
struct stat s;
|
|
|
|
if (::fstat(this->descriptor_, &s) < 0)
|
2007-10-14 08:49:14 +02:00
|
|
|
gold_error(_("%s: fstat failed: %s"),
|
|
|
|
this->name_.c_str(), strerror(errno));
|
2007-09-25 08:43:17 +02:00
|
|
|
this->size_ = s.st_size;
|
2008-03-13 02:46:17 +01:00
|
|
|
gold_debug(DEBUG_FILES, "Attempt to open %s succeeded",
|
|
|
|
this->name_.c_str());
|
2008-08-21 02:30:13 +02:00
|
|
|
this->token_.add_writer(task);
|
|
|
|
}
|
2007-09-25 08:43:17 +02:00
|
|
|
|
2006-08-05 01:10:59 +02:00
|
|
|
return this->descriptor_ >= 0;
|
|
|
|
}
|
|
|
|
|
2008-02-08 08:06:58 +01:00
|
|
|
// Open the file with the contents in memory.
|
2006-12-01 00:52:50 +01:00
|
|
|
|
|
|
|
bool
|
2007-12-14 20:00:21 +01:00
|
|
|
File_read::open(const Task* task, const std::string& name,
|
|
|
|
const unsigned char* contents, off_t size)
|
2006-08-05 01:10:59 +02:00
|
|
|
{
|
2007-12-14 20:00:21 +01:00
|
|
|
gold_assert(this->token_.is_writable()
|
2006-12-01 00:52:50 +01:00
|
|
|
&& this->descriptor_ < 0
|
2008-07-25 06:25:49 +02:00
|
|
|
&& !this->is_descriptor_opened_
|
2006-12-01 00:52:50 +01:00
|
|
|
&& this->name_.empty());
|
|
|
|
this->name_ = name;
|
2009-10-28 01:42:34 +01:00
|
|
|
this->whole_file_view_ = new View(0, size, contents, 0, false,
|
|
|
|
View::DATA_NOT_OWNED);
|
2010-03-10 18:37:11 +01:00
|
|
|
this->add_view(this->whole_file_view_);
|
2007-09-25 08:43:17 +02:00
|
|
|
this->size_ = size;
|
2007-12-14 20:00:21 +01:00
|
|
|
this->token_.add_writer(task);
|
2006-12-01 00:52:50 +01:00
|
|
|
return true;
|
2006-08-05 01:10:59 +02:00
|
|
|
}
|
|
|
|
|
2008-07-25 06:25:49 +02:00
|
|
|
// Reopen a descriptor if necessary.
|
|
|
|
|
|
|
|
void
|
|
|
|
File_read::reopen_descriptor()
|
|
|
|
{
|
|
|
|
if (!this->is_descriptor_opened_)
|
|
|
|
{
|
|
|
|
this->descriptor_ = open_descriptor(this->descriptor_,
|
|
|
|
this->name_.c_str(),
|
|
|
|
O_RDONLY);
|
|
|
|
if (this->descriptor_ < 0)
|
|
|
|
gold_fatal(_("could not reopen file %s"), this->name_.c_str());
|
|
|
|
this->is_descriptor_opened_ = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-12-14 20:00:21 +01:00
|
|
|
// Release the file. This is called when we are done with the file in
|
|
|
|
// a Task.
|
|
|
|
|
2006-08-05 01:10:59 +02:00
|
|
|
void
|
2007-12-14 20:00:21 +01:00
|
|
|
File_read::release()
|
2006-08-05 01:10:59 +02:00
|
|
|
{
|
2007-12-14 20:00:21 +01:00
|
|
|
gold_assert(this->is_locked());
|
|
|
|
|
2010-02-12 04:23:26 +01:00
|
|
|
if (!parameters->options_valid() || parameters->options().stats())
|
|
|
|
{
|
|
|
|
file_counts_initialize_lock.initialize();
|
|
|
|
Hold_optional_lock hl(file_counts_lock);
|
|
|
|
File_read::total_mapped_bytes += this->mapped_bytes_;
|
|
|
|
File_read::current_mapped_bytes += this->mapped_bytes_;
|
|
|
|
if (File_read::current_mapped_bytes > File_read::maximum_mapped_bytes)
|
|
|
|
File_read::maximum_mapped_bytes = File_read::current_mapped_bytes;
|
|
|
|
}
|
|
|
|
|
2007-12-14 20:00:21 +01:00
|
|
|
this->mapped_bytes_ = 0;
|
|
|
|
|
2008-04-02 22:58:21 +02:00
|
|
|
// Only clear views if there is only one attached object. Otherwise
|
2008-07-25 06:25:49 +02:00
|
|
|
// we waste time trying to clear cached archive views. Similarly
|
|
|
|
// for releasing the descriptor.
|
2008-04-02 22:58:21 +02:00
|
|
|
if (this->object_count_ <= 1)
|
2008-07-25 06:25:49 +02:00
|
|
|
{
|
2010-03-10 18:37:11 +01:00
|
|
|
this->clear_views(CLEAR_VIEWS_NORMAL);
|
2008-07-25 06:25:49 +02:00
|
|
|
if (this->is_descriptor_opened_)
|
|
|
|
{
|
|
|
|
release_descriptor(this->descriptor_, false);
|
|
|
|
this->is_descriptor_opened_ = false;
|
|
|
|
}
|
|
|
|
}
|
2007-12-14 20:00:21 +01:00
|
|
|
|
|
|
|
this->released_ = true;
|
2006-08-05 01:10:59 +02:00
|
|
|
}
|
|
|
|
|
2007-12-14 20:00:21 +01:00
|
|
|
// Lock the file.
|
|
|
|
|
2006-08-05 01:10:59 +02:00
|
|
|
void
|
2007-12-14 20:00:21 +01:00
|
|
|
File_read::lock(const Task* task)
|
2006-08-05 01:10:59 +02:00
|
|
|
{
|
2007-12-14 20:00:21 +01:00
|
|
|
gold_assert(this->released_);
|
|
|
|
this->token_.add_writer(task);
|
|
|
|
this->released_ = false;
|
|
|
|
}
|
2007-10-12 07:51:25 +02:00
|
|
|
|
2007-12-14 20:00:21 +01:00
|
|
|
// Unlock the file.
|
|
|
|
|
|
|
|
void
|
|
|
|
File_read::unlock(const Task* task)
|
|
|
|
{
|
|
|
|
this->release();
|
|
|
|
this->token_.remove_writer(task);
|
2006-08-05 01:10:59 +02:00
|
|
|
}
|
|
|
|
|
2007-12-14 20:00:21 +01:00
|
|
|
// Return whether the file is locked.
|
|
|
|
|
2006-08-05 01:10:59 +02:00
|
|
|
bool
|
2007-12-14 19:50:01 +01:00
|
|
|
File_read::is_locked() const
|
2006-08-05 01:10:59 +02:00
|
|
|
{
|
2007-12-14 20:00:21 +01:00
|
|
|
if (!this->token_.is_writable())
|
|
|
|
return true;
|
|
|
|
// The file is not locked, so it should have been released.
|
|
|
|
gold_assert(this->released_);
|
|
|
|
return false;
|
2006-08-05 01:10:59 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
// See if we have a view which covers the file starting at START for
|
|
|
|
// SIZE bytes. Return a pointer to the View if found, NULL if not.
|
2008-04-02 22:58:21 +02:00
|
|
|
// If BYTESHIFT is not -1U, the returned View must have the specified
|
|
|
|
// byte shift; otherwise, it may have any byte shift. If VSHIFTED is
|
|
|
|
// not NULL, this sets *VSHIFTED to a view which would have worked if
|
|
|
|
// not for the requested BYTESHIFT.
|
2006-08-05 01:10:59 +02:00
|
|
|
|
2006-11-03 19:26:11 +01:00
|
|
|
inline File_read::View*
|
2008-04-02 22:58:21 +02:00
|
|
|
File_read::find_view(off_t start, section_size_type size,
|
|
|
|
unsigned int byteshift, File_read::View** vshifted) const
|
2006-08-05 01:10:59 +02:00
|
|
|
{
|
2008-04-02 22:58:21 +02:00
|
|
|
if (vshifted != NULL)
|
|
|
|
*vshifted = NULL;
|
|
|
|
|
2009-10-28 01:42:34 +01:00
|
|
|
// If we have the whole file mmapped, and the alignment is right,
|
|
|
|
// we can return it.
|
|
|
|
if (this->whole_file_view_)
|
|
|
|
if (byteshift == -1U || byteshift == 0)
|
|
|
|
return this->whole_file_view_;
|
|
|
|
|
2006-11-03 19:26:11 +01:00
|
|
|
off_t page = File_read::page_offset(start);
|
2008-01-03 00:48:49 +01:00
|
|
|
|
2008-04-02 22:58:21 +02:00
|
|
|
unsigned int bszero = 0;
|
|
|
|
Views::const_iterator p = this->views_.upper_bound(std::make_pair(page - 1,
|
|
|
|
bszero));
|
|
|
|
|
|
|
|
while (p != this->views_.end() && p->first.first <= page)
|
2008-01-03 00:48:49 +01:00
|
|
|
{
|
2008-04-02 22:58:21 +02:00
|
|
|
if (p->second->start() <= start
|
|
|
|
&& (p->second->start() + static_cast<off_t>(p->second->size())
|
|
|
|
>= start + static_cast<off_t>(size)))
|
|
|
|
{
|
|
|
|
if (byteshift == -1U || byteshift == p->second->byteshift())
|
|
|
|
{
|
|
|
|
p->second->set_accessed();
|
|
|
|
return p->second;
|
|
|
|
}
|
2008-01-03 00:48:49 +01:00
|
|
|
|
2008-04-02 22:58:21 +02:00
|
|
|
if (vshifted != NULL && *vshifted == NULL)
|
|
|
|
*vshifted = p->second;
|
|
|
|
}
|
2008-01-03 00:48:49 +01:00
|
|
|
|
2008-04-02 22:58:21 +02:00
|
|
|
++p;
|
|
|
|
}
|
2008-01-03 00:48:49 +01:00
|
|
|
|
2008-04-02 22:58:21 +02:00
|
|
|
return NULL;
|
2006-08-05 01:10:59 +02:00
|
|
|
}
|
|
|
|
|
2007-09-25 08:43:17 +02:00
|
|
|
// Read SIZE bytes from the file starting at offset START. Read into
|
2007-09-25 19:50:26 +02:00
|
|
|
// the buffer at P.
|
2006-08-05 01:10:59 +02:00
|
|
|
|
2007-09-25 19:50:26 +02:00
|
|
|
void
|
2008-07-25 06:25:49 +02:00
|
|
|
File_read::do_read(off_t start, section_size_type size, void* p)
|
2006-08-05 01:10:59 +02:00
|
|
|
{
|
2007-12-20 22:26:17 +01:00
|
|
|
ssize_t bytes;
|
2009-10-28 01:42:34 +01:00
|
|
|
if (this->whole_file_view_ != NULL)
|
2006-08-05 01:10:59 +02:00
|
|
|
{
|
2007-09-25 19:50:26 +02:00
|
|
|
bytes = this->size_ - start;
|
2007-12-20 22:26:17 +01:00
|
|
|
if (static_cast<section_size_type>(bytes) >= size)
|
2007-09-25 19:50:26 +02:00
|
|
|
{
|
2009-10-28 01:42:34 +01:00
|
|
|
memcpy(p, this->whole_file_view_->data() + start, size);
|
2007-09-25 19:50:26 +02:00
|
|
|
return;
|
|
|
|
}
|
2006-08-05 01:10:59 +02:00
|
|
|
}
|
2007-09-25 19:50:26 +02:00
|
|
|
else
|
2007-09-25 08:43:17 +02:00
|
|
|
{
|
2008-07-25 06:25:49 +02:00
|
|
|
this->reopen_descriptor();
|
2007-12-20 22:26:17 +01:00
|
|
|
bytes = ::pread(this->descriptor_, p, size, start);
|
|
|
|
if (static_cast<section_size_type>(bytes) == size)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (bytes < 0)
|
2007-09-25 19:50:26 +02:00
|
|
|
{
|
2007-10-14 08:49:14 +02:00
|
|
|
gold_fatal(_("%s: pread failed: %s"),
|
|
|
|
this->filename().c_str(), strerror(errno));
|
|
|
|
return;
|
2007-09-25 19:50:26 +02:00
|
|
|
}
|
2006-08-05 01:10:59 +02:00
|
|
|
}
|
2007-09-25 19:50:26 +02:00
|
|
|
|
2007-10-14 08:49:14 +02:00
|
|
|
gold_fatal(_("%s: file too short: read only %lld of %lld bytes at %lld"),
|
|
|
|
this->filename().c_str(),
|
|
|
|
static_cast<long long>(bytes),
|
|
|
|
static_cast<long long>(size),
|
|
|
|
static_cast<long long>(start));
|
2006-08-05 01:10:59 +02:00
|
|
|
}
|
|
|
|
|
2007-09-25 02:27:29 +02:00
|
|
|
// Read data from the file.
|
|
|
|
|
2006-08-05 01:10:59 +02:00
|
|
|
void
|
2008-07-25 06:25:49 +02:00
|
|
|
File_read::read(off_t start, section_size_type size, void* p)
|
2007-09-25 02:27:29 +02:00
|
|
|
{
|
2008-04-02 22:58:21 +02:00
|
|
|
const File_read::View* pv = this->find_view(start, size, -1U, NULL);
|
2007-09-25 02:27:29 +02:00
|
|
|
if (pv != NULL)
|
|
|
|
{
|
2008-04-02 22:58:21 +02:00
|
|
|
memcpy(p, pv->data() + (start - pv->start() + pv->byteshift()), size);
|
2007-09-25 02:27:29 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2007-09-25 19:50:26 +02:00
|
|
|
this->do_read(start, size, p);
|
2006-08-05 01:10:59 +02:00
|
|
|
}
|
|
|
|
|
2008-04-02 22:58:21 +02:00
|
|
|
// Add a new view. There may already be an existing view at this
|
|
|
|
// offset. If there is, the new view will be larger, and should
|
|
|
|
// replace the old view.
|
2006-08-05 01:10:59 +02:00
|
|
|
|
2008-04-02 22:58:21 +02:00
|
|
|
void
|
|
|
|
File_read::add_view(File_read::View* v)
|
2006-08-05 01:10:59 +02:00
|
|
|
{
|
2008-04-02 22:58:21 +02:00
|
|
|
std::pair<Views::iterator, bool> ins =
|
|
|
|
this->views_.insert(std::make_pair(std::make_pair(v->start(),
|
|
|
|
v->byteshift()),
|
|
|
|
v));
|
|
|
|
if (ins.second)
|
|
|
|
return;
|
|
|
|
|
|
|
|
// There was an existing view at this offset. It must not be large
|
|
|
|
// enough. We can't delete it here, since something might be using
|
|
|
|
// it; we put it on a list to be deleted when the file is unlocked.
|
|
|
|
File_read::View* vold = ins.first->second;
|
|
|
|
gold_assert(vold->size() < v->size());
|
|
|
|
if (vold->should_cache())
|
2008-01-03 00:48:49 +01:00
|
|
|
{
|
2008-04-02 22:58:21 +02:00
|
|
|
v->set_cache();
|
|
|
|
vold->clear_cache();
|
2008-01-03 00:48:49 +01:00
|
|
|
}
|
2008-04-02 22:58:21 +02:00
|
|
|
this->saved_views_.push_back(vold);
|
2008-01-03 00:48:49 +01:00
|
|
|
|
2008-04-02 22:58:21 +02:00
|
|
|
ins.first->second = v;
|
|
|
|
}
|
2006-11-03 19:26:11 +01:00
|
|
|
|
2008-04-02 22:58:21 +02:00
|
|
|
// Make a new view with a specified byteshift, reading the data from
|
|
|
|
// the file.
|
2006-11-03 19:26:11 +01:00
|
|
|
|
2008-04-02 22:58:21 +02:00
|
|
|
File_read::View*
|
|
|
|
File_read::make_view(off_t start, section_size_type size,
|
|
|
|
unsigned int byteshift, bool cache)
|
|
|
|
{
|
2008-06-25 19:10:08 +02:00
|
|
|
gold_assert(size > 0);
|
|
|
|
|
2008-09-10 19:56:02 +02:00
|
|
|
// Check that start and end of the view are within the file.
|
2008-09-16 19:17:22 +02:00
|
|
|
if (start > this->size_
|
|
|
|
|| (static_cast<unsigned long long>(size)
|
|
|
|
> static_cast<unsigned long long>(this->size_ - start)))
|
2008-09-10 19:56:02 +02:00
|
|
|
gold_fatal(_("%s: attempt to map %lld bytes at offset %lld exceeds "
|
|
|
|
"size of file; the file may be corrupt"),
|
|
|
|
this->filename().c_str(),
|
|
|
|
static_cast<long long>(size),
|
|
|
|
static_cast<long long>(start));
|
|
|
|
|
2008-04-02 22:58:21 +02:00
|
|
|
off_t poff = File_read::page_offset(start);
|
2006-11-03 19:26:11 +01:00
|
|
|
|
2007-12-20 22:21:24 +01:00
|
|
|
section_size_type psize = File_read::pages(size + (start - poff));
|
2006-08-05 01:10:59 +02:00
|
|
|
|
2007-12-22 00:08:25 +01:00
|
|
|
if (poff + static_cast<off_t>(psize) >= this->size_)
|
2007-09-25 08:43:17 +02:00
|
|
|
{
|
|
|
|
psize = this->size_ - poff;
|
2007-12-20 22:21:24 +01:00
|
|
|
gold_assert(psize >= size);
|
2007-09-25 08:43:17 +02:00
|
|
|
}
|
2006-11-03 19:26:11 +01:00
|
|
|
|
2008-04-02 22:58:21 +02:00
|
|
|
File_read::View* v;
|
2010-03-10 18:37:11 +01:00
|
|
|
if (byteshift != 0)
|
2007-09-26 01:08:30 +02:00
|
|
|
{
|
2008-04-02 22:58:21 +02:00
|
|
|
unsigned char* p = new unsigned char[psize + byteshift];
|
|
|
|
memset(p, 0, byteshift);
|
|
|
|
this->do_read(poff, psize, p + byteshift);
|
2009-10-28 01:42:34 +01:00
|
|
|
v = new File_read::View(poff, psize, p, byteshift, cache,
|
|
|
|
View::DATA_ALLOCATED_ARRAY);
|
2007-09-26 01:08:30 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2008-07-25 06:25:49 +02:00
|
|
|
this->reopen_descriptor();
|
2008-01-03 00:48:49 +01:00
|
|
|
void* p = ::mmap(NULL, psize, PROT_READ, MAP_PRIVATE,
|
2007-09-26 01:08:30 +02:00
|
|
|
this->descriptor_, poff);
|
|
|
|
if (p == MAP_FAILED)
|
2007-10-14 08:49:14 +02:00
|
|
|
gold_fatal(_("%s: mmap offset %lld size %lld failed: %s"),
|
|
|
|
this->filename().c_str(),
|
|
|
|
static_cast<long long>(poff),
|
|
|
|
static_cast<long long>(psize),
|
|
|
|
strerror(errno));
|
2007-09-26 01:08:30 +02:00
|
|
|
|
2007-10-12 07:51:25 +02:00
|
|
|
this->mapped_bytes_ += psize;
|
|
|
|
|
2007-09-26 01:08:30 +02:00
|
|
|
const unsigned char* pbytes = static_cast<const unsigned char*>(p);
|
2009-10-28 01:42:34 +01:00
|
|
|
v = new File_read::View(poff, psize, pbytes, 0, cache,
|
|
|
|
View::DATA_MMAPPED);
|
2007-09-26 01:08:30 +02:00
|
|
|
}
|
2006-11-03 19:26:11 +01:00
|
|
|
|
2008-04-02 22:58:21 +02:00
|
|
|
this->add_view(v);
|
|
|
|
|
2007-09-25 08:43:17 +02:00
|
|
|
return v;
|
2006-08-05 01:10:59 +02:00
|
|
|
}
|
|
|
|
|
2008-04-02 22:58:21 +02:00
|
|
|
// Find a View or make a new one, shifted as required by the file
|
|
|
|
// offset OFFSET and ALIGNED.
|
|
|
|
|
|
|
|
File_read::View*
|
|
|
|
File_read::find_or_make_view(off_t offset, off_t start,
|
|
|
|
section_size_type size, bool aligned, bool cache)
|
|
|
|
{
|
|
|
|
unsigned int byteshift;
|
|
|
|
if (offset == 0)
|
|
|
|
byteshift = 0;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
unsigned int target_size = (!parameters->target_valid()
|
|
|
|
? 64
|
|
|
|
: parameters->target().get_size());
|
|
|
|
byteshift = offset & ((target_size / 8) - 1);
|
|
|
|
|
|
|
|
// Set BYTESHIFT to the number of dummy bytes which must be
|
|
|
|
// inserted before the data in order for this data to be
|
|
|
|
// aligned.
|
|
|
|
if (byteshift != 0)
|
|
|
|
byteshift = (target_size / 8) - byteshift;
|
|
|
|
}
|
|
|
|
|
2010-03-10 18:37:11 +01:00
|
|
|
// If --map-whole-files is set, make sure we have a
|
|
|
|
// whole file view. Options may not yet be ready, e.g.,
|
|
|
|
// when reading a version script. We then default to
|
2010-03-24 02:27:57 +01:00
|
|
|
// --no-map-whole-files.
|
2010-03-10 18:37:11 +01:00
|
|
|
if (this->whole_file_view_ == NULL
|
|
|
|
&& parameters->options_valid()
|
|
|
|
&& parameters->options().map_whole_files())
|
|
|
|
this->whole_file_view_ = this->make_view(0, this->size_, 0, cache);
|
|
|
|
|
2008-04-02 22:58:21 +02:00
|
|
|
// Try to find a View with the required BYTESHIFT.
|
|
|
|
File_read::View* vshifted;
|
|
|
|
File_read::View* v = this->find_view(offset + start, size,
|
|
|
|
aligned ? byteshift : -1U,
|
|
|
|
&vshifted);
|
|
|
|
if (v != NULL)
|
|
|
|
{
|
|
|
|
if (cache)
|
|
|
|
v->set_cache();
|
|
|
|
return v;
|
|
|
|
}
|
|
|
|
|
|
|
|
// If VSHIFTED is not NULL, then it has the data we need, but with
|
|
|
|
// the wrong byteshift.
|
|
|
|
v = vshifted;
|
|
|
|
if (v != NULL)
|
|
|
|
{
|
|
|
|
gold_assert(aligned);
|
|
|
|
|
|
|
|
unsigned char* pbytes = new unsigned char[v->size() + byteshift];
|
|
|
|
memset(pbytes, 0, byteshift);
|
|
|
|
memcpy(pbytes + byteshift, v->data() + v->byteshift(), v->size());
|
|
|
|
|
2009-10-28 01:42:34 +01:00
|
|
|
File_read::View* shifted_view =
|
|
|
|
new File_read::View(v->start(), v->size(), pbytes, byteshift,
|
|
|
|
cache, View::DATA_ALLOCATED_ARRAY);
|
2008-04-02 22:58:21 +02:00
|
|
|
|
|
|
|
this->add_view(shifted_view);
|
|
|
|
return shifted_view;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Make a new view. If we don't need an aligned view, use a
|
|
|
|
// byteshift of 0, so that we can use mmap.
|
|
|
|
return this->make_view(offset + start, size,
|
|
|
|
aligned ? byteshift : 0,
|
|
|
|
cache);
|
|
|
|
}
|
|
|
|
|
2007-12-14 20:00:21 +01:00
|
|
|
// Get a view into the file.
|
2006-08-05 01:10:59 +02:00
|
|
|
|
|
|
|
const unsigned char*
|
2008-04-02 22:58:21 +02:00
|
|
|
File_read::get_view(off_t offset, off_t start, section_size_type size,
|
|
|
|
bool aligned, bool cache)
|
2007-09-25 02:27:29 +02:00
|
|
|
{
|
2008-04-02 22:58:21 +02:00
|
|
|
File_read::View* pv = this->find_or_make_view(offset, start, size,
|
|
|
|
aligned, cache);
|
|
|
|
return pv->data() + (offset + start - pv->start() + pv->byteshift());
|
2006-08-05 01:10:59 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
File_view*
|
2008-04-02 22:58:21 +02:00
|
|
|
File_read::get_lasting_view(off_t offset, off_t start, section_size_type size,
|
|
|
|
bool aligned, bool cache)
|
2006-08-05 01:10:59 +02:00
|
|
|
{
|
2008-04-02 22:58:21 +02:00
|
|
|
File_read::View* pv = this->find_or_make_view(offset, start, size,
|
|
|
|
aligned, cache);
|
2006-08-05 01:10:59 +02:00
|
|
|
pv->lock();
|
2008-04-02 22:58:21 +02:00
|
|
|
return new File_view(*this, pv,
|
|
|
|
(pv->data()
|
|
|
|
+ (offset + start - pv->start() + pv->byteshift())));
|
2006-08-05 01:10:59 +02:00
|
|
|
}
|
|
|
|
|
2008-01-03 00:48:49 +01:00
|
|
|
// Use readv to read COUNT entries from RM starting at START. BASE
|
|
|
|
// must be added to all file offsets in RM.
|
|
|
|
|
|
|
|
void
|
|
|
|
File_read::do_readv(off_t base, const Read_multiple& rm, size_t start,
|
|
|
|
size_t count)
|
|
|
|
{
|
|
|
|
unsigned char discard[File_read::page_size];
|
|
|
|
iovec iov[File_read::max_readv_entries * 2];
|
|
|
|
size_t iov_index = 0;
|
|
|
|
|
|
|
|
off_t first_offset = rm[start].file_offset;
|
|
|
|
off_t last_offset = first_offset;
|
|
|
|
ssize_t want = 0;
|
|
|
|
for (size_t i = 0; i < count; ++i)
|
|
|
|
{
|
|
|
|
const Read_multiple_entry& i_entry(rm[start + i]);
|
|
|
|
|
|
|
|
if (i_entry.file_offset > last_offset)
|
|
|
|
{
|
|
|
|
size_t skip = i_entry.file_offset - last_offset;
|
|
|
|
gold_assert(skip <= sizeof discard);
|
|
|
|
|
|
|
|
iov[iov_index].iov_base = discard;
|
|
|
|
iov[iov_index].iov_len = skip;
|
|
|
|
++iov_index;
|
|
|
|
|
|
|
|
want += skip;
|
|
|
|
}
|
|
|
|
|
|
|
|
iov[iov_index].iov_base = i_entry.buffer;
|
|
|
|
iov[iov_index].iov_len = i_entry.size;
|
|
|
|
++iov_index;
|
|
|
|
|
|
|
|
want += i_entry.size;
|
|
|
|
|
|
|
|
last_offset = i_entry.file_offset + i_entry.size;
|
|
|
|
}
|
|
|
|
|
2008-07-25 06:25:49 +02:00
|
|
|
this->reopen_descriptor();
|
|
|
|
|
2008-01-03 00:48:49 +01:00
|
|
|
gold_assert(iov_index < sizeof iov / sizeof iov[0]);
|
|
|
|
|
|
|
|
if (::lseek(this->descriptor_, base + first_offset, SEEK_SET) < 0)
|
|
|
|
gold_fatal(_("%s: lseek failed: %s"),
|
|
|
|
this->filename().c_str(), strerror(errno));
|
|
|
|
|
|
|
|
ssize_t got = ::readv(this->descriptor_, iov, iov_index);
|
|
|
|
|
|
|
|
if (got < 0)
|
|
|
|
gold_fatal(_("%s: readv failed: %s"),
|
|
|
|
this->filename().c_str(), strerror(errno));
|
|
|
|
if (got != want)
|
|
|
|
gold_fatal(_("%s: file too short: read only %zd of %zd bytes at %lld"),
|
|
|
|
this->filename().c_str(),
|
|
|
|
got, want, static_cast<long long>(base + first_offset));
|
|
|
|
}
|
|
|
|
|
|
|
|
// Read several pieces of data from the file.
|
|
|
|
|
|
|
|
void
|
|
|
|
File_read::read_multiple(off_t base, const Read_multiple& rm)
|
|
|
|
{
|
|
|
|
size_t count = rm.size();
|
|
|
|
size_t i = 0;
|
|
|
|
while (i < count)
|
|
|
|
{
|
|
|
|
// Find up to MAX_READV_ENTRIES consecutive entries which are
|
|
|
|
// less than one page apart.
|
|
|
|
const Read_multiple_entry& i_entry(rm[i]);
|
|
|
|
off_t i_off = i_entry.file_offset;
|
|
|
|
off_t end_off = i_off + i_entry.size;
|
|
|
|
size_t j;
|
|
|
|
for (j = i + 1; j < count; ++j)
|
|
|
|
{
|
|
|
|
if (j - i >= File_read::max_readv_entries)
|
|
|
|
break;
|
|
|
|
const Read_multiple_entry& j_entry(rm[j]);
|
|
|
|
off_t j_off = j_entry.file_offset;
|
|
|
|
gold_assert(j_off >= end_off);
|
|
|
|
off_t j_end_off = j_off + j_entry.size;
|
|
|
|
if (j_end_off - end_off >= File_read::page_size)
|
|
|
|
break;
|
|
|
|
end_off = j_end_off;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (j == i + 1)
|
|
|
|
this->read(base + i_off, i_entry.size, i_entry.buffer);
|
|
|
|
else
|
|
|
|
{
|
|
|
|
File_read::View* view = this->find_view(base + i_off,
|
2008-04-02 22:58:21 +02:00
|
|
|
end_off - i_off,
|
|
|
|
-1U, NULL);
|
2008-01-03 00:48:49 +01:00
|
|
|
if (view == NULL)
|
|
|
|
this->do_readv(base, rm, i, j - i);
|
|
|
|
else
|
|
|
|
{
|
|
|
|
const unsigned char* v = (view->data()
|
2008-04-02 22:58:21 +02:00
|
|
|
+ (base + i_off - view->start()
|
|
|
|
+ view->byteshift()));
|
2008-01-03 00:48:49 +01:00
|
|
|
for (size_t k = i; k < j; ++k)
|
|
|
|
{
|
|
|
|
const Read_multiple_entry& k_entry(rm[k]);
|
2008-01-03 00:55:37 +01:00
|
|
|
gold_assert((convert_to_section_size_type(k_entry.file_offset
|
|
|
|
- i_off)
|
|
|
|
+ k_entry.size)
|
|
|
|
<= convert_to_section_size_type(end_off
|
|
|
|
- i_off));
|
2008-01-03 00:48:49 +01:00
|
|
|
memcpy(k_entry.buffer,
|
|
|
|
v + (k_entry.file_offset - i_off),
|
|
|
|
k_entry.size);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
i = j;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Mark all views as no longer cached.
|
|
|
|
|
|
|
|
void
|
|
|
|
File_read::clear_view_cache_marks()
|
|
|
|
{
|
|
|
|
// Just ignore this if there are multiple objects associated with
|
|
|
|
// the file. Otherwise we will wind up uncaching and freeing some
|
|
|
|
// views for other objects.
|
|
|
|
if (this->object_count_ > 1)
|
|
|
|
return;
|
|
|
|
|
|
|
|
for (Views::iterator p = this->views_.begin();
|
|
|
|
p != this->views_.end();
|
|
|
|
++p)
|
|
|
|
p->second->clear_cache();
|
|
|
|
for (Saved_views::iterator p = this->saved_views_.begin();
|
|
|
|
p != this->saved_views_.end();
|
|
|
|
++p)
|
|
|
|
(*p)->clear_cache();
|
|
|
|
}
|
|
|
|
|
|
|
|
// Remove all the file views. For a file which has multiple
|
|
|
|
// associated objects (i.e., an archive), we keep accessed views
|
|
|
|
// around until next time, in the hopes that they will be useful for
|
|
|
|
// the next object.
|
2006-08-05 01:10:59 +02:00
|
|
|
|
|
|
|
void
|
2010-03-10 18:37:11 +01:00
|
|
|
File_read::clear_views(Clear_views_mode mode)
|
2006-08-05 01:10:59 +02:00
|
|
|
{
|
2010-03-10 18:37:11 +01:00
|
|
|
bool keep_files_mapped = (parameters->options_valid()
|
|
|
|
&& parameters->options().keep_files_mapped());
|
2007-12-10 23:55:31 +01:00
|
|
|
Views::iterator p = this->views_.begin();
|
|
|
|
while (p != this->views_.end())
|
2006-08-05 01:10:59 +02:00
|
|
|
{
|
2008-01-03 00:48:49 +01:00
|
|
|
bool should_delete;
|
2010-03-10 18:37:11 +01:00
|
|
|
if (p->second->is_locked() || p->second->is_permanent_view())
|
2008-01-03 00:48:49 +01:00
|
|
|
should_delete = false;
|
2010-03-10 18:37:11 +01:00
|
|
|
else if (mode == CLEAR_VIEWS_ALL)
|
2008-01-03 00:48:49 +01:00
|
|
|
should_delete = true;
|
2010-03-10 18:37:11 +01:00
|
|
|
else if (p->second->should_cache() && keep_files_mapped)
|
2008-01-03 00:48:49 +01:00
|
|
|
should_delete = false;
|
2010-03-10 18:37:11 +01:00
|
|
|
else if (this->object_count_ > 1
|
|
|
|
&& p->second->accessed()
|
|
|
|
&& mode != CLEAR_VIEWS_ARCHIVE)
|
2008-01-03 00:48:49 +01:00
|
|
|
should_delete = false;
|
|
|
|
else
|
|
|
|
should_delete = true;
|
|
|
|
|
|
|
|
if (should_delete)
|
2007-12-10 23:55:31 +01:00
|
|
|
{
|
2010-03-10 18:37:11 +01:00
|
|
|
if (p->second == this->whole_file_view_)
|
|
|
|
this->whole_file_view_ = NULL;
|
2007-12-10 23:55:31 +01:00
|
|
|
delete p->second;
|
|
|
|
|
|
|
|
// map::erase invalidates only the iterator to the deleted
|
|
|
|
// element.
|
|
|
|
Views::iterator pe = p;
|
|
|
|
++p;
|
|
|
|
this->views_.erase(pe);
|
|
|
|
}
|
2006-11-03 19:26:11 +01:00
|
|
|
else
|
2006-08-05 01:10:59 +02:00
|
|
|
{
|
2008-01-03 00:48:49 +01:00
|
|
|
p->second->clear_accessed();
|
2007-12-10 23:55:31 +01:00
|
|
|
++p;
|
2006-08-05 01:10:59 +02:00
|
|
|
}
|
2006-11-03 19:26:11 +01:00
|
|
|
}
|
|
|
|
|
2007-12-10 23:55:31 +01:00
|
|
|
Saved_views::iterator q = this->saved_views_.begin();
|
|
|
|
while (q != this->saved_views_.end())
|
2006-11-03 19:26:11 +01:00
|
|
|
{
|
2008-01-03 00:48:49 +01:00
|
|
|
if (!(*q)->is_locked())
|
2006-08-05 01:10:59 +02:00
|
|
|
{
|
2007-12-10 23:55:31 +01:00
|
|
|
delete *q;
|
|
|
|
q = this->saved_views_.erase(q);
|
2006-11-03 19:26:11 +01:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2010-03-10 18:37:11 +01:00
|
|
|
gold_assert(mode != CLEAR_VIEWS_ALL);
|
2007-12-10 23:55:31 +01:00
|
|
|
++q;
|
2006-08-05 01:10:59 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-10-12 07:51:25 +02:00
|
|
|
// Print statistical information to stderr. This is used for --stats.
|
|
|
|
|
|
|
|
void
|
|
|
|
File_read::print_stats()
|
|
|
|
{
|
|
|
|
fprintf(stderr, _("%s: total bytes mapped for read: %llu\n"),
|
|
|
|
program_name, File_read::total_mapped_bytes);
|
|
|
|
fprintf(stderr, _("%s: maximum bytes mapped for read at one time: %llu\n"),
|
|
|
|
program_name, File_read::maximum_mapped_bytes);
|
|
|
|
}
|
|
|
|
|
2006-08-05 01:10:59 +02:00
|
|
|
// Class File_view.
|
|
|
|
|
|
|
|
File_view::~File_view()
|
|
|
|
{
|
2006-11-29 18:56:40 +01:00
|
|
|
gold_assert(this->file_.is_locked());
|
2006-08-05 01:10:59 +02:00
|
|
|
this->view_->unlock();
|
|
|
|
}
|
|
|
|
|
|
|
|
// Class Input_file.
|
|
|
|
|
2006-12-01 00:52:50 +01:00
|
|
|
// Create a file for testing.
|
|
|
|
|
2009-12-14 20:53:05 +01:00
|
|
|
Input_file::Input_file(const Task* task, const char* name,
|
2007-12-14 20:00:21 +01:00
|
|
|
const unsigned char* contents, off_t size)
|
2006-12-01 00:52:50 +01:00
|
|
|
: file_()
|
|
|
|
{
|
|
|
|
this->input_argument_ =
|
2009-12-14 20:53:05 +01:00
|
|
|
new Input_file_argument(name, Input_file_argument::INPUT_FILE_TYPE_FILE,
|
2009-10-10 09:39:04 +02:00
|
|
|
"", false, Position_dependent_options());
|
2009-12-14 20:53:05 +01:00
|
|
|
bool ok = this->file_.open(task, name, contents, size);
|
2006-12-01 00:52:50 +01:00
|
|
|
gold_assert(ok);
|
|
|
|
}
|
|
|
|
|
2008-01-19 00:26:48 +01:00
|
|
|
// Return the position dependent options in force for this file.
|
|
|
|
|
|
|
|
const Position_dependent_options&
|
|
|
|
Input_file::options() const
|
|
|
|
{
|
|
|
|
return this->input_argument_->options();
|
|
|
|
}
|
|
|
|
|
|
|
|
// Return the name given by the user. For -lc this will return "c".
|
|
|
|
|
|
|
|
const char*
|
|
|
|
Input_file::name() const
|
2008-02-07 02:51:25 +01:00
|
|
|
{
|
|
|
|
return this->input_argument_->name();
|
|
|
|
}
|
|
|
|
|
2009-02-28 05:39:57 +01:00
|
|
|
// Return whether this file is in a system directory.
|
|
|
|
|
|
|
|
bool
|
|
|
|
Input_file::is_in_system_directory() const
|
|
|
|
{
|
|
|
|
if (this->is_in_sysroot())
|
|
|
|
return true;
|
|
|
|
return parameters->options().is_in_system_directory(this->filename());
|
|
|
|
}
|
|
|
|
|
2008-02-07 02:51:25 +01:00
|
|
|
// Return whether we are only reading symbols.
|
|
|
|
|
|
|
|
bool
|
|
|
|
Input_file::just_symbols() const
|
|
|
|
{
|
|
|
|
return this->input_argument_->just_symbols();
|
|
|
|
}
|
2008-01-19 00:26:48 +01: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 06:56:46 +01:00
|
|
|
// Return whether this is a file that we will search for in the list
|
|
|
|
// of directories.
|
|
|
|
|
|
|
|
bool
|
|
|
|
Input_file::will_search_for() const
|
|
|
|
{
|
|
|
|
return (!IS_ABSOLUTE_PATH(this->input_argument_->name())
|
|
|
|
&& (this->input_argument_->is_lib()
|
2009-10-10 09:39:04 +02:00
|
|
|
|| this->input_argument_->is_searched_file()
|
* readsyms.cc (Read_symbols::incompatible_warning): New function.
(Read_symbols::requeue): New function.
(Read_symbols::do_read_symbols): If make_elf_object fails because
the target type is not configured, and the file was searched for,
issue a warning and retry with the next directory.
(Add_symbols::run): If the file has an incompatible format, and
it was searched for, requeue the Read_symbols task. On error,
release the object.
* readsyms.h (class Read_symbols): Add dirindex_ field. Add
dirindex parameter to constructor. Change all callers. Declare
incompatible_warning and requeue.
(class Add_symbols): Add dirpath_, dirindex_, mapfile_,
input_argument_ and input_group_ fields. Add them to
constructor. Change all callers.
(class Read_script): Add dirindex_ field. Add it to constructor.
Change all callers.
* archive.cc (Archive::setup): Remove input_objects parameter.
Change all callers.
(Archive::get_file_and_offset): Likewise.
(Archive::read_all_symbols): Likewise.
(Archive::read_symbols): Likewise.
(Archive::get_elf_object_for_member): Remove input_objects
parameter. Add punconfigured parameter. Change all callers.
(Archive::add_symbols): Change return type to bool. Check return
value of include_member.
(Archive::include_all_members): Likewise.
(Archive::include_member): Change return type to bool. Return
false if first included object has incompatible target. Set
included_member_ field.
(Add_archive_symbols::run): If add_symbols returns false, requeue
Read_symbols task.
* archive.h (class Archive): Add included_member_ field.
Initialize it in constructor. Add input_file and searched_for
methods. Update declarations.
(class Add_archive_symbols): Add dirpath_, dirindex_, and
input_argument_ fields. Add them to constructor. Change all
callers.
* script.cc: Include "target-select.h".
(class Parser_closure): Add skip_on_incompatible_target_ and
found_incompatible_target_ fields. Add
skip_on_incompatible_target parameter to constructor. Change all
callers. Add methods skip_on_incompatible_target,
clear_skip_on_incompatible_target, found_incompatible_target, and
set_found_incompatible_target.
(read_input_script): Add dirindex parameter. Change all callers.
If parser finds an incompatible target, requeue Read_symbols
task.
(script_set_symbol): Clear skip_on_incompatible_target in
closure.
(script_add_assertion, script_parse_option): Likewise.
(script_start_sections, script_add_phdr): Likewise.
(script_check_output_format): New function.
* script.h (read_input_script): Update declaration.
* script-c.h (script_check_output_format): Declare.
* yyscript.y (file_cmd): Handle OUTPUT_FORMAT.
(ignore_cmd): Remove OUTPUT_FORMAT.
* fileread.cc (Input_file::Input_file): Add explicit this.
(Input_file::will_search_for): New function.
(Input_file::open): Add pindex parameter. Change all callers.
* fileread.h (class Input_file): Add input_file_argument method.
Declare will_search_for. Update declarations.
* object.cc (make_elf_object): Add punconfigured parameter.
Change all callers.
* object.h (class Object): Make input_file public. Add
searched_for method.
(make_elf_object): Update declaration.
* dirsearch.cc (Dirsearch::find): Add pindex parameter. Use it to
restart search.
* dirsearch.h (class Dirsearch): Update declaration.
* options.h (class General_options): Add --warn-search-mismatch.
* parameters.cc (Parameters::is_compatible_target): New function.
* parameters.h (class Parameters): Declare is_compatible_target.
* workqueue.cc (Workqueue::add_blocker): New function.
* workqueue.h (class Workqueue): Declare add_blocker.
2009-03-14 06:56:46 +01:00
|
|
|
|| this->input_argument_->extra_search_path() != NULL));
|
|
|
|
}
|
|
|
|
|
2009-07-07 01:11:21 +02:00
|
|
|
// Return the file last modification time. Calls gold_fatal if the stat
|
|
|
|
// system call failed.
|
|
|
|
|
|
|
|
Timespec
|
|
|
|
File_read::get_mtime()
|
|
|
|
{
|
|
|
|
struct stat file_stat;
|
|
|
|
this->reopen_descriptor();
|
|
|
|
|
|
|
|
if (fstat(this->descriptor_, &file_stat) < 0)
|
|
|
|
gold_fatal(_("%s: stat failed: %s"), this->name_.c_str(),
|
|
|
|
strerror(errno));
|
2009-11-06 16:47:06 +01:00
|
|
|
#ifdef HAVE_STAT_ST_MTIM
|
|
|
|
return Timespec(file_stat.st_mtim.tv_sec, file_stat.st_mtim.tv_nsec);
|
|
|
|
#else
|
2009-07-07 01:11:21 +02:00
|
|
|
return Timespec(file_stat.st_mtime, 0);
|
2009-11-06 16:47:06 +01:00
|
|
|
#endif
|
2009-07-07 01:11:21 +02:00
|
|
|
}
|
|
|
|
|
2006-12-01 00:52:50 +01:00
|
|
|
// Open the file.
|
|
|
|
|
2007-10-02 23:24:41 +02:00
|
|
|
// If the filename is not absolute, we assume it is in the current
|
|
|
|
// directory *except* when:
|
2009-10-10 09:39:04 +02:00
|
|
|
// A) input_argument_->is_lib() is true;
|
|
|
|
// B) input_argument_->is_searched_file() is true; or
|
|
|
|
// C) input_argument_->extra_search_path() is not empty.
|
|
|
|
// In each, we look in extra_search_path + library_path to find
|
2007-10-02 23:24:41 +02:00
|
|
|
// the file location, rather than the current directory.
|
|
|
|
|
2007-10-14 08:49:14 +02:00
|
|
|
bool
|
* 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 06:56:46 +01:00
|
|
|
Input_file::open(const Dirsearch& dirpath, const Task* task, int *pindex)
|
2006-08-05 01:10:59 +02:00
|
|
|
{
|
2009-12-14 20:53:05 +01:00
|
|
|
std::string name;
|
2007-10-02 23:24:41 +02:00
|
|
|
|
|
|
|
// Case 1: name is an absolute file, just try to open it
|
2009-10-10 09:39:04 +02:00
|
|
|
// Case 2: name is relative but is_lib is false, is_searched_file is false,
|
|
|
|
// and extra_search_path is empty
|
* 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 06:56:46 +01:00
|
|
|
if (IS_ABSOLUTE_PATH(this->input_argument_->name())
|
2007-10-02 23:24:41 +02:00
|
|
|
|| (!this->input_argument_->is_lib()
|
2009-10-10 09:39:04 +02:00
|
|
|
&& !this->input_argument_->is_searched_file()
|
2007-10-02 23:24:41 +02:00
|
|
|
&& this->input_argument_->extra_search_path() == NULL))
|
2007-10-09 19:46:15 +02:00
|
|
|
{
|
2009-12-14 20:53:05 +01:00
|
|
|
name = this->input_argument_->name();
|
|
|
|
this->found_name_ = name;
|
2007-10-09 19:46:15 +02:00
|
|
|
}
|
2009-10-10 09:39:04 +02:00
|
|
|
// Case 3: is_lib is true or is_searched_file is true
|
|
|
|
else if (this->input_argument_->is_lib()
|
|
|
|
|| this->input_argument_->is_searched_file())
|
2006-08-05 01:10:59 +02:00
|
|
|
{
|
2007-10-02 23:24:41 +02:00
|
|
|
// We don't yet support extra_search_path with -l.
|
|
|
|
gold_assert(this->input_argument_->extra_search_path() == NULL);
|
2009-10-10 09:39:04 +02:00
|
|
|
std::string n1, n2;
|
|
|
|
if (this->input_argument_->is_lib())
|
2006-11-06 23:46:08 +01:00
|
|
|
{
|
2009-10-10 09:39:04 +02:00
|
|
|
n1 = "lib";
|
|
|
|
n1 += this->input_argument_->name();
|
|
|
|
if (parameters->options().is_static()
|
|
|
|
|| !this->input_argument_->options().Bdynamic())
|
|
|
|
n1 += ".a";
|
|
|
|
else
|
|
|
|
{
|
|
|
|
n2 = n1 + ".a";
|
|
|
|
n1 += ".so";
|
|
|
|
}
|
2006-11-06 23:46:08 +01:00
|
|
|
}
|
2009-10-10 09:39:04 +02:00
|
|
|
else
|
|
|
|
n1 = this->input_argument_->name();
|
2009-12-14 20:53:05 +01:00
|
|
|
name = dirpath.find(n1, n2, &this->is_in_sysroot_, pindex);
|
|
|
|
if (name.empty())
|
2006-08-05 01:10:59 +02:00
|
|
|
{
|
2009-10-10 09:39:04 +02:00
|
|
|
gold_error(_("cannot find %s%s"),
|
|
|
|
this->input_argument_->is_lib() ? "-l" : "",
|
2007-10-14 08:49:14 +02:00
|
|
|
this->input_argument_->name());
|
|
|
|
return false;
|
2006-08-05 01:10:59 +02:00
|
|
|
}
|
2009-12-14 20:53:05 +01:00
|
|
|
if (n2.empty() || name[name.length() - 1] == 'o')
|
2007-10-09 19:46:15 +02:00
|
|
|
this->found_name_ = n1;
|
|
|
|
else
|
|
|
|
this->found_name_ = n2;
|
2006-08-05 01:10:59 +02:00
|
|
|
}
|
2007-10-02 23:24:41 +02:00
|
|
|
// Case 4: extra_search_path is not empty
|
|
|
|
else
|
|
|
|
{
|
|
|
|
gold_assert(this->input_argument_->extra_search_path() != NULL);
|
|
|
|
|
|
|
|
// First, check extra_search_path.
|
2009-12-14 20:53:05 +01:00
|
|
|
name = this->input_argument_->extra_search_path();
|
|
|
|
if (!IS_DIR_SEPARATOR (name[name.length() - 1]))
|
|
|
|
name += '/';
|
|
|
|
name += this->input_argument_->name();
|
2007-10-02 23:24:41 +02:00
|
|
|
struct stat dummy_stat;
|
2009-12-14 20:53:05 +01:00
|
|
|
if (*pindex > 0 || ::stat(name.c_str(), &dummy_stat) < 0)
|
2007-10-02 23:24:41 +02:00
|
|
|
{
|
|
|
|
// extra_search_path failed, so check the normal search-path.
|
* 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 06:56:46 +01:00
|
|
|
int index = *pindex;
|
|
|
|
if (index > 0)
|
|
|
|
--index;
|
2009-12-14 20:53:05 +01:00
|
|
|
name = dirpath.find(this->input_argument_->name(), "",
|
|
|
|
&this->is_in_sysroot_, &index);
|
|
|
|
if (name.empty())
|
2007-10-02 23:24:41 +02:00
|
|
|
{
|
2007-10-14 08:57:58 +02:00
|
|
|
gold_error(_("cannot find %s"),
|
2007-10-14 08:49:14 +02:00
|
|
|
this->input_argument_->name());
|
|
|
|
return false;
|
2007-10-02 23:24:41 +02: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 06:56:46 +01:00
|
|
|
*pindex = index + 1;
|
2007-10-02 23:24:41 +02:00
|
|
|
}
|
2007-10-09 19:46:15 +02:00
|
|
|
this->found_name_ = this->input_argument_->name();
|
2007-10-02 23:24:41 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
// Now that we've figured out where the file lives, try to open it.
|
2008-02-08 08:06:58 +01:00
|
|
|
|
|
|
|
General_options::Object_format format =
|
2008-03-04 19:21:43 +01:00
|
|
|
this->input_argument_->options().format_enum();
|
2008-02-08 08:06:58 +01:00
|
|
|
bool ok;
|
|
|
|
if (format == General_options::OBJECT_FORMAT_ELF)
|
2010-02-24 21:50:59 +01:00
|
|
|
{
|
|
|
|
ok = this->file_.open(task, name);
|
|
|
|
this->format_ = FORMAT_ELF;
|
|
|
|
}
|
2008-02-08 08:06:58 +01:00
|
|
|
else
|
|
|
|
{
|
|
|
|
gold_assert(format == General_options::OBJECT_FORMAT_BINARY);
|
2009-12-14 20:53:05 +01:00
|
|
|
ok = this->open_binary(task, name);
|
2010-02-24 21:50:59 +01:00
|
|
|
this->format_ = FORMAT_BINARY;
|
2008-02-08 08:06:58 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!ok)
|
2006-08-05 01:10:59 +02:00
|
|
|
{
|
2007-10-14 08:57:58 +02:00
|
|
|
gold_error(_("cannot open %s: %s"),
|
2009-12-14 20:53:05 +01:00
|
|
|
name.c_str(), strerror(errno));
|
2010-02-24 21:50:59 +01:00
|
|
|
this->format_ = FORMAT_NONE;
|
2007-10-14 08:49:14 +02:00
|
|
|
return false;
|
2006-08-05 01:10:59 +02:00
|
|
|
}
|
2007-10-14 08:49:14 +02:00
|
|
|
|
|
|
|
return true;
|
2006-08-05 01:10:59 +02:00
|
|
|
}
|
|
|
|
|
2008-02-08 08:06:58 +01:00
|
|
|
// Open a file for --format binary.
|
|
|
|
|
|
|
|
bool
|
2009-12-14 20:53:05 +01:00
|
|
|
Input_file::open_binary(const Task* task, const std::string& name)
|
2008-02-08 08:06:58 +01:00
|
|
|
{
|
|
|
|
// In order to open a binary file, we need machine code, size, and
|
2008-02-13 03:44:50 +01:00
|
|
|
// endianness. We may not have a valid target at this point, in
|
|
|
|
// which case we use the default target.
|
2009-10-01 00:21:13 +02:00
|
|
|
parameters_force_valid_target();
|
|
|
|
const Target& target(parameters->target());
|
2008-02-08 08:06:58 +01:00
|
|
|
|
2009-10-01 00:21:13 +02:00
|
|
|
Binary_to_elf binary_to_elf(target.machine_code(),
|
|
|
|
target.get_size(),
|
|
|
|
target.is_big_endian(),
|
2009-12-14 20:53:05 +01:00
|
|
|
name);
|
2008-02-08 08:06:58 +01:00
|
|
|
if (!binary_to_elf.convert(task))
|
|
|
|
return false;
|
2009-12-14 20:53:05 +01:00
|
|
|
return this->file_.open(task, name, binary_to_elf.converted_data_leak(),
|
2008-02-08 08:06:58 +01:00
|
|
|
binary_to_elf.converted_size());
|
|
|
|
}
|
|
|
|
|
2006-08-05 01:10:59 +02:00
|
|
|
} // End namespace gold.
|