This is the mail archive of the
binutils-cvs@sourceware.org
mailing list for the binutils project.
[binutils-gdb] Support 64-bit entry size in SHT_HASH (for s390).
- From: Cary Coutant <ccoutant at sourceware dot org>
- To: bfd-cvs at sourceware dot org
- Date: 28 Oct 2015 23:51:55 -0000
- Subject: [binutils-gdb] Support 64-bit entry size in SHT_HASH (for s390).
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=8d9743bd43d7c3123bfee2287e879dde0ac9bba4
commit 8d9743bd43d7c3123bfee2287e879dde0ac9bba4
Author: Marcin KoÅ?cielnicki <koriakin@0x04.net>
Date: Mon Oct 5 16:57:11 2015 +0200
Support 64-bit entry size in SHT_HASH (for s390).
gold/
* dynobj.cc (Dynobj::create_elf_hash_table): Create hash table with
target-specific entry size.
(Dynobj::sized_create_elf_hash_table): Add size template parameter.
* dynobj.h (Dynobj::sized_create_elf_hash_table): Likewise.
* layout.cc (Layout::create_dynamic_symtab): Set entsize to
hash_entry_size.
* target.h (Target::hash_entry_size): New method.
(Target::Target_info::hash_entry_size): New data member.
* aarch64.cc (Target_aarch64::aarch64_info): Add hash_entry_size.
* arm.cc (Target_arm::arm_info): Likewise.
(Target_arm_nacl::arm_nacl_info): Likewise.
* i386.cc (Target_i386::i386_info): Likewise.
(Target_i386_nacl::i386_nacl_info): Likewise.
(Target_iamcu::iamcu_info): Likewise.
* mips.cc (Target_mips::mips_info): Likewise.
(Target_mips_nacl::mips_nacl_info): Likewise.
* powerpc.cc (Target_powerpc::powerpc_info): Likewise.
* sparc.cc (Target_sparc::sparc_info): Likewise.
* tilegx.cc (Target_tilegx::tilegx_info): Likewise.
* x86_64.cc (Target_x86_64::x86_64_info): Likewise.
(Target_x86_64_nacl::x86_64_nacl_info): Likewise.
* testsuite/testfile.cc (Target_test::test_target_info): Likewise.
Diff:
---
gold/ChangeLog | 26 +++++++++++++++++++
gold/aarch64.cc | 12 ++++++---
gold/arm.cc | 6 +++--
gold/dynobj.cc | 64 +++++++++++++++++++++++++++++++++-------------
gold/dynobj.h | 2 +-
gold/i386.cc | 9 ++++---
gold/layout.cc | 2 +-
gold/mips.cc | 6 +++--
gold/powerpc.cc | 12 ++++++---
gold/sparc.cc | 6 +++--
gold/target.h | 8 ++++++
gold/testsuite/testfile.cc | 3 ++-
gold/tilegx.cc | 12 ++++++---
gold/x86_64.cc | 12 ++++++---
14 files changed, 134 insertions(+), 46 deletions(-)
diff --git a/gold/ChangeLog b/gold/ChangeLog
index c3cf686..e4558a8 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,29 @@
+2015-10-28 Marcin KoÅ?cielnicki <koriakin@0x04.net>
+
+ * dynobj.cc (Dynobj::create_elf_hash_table): Create hash table with
+ target-specific entry size.
+ (Dynobj::sized_create_elf_hash_table): Add size template parameter.
+ * dynobj.h (Dynobj::sized_create_elf_hash_table): Likewise.
+ * layout.cc (Layout::create_dynamic_symtab): Set entsize to
+ hash_entry_size.
+ * target.h (Target::hash_entry_size): New method.
+ (Target::Target_info::hash_entry_size): New data member.
+
+ * aarch64.cc (Target_aarch64::aarch64_info): Add hash_entry_size.
+ * arm.cc (Target_arm::arm_info): Likewise.
+ (Target_arm_nacl::arm_nacl_info): Likewise.
+ * i386.cc (Target_i386::i386_info): Likewise.
+ (Target_i386_nacl::i386_nacl_info): Likewise.
+ (Target_iamcu::iamcu_info): Likewise.
+ * mips.cc (Target_mips::mips_info): Likewise.
+ (Target_mips_nacl::mips_nacl_info): Likewise.
+ * powerpc.cc (Target_powerpc::powerpc_info): Likewise.
+ * sparc.cc (Target_sparc::sparc_info): Likewise.
+ * tilegx.cc (Target_tilegx::tilegx_info): Likewise.
+ * x86_64.cc (Target_x86_64::x86_64_info): Likewise.
+ (Target_x86_64_nacl::x86_64_nacl_info): Likewise.
+ * testsuite/testfile.cc (Target_test::test_target_info): Likewise.
+
2015-10-28 H.J. Lu <hongjiu.lu@intel.com>
PR gold/19177
diff --git a/gold/aarch64.cc b/gold/aarch64.cc
index 275d94c..2dcd620 100644
--- a/gold/aarch64.cc
+++ b/gold/aarch64.cc
@@ -3434,7 +3434,8 @@ const Target::Target_info Target_aarch64<64, false>::aarch64_info =
0, // large_common_section_flags
NULL, // attributes_section
NULL, // attributes_vendor
- "_start" // entry_symbol_name
+ "_start", // entry_symbol_name
+ 32, // hash_entry_size
};
template<>
@@ -3461,7 +3462,8 @@ const Target::Target_info Target_aarch64<32, false>::aarch64_info =
0, // large_common_section_flags
NULL, // attributes_section
NULL, // attributes_vendor
- "_start" // entry_symbol_name
+ "_start", // entry_symbol_name
+ 32, // hash_entry_size
};
template<>
@@ -3488,7 +3490,8 @@ const Target::Target_info Target_aarch64<64, true>::aarch64_info =
0, // large_common_section_flags
NULL, // attributes_section
NULL, // attributes_vendor
- "_start" // entry_symbol_name
+ "_start", // entry_symbol_name
+ 32, // hash_entry_size
};
template<>
@@ -3515,7 +3518,8 @@ const Target::Target_info Target_aarch64<32, true>::aarch64_info =
0, // large_common_section_flags
NULL, // attributes_section
NULL, // attributes_vendor
- "_start" // entry_symbol_name
+ "_start", // entry_symbol_name
+ 32, // hash_entry_size
};
// Get the GOT section, creating it if necessary.
diff --git a/gold/arm.cc b/gold/arm.cc
index fa9fdb2..2795c94 100644
--- a/gold/arm.cc
+++ b/gold/arm.cc
@@ -2997,7 +2997,8 @@ const Target::Target_info Target_arm<big_endian>::arm_info =
0, // large_common_section_flags
".ARM.attributes", // attributes_section
"aeabi", // attributes_vendor
- "_start" // entry_symbol_name
+ "_start", // entry_symbol_name
+ 32, // hash_entry_size
};
// Arm relocate functions class
@@ -12744,7 +12745,8 @@ const Target::Target_info Target_arm_nacl<big_endian>::arm_nacl_info =
0, // large_common_section_flags
".ARM.attributes", // attributes_section
"aeabi", // attributes_vendor
- "_start" // entry_symbol_name
+ "_start", // entry_symbol_name
+ 32, // hash_entry_size
};
template<bool big_endian>
diff --git a/gold/dynobj.cc b/gold/dynobj.cc
index 9ab6bf8..c4852a9 100644
--- a/gold/dynobj.cc
+++ b/gold/dynobj.cc
@@ -946,31 +946,59 @@ Dynobj::create_elf_hash_table(const std::vector<Symbol*>& dynsyms,
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();
+ 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();
+#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;
@@ -978,7 +1006,7 @@ Dynobj::create_elf_hash_table(const std::vector<Symbol*>& dynsyms,
// 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,
@@ -990,21 +1018,21 @@ Dynobj::sized_create_elf_hash_table(const std::vector<uint32_t>& bucket,
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);
diff --git a/gold/dynobj.h b/gold/dynobj.h
index c08c1de..9214266 100644
--- a/gold/dynobj.h
+++ b/gold/dynobj.h
@@ -132,7 +132,7 @@ class Dynobj : public Object
bool for_gnu_hash_table);
// Sized version of create_elf_hash_table.
- template<bool big_endian>
+ template<int size, bool big_endian>
static void
sized_create_elf_hash_table(const std::vector<uint32_t>& bucket,
const std::vector<uint32_t>& chain,
diff --git a/gold/i386.cc b/gold/i386.cc
index 4c18de0..386de03 100644
--- a/gold/i386.cc
+++ b/gold/i386.cc
@@ -898,7 +898,8 @@ const Target::Target_info Target_i386::i386_info =
0, // large_common_section_flags
NULL, // attributes_section
NULL, // attributes_vendor
- "_start" // entry_symbol_name
+ "_start", // entry_symbol_name
+ 32, // hash_entry_size
};
// Get the GOT section, creating it if necessary.
@@ -4084,7 +4085,8 @@ const Target::Target_info Target_i386_nacl::i386_nacl_info =
0, // large_common_section_flags
NULL, // attributes_section
NULL, // attributes_vendor
- "_start" // entry_symbol_name
+ "_start", // entry_symbol_name
+ 32, // hash_entry_size
};
#define NACLMASK 0xe0 // 32-byte alignment mask
@@ -4320,7 +4322,8 @@ const Target::Target_info Target_iamcu::iamcu_info =
0, // large_common_section_flags
NULL, // attributes_section
NULL, // attributes_vendor
- "_start" // entry_symbol_name
+ "_start", // entry_symbol_name
+ 32, // hash_entry_size
};
class Target_selector_iamcu : public Target_selector
diff --git a/gold/layout.cc b/gold/layout.cc
index b454c10..ad92fcc 100644
--- a/gold/layout.cc
+++ b/gold/layout.cc
@@ -4409,7 +4409,7 @@ Layout::create_dynamic_symtab(const Input_objects* input_objects,
{
if (dynsym != NULL)
hashsec->set_link_section(dynsym);
- hashsec->set_entsize(4);
+ hashsec->set_entsize(parameters->target().hash_entry_size() / 8);
}
if (odyn != NULL)
diff --git a/gold/mips.cc b/gold/mips.cc
index 01cf33f..6cfe924 100644
--- a/gold/mips.cc
+++ b/gold/mips.cc
@@ -10490,7 +10490,8 @@ const Target::Target_info Target_mips<size, big_endian>::mips_info =
0, // large_common_section_flags
NULL, // attributes_section
NULL, // attributes_vendor
- "__start" // entry_symbol_name
+ "__start", // entry_symbol_name
+ 32, // hash_entry_size
};
template<int size, bool big_endian>
@@ -10529,7 +10530,8 @@ const Target::Target_info Target_mips_nacl<size, big_endian>::mips_nacl_info =
0, // large_common_section_flags
NULL, // attributes_section
NULL, // attributes_vendor
- "_start" // entry_symbol_name
+ "_start", // entry_symbol_name
+ 32, // hash_entry_size
};
// Target selector for Mips. Note this is never instantiated directly.
diff --git a/gold/powerpc.cc b/gold/powerpc.cc
index 80f9e33..28bcd56 100644
--- a/gold/powerpc.cc
+++ b/gold/powerpc.cc
@@ -1352,7 +1352,8 @@ Target::Target_info Target_powerpc<32, true>::powerpc_info =
0, // large_common_section_flags
NULL, // attributes_section
NULL, // attributes_vendor
- "_start" // entry_symbol_name
+ "_start", // entry_symbol_name
+ 32, // hash_entry_size
};
template<>
@@ -1379,7 +1380,8 @@ Target::Target_info Target_powerpc<32, false>::powerpc_info =
0, // large_common_section_flags
NULL, // attributes_section
NULL, // attributes_vendor
- "_start" // entry_symbol_name
+ "_start", // entry_symbol_name
+ 32, // hash_entry_size
};
template<>
@@ -1406,7 +1408,8 @@ Target::Target_info Target_powerpc<64, true>::powerpc_info =
0, // large_common_section_flags
NULL, // attributes_section
NULL, // attributes_vendor
- "_start" // entry_symbol_name
+ "_start", // entry_symbol_name
+ 32, // hash_entry_size
};
template<>
@@ -1433,7 +1436,8 @@ Target::Target_info Target_powerpc<64, false>::powerpc_info =
0, // large_common_section_flags
NULL, // attributes_section
NULL, // attributes_vendor
- "_start" // entry_symbol_name
+ "_start", // entry_symbol_name
+ 32, // hash_entry_size
};
inline bool
diff --git a/gold/sparc.cc b/gold/sparc.cc
index db845b7..fc0dc81 100644
--- a/gold/sparc.cc
+++ b/gold/sparc.cc
@@ -482,7 +482,8 @@ Target::Target_info Target_sparc<32, true>::sparc_info =
0, // large_common_section_flags
NULL, // attributes_section
NULL, // attributes_vendor
- "_start" // entry_symbol_name
+ "_start", // entry_symbol_name
+ 32, // hash_entry_size
};
template<>
@@ -509,7 +510,8 @@ Target::Target_info Target_sparc<64, true>::sparc_info =
0, // large_common_section_flags
NULL, // attributes_section
NULL, // attributes_vendor
- "_start" // entry_symbol_name
+ "_start", // entry_symbol_name
+ 32, // hash_entry_size
};
// We have to take care here, even when operating in little-endian
diff --git a/gold/target.h b/gold/target.h
index dfbc5ee..db093b7 100644
--- a/gold/target.h
+++ b/gold/target.h
@@ -455,6 +455,11 @@ class Target
entry_symbol_name() const
{ return this->pti_->entry_symbol_name; }
+ // Return the size in bits of SHT_HASH entry.
+ int
+ hash_entry_size() const
+ { return this->pti_->hash_entry_size; }
+
// Whether the target has a custom set_dynsym_indexes method.
bool
has_custom_set_dynsym_indexes() const
@@ -540,6 +545,9 @@ class Target
const char* attributes_vendor;
// Name of the main entry point to the program.
const char* entry_symbol_name;
+ // Size (in bits) of SHT_HASH entry. Always equal to 32, except for
+ // 64-bit S/390.
+ const int hash_entry_size;
};
Target(const Target_info* pti)
diff --git a/gold/testsuite/testfile.cc b/gold/testsuite/testfile.cc
index c67caff..2e7f40c 100644
--- a/gold/testsuite/testfile.cc
+++ b/gold/testsuite/testfile.cc
@@ -108,7 +108,8 @@ const Target::Target_info Target_test<size, big_endian>::test_target_info =
0, // large_common_section_flags
NULL, // attributes_section
NULL, // attributes_vendor
- "_start" // entry_symbol_name
+ "_start", // entry_symbol_name
+ 32, // hash_entry_size
};
// The test targets.
diff --git a/gold/tilegx.cc b/gold/tilegx.cc
index 5d97271..ce449a4 100644
--- a/gold/tilegx.cc
+++ b/gold/tilegx.cc
@@ -680,7 +680,8 @@ const Target::Target_info Target_tilegx<64, false>::tilegx_info =
0, // large_common_section_flags
NULL, // attributes_section
NULL, // attributes_vendor
- "_start" // entry_symbol_name
+ "_start", // entry_symbol_name
+ 32, // hash_entry_size
};
template<>
@@ -707,7 +708,8 @@ const Target::Target_info Target_tilegx<32, false>::tilegx_info =
0, // large_common_section_flags
NULL, // attributes_section
NULL, // attributes_vendor
- "_start" // entry_symbol_name
+ "_start", // entry_symbol_name
+ 32, // hash_entry_size
};
template<>
@@ -734,7 +736,8 @@ const Target::Target_info Target_tilegx<64, true>::tilegx_info =
0, // large_common_section_flags
NULL, // attributes_section
NULL, // attributes_vendor
- "_start" // entry_symbol_name
+ "_start", // entry_symbol_name
+ 32, // hash_entry_size
};
template<>
@@ -761,7 +764,8 @@ const Target::Target_info Target_tilegx<32, true>::tilegx_info =
0, // large_common_section_flags
NULL, // attributes_section
NULL, // attributes_vendor
- "_start" // entry_symbol_name
+ "_start", // entry_symbol_name
+ 32, // hash_entry_size
};
// tilegx relocation handlers
diff --git a/gold/x86_64.cc b/gold/x86_64.cc
index c728a00..d637b5e 100644
--- a/gold/x86_64.cc
+++ b/gold/x86_64.cc
@@ -1052,7 +1052,8 @@ const Target::Target_info Target_x86_64<64>::x86_64_info =
elfcpp::SHF_X86_64_LARGE, // large_common_section_flags
NULL, // attributes_section
NULL, // attributes_vendor
- "_start" // entry_symbol_name
+ "_start", // entry_symbol_name
+ 32, // hash_entry_size
};
template<>
@@ -1079,7 +1080,8 @@ const Target::Target_info Target_x86_64<32>::x86_64_info =
elfcpp::SHF_X86_64_LARGE, // large_common_section_flags
NULL, // attributes_section
NULL, // attributes_vendor
- "_start" // entry_symbol_name
+ "_start", // entry_symbol_name
+ 32, // hash_entry_size
};
// This is called when a new output section is created. This is where
@@ -4818,7 +4820,8 @@ const Target::Target_info Target_x86_64_nacl<64>::x86_64_nacl_info =
elfcpp::SHF_X86_64_LARGE, // large_common_section_flags
NULL, // attributes_section
NULL, // attributes_vendor
- "_start" // entry_symbol_name
+ "_start", // entry_symbol_name
+ 32, // hash_entry_size
};
template<>
@@ -4845,7 +4848,8 @@ const Target::Target_info Target_x86_64_nacl<32>::x86_64_nacl_info =
elfcpp::SHF_X86_64_LARGE, // large_common_section_flags
NULL, // attributes_section
NULL, // attributes_vendor
- "_start" // entry_symbol_name
+ "_start", // entry_symbol_name
+ 32, // hash_entry_size
};
#define NACLMASK 0xe0 // 32-byte alignment mask.