#include "elfcpp.h"
#include "parameters.h"
-#include "options.h"
#include "script.h"
#include "symtab.h"
#include "dynobj.h"
// based on the number of symbols there are. If there are fewer
// than 3 symbols we use 1 bucket, fewer than 17 symbols we use 3
// buckets, fewer than 37 we use 17 buckets, and so forth. We never
- // use more than 32771 buckets. This is straight from the old GNU
+ // use more than 262147 buckets. This is straight from the old GNU
// linker.
static const unsigned int buckets[] =
{
1, 3, 17, 37, 67, 97, 131, 197, 263, 521, 1031, 2053, 4099, 8209,
- 16411, 32771
+ 16411, 32771, 65537, 131101, 262147
};
const int buckets_count = sizeof buckets / sizeof buckets[0];
unsigned int symcount = hashcodes.size();
unsigned int ret = 1;
+ const double full_fraction
+ = 1.0 - parameters->options().hash_bucket_empty_fraction();
for (int i = 0; i < buckets_count; ++i)
{
- if (symcount < buckets[i])
+ if (symcount < buckets[i] * full_fraction)
break;
ret = buckets[i];
}
* 4);
unsigned char* phash = new unsigned char[hashlen];
- if (parameters->is_big_endian())
+ if (parameters->target().is_big_endian())
{
#if defined(HAVE_TARGET_32_BIG) || defined(HAVE_TARGET_64_BIG)
Dynobj::sized_create_elf_hash_table<true>(bucket, chain, phash,
// For the actual data generation we call out to a templatized
// function.
- int size = parameters->get_size();
- bool big_endian = parameters->is_big_endian();
+ int size = parameters->target().get_size();
+ bool big_endian = parameters->target().is_big_endian();
if (size == 32)
{
if (big_endian)
template<int size, bool big_endian>
unsigned char*
-Verdef::write(const Stringpool* dynpool, bool is_last, unsigned char* pb
- ACCEPT_SIZE_ENDIAN) const
+Verdef::write(const Stringpool* dynpool, bool is_last, unsigned char* pb) const
{
const int verdef_size = elfcpp::Elf_sizes<size>::verdef_size;
const int verdaux_size = elfcpp::Elf_sizes<size>::verdaux_size;
template<int size, bool big_endian>
unsigned char*
Verneed::write(const Stringpool* dynpool, bool is_last,
- unsigned char* pb ACCEPT_SIZE_ENDIAN) const
+ unsigned char* pb) const
{
const int verneed_size = elfcpp::Elf_sizes<size>::verneed_size;
const int vernaux_size = elfcpp::Elf_sizes<size>::vernaux_size;
// Versions methods.
-Versions::Versions(const General_options& options, Stringpool* dynpool)
+Versions::Versions(const Version_script_info& version_script,
+ Stringpool* dynpool)
: defs_(), needs_(), version_table_(),
- is_finalized_(false), version_script_(options.version_script())
+ is_finalized_(false), version_script_(version_script)
{
// We always need a base version, so define that first. Nothing
// explicitly declares itself as part of base, so it doesn't need to
- // be in version_table_.
+ // be in version_table_.
// FIXME: Should use soname here when creating a shared object. Is
// this fixme still valid? It looks like it's doing the right thing
// to me.
- if (parameters->output_is_shared())
+ if (parameters->options().shared())
{
- const char* name = dynpool->add(parameters->output_file_name(),
+ const char* name = dynpool->add(parameters->options().output_file_name(),
false, NULL);
Verdef* vdbase = new Verdef(name, std::vector<std::string>(),
true, false, true);
true, &version_key);
Verdef* const vd = new Verdef(
version,
- options.version_script().get_dependencies(version),
+ this->version_script_.get_dependencies(version),
false, false, false);
this->defs_.push_back(vd);
Key key(version_key, 0);
{
gold_assert(!this->is_finalized_);
gold_assert(sym->version() != NULL);
-
+
Stringpool::Key version_key;
const char* version = dynpool->add(sym->version(), false, &version_key);
if (!sym->is_from_dynobj() && !sym->is_copied_from_dynobj())
{
- if (parameters->output_is_shared())
+ if (parameters->options().shared())
this->add_def(sym, version, version_key);
}
else
// If we are creating a shared object, it is an error to
// find a definition of a symbol with a version which is not
// in the version script.
- if (parameters->output_is_shared())
+ if (parameters->options().shared())
{
gold_error(_("symbol %s has undefined version %s"),
sym->demangled_name().c_str(), version);
elfcpp::STT_OBJECT,
elfcpp::STB_GLOBAL,
elfcpp::STV_DEFAULT, 0,
- false);
+ false, false);
vsym->set_needs_dynsym_entry();
vsym->set_dynsym_index(dynsym_index);
++dynsym_index;
Key k;
if (!sym->is_from_dynobj() && !sym->is_copied_from_dynobj())
{
- if (!parameters->output_is_shared())
+ if (!parameters->options().shared())
return elfcpp::VER_NDX_GLOBAL;
k = Key(version_key, 0);
}
unsigned int local_symcount,
const std::vector<Symbol*>& syms,
unsigned char** pp,
- unsigned int* psize
- ACCEPT_SIZE_ENDIAN) const
+ unsigned int* psize) const
{
gold_assert(this->is_finalized_);
void
Versions::def_section_contents(const Stringpool* dynpool,
unsigned char** pp, unsigned int* psize,
- unsigned int* pentries
- ACCEPT_SIZE_ENDIAN) const
+ unsigned int* pentries) const
{
gold_assert(this->is_finalized_);
gold_assert(!this->defs_.empty());
for (p = this->defs_.begin(), i = 0;
p != this->defs_.end();
++p, ++i)
- pb = (*p)->write SELECT_SIZE_ENDIAN_NAME(size, big_endian)(
- dynpool, i + 1 >= this->defs_.size(), pb
- SELECT_SIZE_ENDIAN(size, big_endian));
+ pb = (*p)->write<size, big_endian>(dynpool,
+ i + 1 >= this->defs_.size(),
+ pb);
gold_assert(static_cast<unsigned int>(pb - pbuf) == sz);
void
Versions::need_section_contents(const Stringpool* dynpool,
unsigned char** pp, unsigned int *psize,
- unsigned int *pentries
- ACCEPT_SIZE_ENDIAN) const
+ unsigned int *pentries) const
{
gold_assert(this->is_finalized_);
gold_assert(!this->needs_.empty());
for (p = this->needs_.begin(), i = 0;
p != this->needs_.end();
++p, ++i)
- pb = (*p)->write SELECT_SIZE_ENDIAN_NAME(size, big_endian)(
- dynpool, i + 1 >= this->needs_.size(), pb
- SELECT_SIZE_ENDIAN(size, big_endian));
+ pb = (*p)->write<size, big_endian>(dynpool,
+ i + 1 >= this->needs_.size(),
+ pb);
gold_assert(static_cast<unsigned int>(pb - pbuf) == sz);
unsigned int,
const std::vector<Symbol*>&,
unsigned char**,
- unsigned int*
- ACCEPT_SIZE_ENDIAN_EXPLICIT(32, false)) const;
+ unsigned int*) const;
#endif
#ifdef HAVE_TARGET_32_BIG
unsigned int,
const std::vector<Symbol*>&,
unsigned char**,
- unsigned int*
- ACCEPT_SIZE_ENDIAN_EXPLICIT(32, true)) const;
+ unsigned int*) const;
#endif
#ifdef HAVE_TARGET_64_LITTLE
unsigned int,
const std::vector<Symbol*>&,
unsigned char**,
- unsigned int*
- ACCEPT_SIZE_ENDIAN_EXPLICIT(64, false)) const;
+ unsigned int*) const;
#endif
#ifdef HAVE_TARGET_64_BIG
unsigned int,
const std::vector<Symbol*>&,
unsigned char**,
- unsigned int*
- ACCEPT_SIZE_ENDIAN_EXPLICIT(64, true)) const;
+ unsigned int*) const;
#endif
#ifdef HAVE_TARGET_32_LITTLE
const Stringpool*,
unsigned char**,
unsigned int*,
- unsigned int*
- ACCEPT_SIZE_ENDIAN_EXPLICIT(32, false)) const;
+ unsigned int*) const;
#endif
#ifdef HAVE_TARGET_32_BIG
const Stringpool*,
unsigned char**,
unsigned int*,
- unsigned int*
- ACCEPT_SIZE_ENDIAN_EXPLICIT(32, true)) const;
+ unsigned int*) const;
#endif
#ifdef HAVE_TARGET_64_LITTLE
const Stringpool*,
unsigned char**,
unsigned int*,
- unsigned int*
- ACCEPT_SIZE_ENDIAN_EXPLICIT(64, false)) const;
+ unsigned int*) const;
#endif
#ifdef HAVE_TARGET_64_BIG
const Stringpool*,
unsigned char**,
unsigned int*,
- unsigned int*
- ACCEPT_SIZE_ENDIAN_EXPLICIT(64, true)) const;
+ unsigned int*) const;
#endif
#ifdef HAVE_TARGET_32_LITTLE
const Stringpool*,
unsigned char**,
unsigned int*,
- unsigned int*
- ACCEPT_SIZE_ENDIAN_EXPLICIT(32, false)) const;
+ unsigned int*) const;
#endif
#ifdef HAVE_TARGET_32_BIG
const Stringpool*,
unsigned char**,
unsigned int*,
- unsigned int*
- ACCEPT_SIZE_ENDIAN_EXPLICIT(32, true)) const;
+ unsigned int*) const;
#endif
#ifdef HAVE_TARGET_64_LITTLE
const Stringpool*,
unsigned char**,
unsigned int*,
- unsigned int*
- ACCEPT_SIZE_ENDIAN_EXPLICIT(64, false)) const;
+ unsigned int*) const;
#endif
#ifdef HAVE_TARGET_64_BIG
const Stringpool*,
unsigned char**,
unsigned int*,
- unsigned int*
- ACCEPT_SIZE_ENDIAN_EXPLICIT(64, true)) const;
+ unsigned int*) const;
#endif
} // End namespace gold.
projects / binutils-gdb.git / blobdiff