// dynobj.cc -- dynamic object support for gold
-// Copyright (C) 2006-2015 Free Software Foundation, Inc.
+// Copyright (C) 2006-2018 Free Software Foundation, Inc.
// Written by Ian Lance Taylor <iant@google.com>.
// This file is part of gold.
bucket[bucketpos] = dynsym_index;
}
+ int size = parameters->target().hash_entry_size();
unsigned int hashlen = ((2
+ bucketcount
+ local_dynsym_count
+ dynsym_count)
- * 4);
+ * size / 8);
unsigned char* phash = new unsigned char[hashlen];
- if (parameters->target().is_big_endian())
+ bool big_endian = parameters->target().is_big_endian();
+ if (size == 32)
{
+ if (big_endian)
+ {
#if defined(HAVE_TARGET_32_BIG) || defined(HAVE_TARGET_64_BIG)
- Dynobj::sized_create_elf_hash_table<true>(bucket, chain, phash,
- hashlen);
+ Dynobj::sized_create_elf_hash_table<32, true>(bucket, chain, phash,
+ hashlen);
+#else
+ gold_unreachable();
+#endif
+ }
+ else
+ {
+#if defined(HAVE_TARGET_32_LITTLE) || defined(HAVE_TARGET_64_LITTLE)
+ Dynobj::sized_create_elf_hash_table<32, false>(bucket, chain, phash,
+ hashlen);
#else
- gold_unreachable();
+ gold_unreachable();
#endif
+ }
}
- else
+ else if (size == 64)
{
+ if (big_endian)
+ {
+#if defined(HAVE_TARGET_32_BIG) || defined(HAVE_TARGET_64_BIG)
+ Dynobj::sized_create_elf_hash_table<64, true>(bucket, chain, phash,
+ hashlen);
+#else
+ gold_unreachable();
+#endif
+ }
+ else
+ {
#if defined(HAVE_TARGET_32_LITTLE) || defined(HAVE_TARGET_64_LITTLE)
- Dynobj::sized_create_elf_hash_table<false>(bucket, chain, phash,
- hashlen);
+ Dynobj::sized_create_elf_hash_table<64, false>(bucket, chain, phash,
+ hashlen);
#else
- gold_unreachable();
+ gold_unreachable();
#endif
+ }
}
+ else
+ gold_unreachable();
*pphash = phash;
*phashlen = hashlen;
// Fill in an ELF hash table.
-template<bool big_endian>
+template<int size, bool big_endian>
void
Dynobj::sized_create_elf_hash_table(const std::vector<uint32_t>& bucket,
const std::vector<uint32_t>& chain,
const unsigned int bucketcount = bucket.size();
const unsigned int chaincount = chain.size();
- elfcpp::Swap<32, big_endian>::writeval(p, bucketcount);
- p += 4;
- elfcpp::Swap<32, big_endian>::writeval(p, chaincount);
- p += 4;
+ elfcpp::Swap<size, big_endian>::writeval(p, bucketcount);
+ p += size / 8;
+ elfcpp::Swap<size, big_endian>::writeval(p, chaincount);
+ p += size / 8;
for (unsigned int i = 0; i < bucketcount; ++i)
{
- elfcpp::Swap<32, big_endian>::writeval(p, bucket[i]);
- p += 4;
+ elfcpp::Swap<size, big_endian>::writeval(p, bucket[i]);
+ p += size / 8;
}
for (unsigned int i = 0; i < chaincount; ++i)
{
- elfcpp::Swap<32, big_endian>::writeval(p, chain[i]);
- p += 4;
+ elfcpp::Swap<size, big_endian>::writeval(p, chain[i]);
+ p += size / 8;
}
gold_assert(static_cast<unsigned int>(p - phash) == hashlen);
gold_assert(!this->is_finalized_);
gold_assert(sym->version() != NULL);
+ // A symbol defined as "sym@" is bound to an unspecified base version.
+ if (sym->version()[0] == '\0')
+ return;
+
Stringpool::Key version_key;
const char* version = dynpool->add(sym->version(), false, &version_key);
{
unsigned int version_index;
const char* version = (*p)->version();
- if (version != NULL)
- version_index = this->version_index(symtab, dynpool, *p);
- else
+ if (version == NULL)
{
if ((*p)->is_defined() && !(*p)->is_from_dynobj())
version_index = elfcpp::VER_NDX_GLOBAL;
else
version_index = elfcpp::VER_NDX_LOCAL;
}
+ else if (version[0] == '\0')
+ version_index = elfcpp::VER_NDX_GLOBAL;
+ else
+ version_index = this->version_index(symtab, dynpool, *p);
// If the symbol was defined as foo@V1 instead of foo@@V1, add
// the hidden bit.
- if ((*p)->version() != NULL && !(*p)->is_default())
+ if ((*p)->version() != NULL
+ && (*p)->is_defined()
+ && !(*p)->is_default()
+ && !(*p)->from_dyn())
version_index |= elfcpp::VERSYM_HIDDEN;
elfcpp::Swap<16, big_endian>::writeval(pbuf + (*p)->dynsym_index() * 2,
version_index);