This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
PATCH: Add ELF_LOCAL_HASH
- From: "H.J. Lu" <hongjiu dot lu at intel dot com>
- To: binutils at sources dot redhat dot com
- Date: Tue, 16 Jun 2009 10:39:29 -0700
- Subject: PATCH: Add ELF_LOCAL_HASH
- Reply-to: "H.J. Lu" <hjl dot tools at gmail dot com>
Hi,
I am checking in this patch to add ELF_LOCAL_HASH.
H.J.
---
Index: elfxx-ia64.c
===================================================================
--- elfxx-ia64.c (revision 6155)
+++ elfxx-ia64.c (working copy)
@@ -1809,8 +1809,7 @@ elfNN_ia64_local_htab_hash (const void *
struct elfNN_ia64_local_hash_entry *entry
= (struct elfNN_ia64_local_hash_entry *) ptr;
- return (((entry->id & 0xff) << 24) | ((entry->id & 0xff00) << 8))
- ^ entry->r_sym ^ (entry->id >> 16);
+ return ELF_LOCAL_HASH (entry->id, entry->r_sym);
}
/* Compare local hash entries. */
@@ -2033,8 +2032,7 @@ get_local_sym_hash (struct elfNN_ia64_li
{
struct elfNN_ia64_local_hash_entry e, *ret;
asection *sec = abfd->sections;
- hashval_t h = (((sec->id & 0xff) << 24) | ((sec->id & 0xff00) << 8))
- ^ ELFNN_R_SYM (rel->r_info) ^ (sec->id >> 16);
+ hashval_t h = ELF_LOCAL_HASH (sec->id, ELFNN_R_SYM (rel->r_info));
void **slot;
e.id = sec->id;
Index: ChangeLog
===================================================================
--- ChangeLog (revision 6155)
+++ ChangeLog (working copy)
@@ -1,5 +1,19 @@
2009-06-16 H.J. Lu <hongjiu.lu@intel.com>
+ * elf-bfd.h (ELF_LOCAL_HASH): New.
+
+ * elf32-i386.c (elf_i386_local_hash): Removed.
+ (elf_i386_local_htab_hash): Use ELF_LOCAL_HASH.
+ (elf_i386_get_local_sym_hash): Likewise.
+
+ * elf64-x86-64.c (elf64_x86_64_local_hash): Removed.
+ (elf64_x86_64_local_htab_hash): Use ELF_LOCAL_HASH.
+ (elf64_x86_64_get_local_sym_hash): Likewise.
+ * elfxx-ia64.c (elfNN_ia64_local_htab_hash): Likewise.
+ (get_local_sym_hash): Likewise.
+
+2009-06-16 H.J. Lu <hongjiu.lu@intel.com>
+
* elfxx-ia64.c (elfNN_ia64_link_hash_table): Remove got_sec,
rel_got_sec and plt_sec.
(elfNN_ia64_relax_section): Updated.
Index: elf-bfd.h
===================================================================
--- elf-bfd.h (revision 6155)
+++ elf-bfd.h (working copy)
@@ -2163,6 +2163,12 @@ extern bfd_boolean _bfd_elf_create_ifunc
/* Large common section. */
extern asection _bfd_elf_large_com_section;
+/* Hash for local symbol with the first section id, ID, in the input
+ file and the local symbol index, SYM. */
+#define ELF_LOCAL_HASH(ID, SYM) \
+ (((((ID) & 0xff) << 24) | (((ID) & 0xff00) << 8)) \
+ ^ (SYM) ^ ((ID) >> 16))
+
/* This is the condition under which finish_dynamic_symbol will be called.
If our finish_dynamic_symbol isn't called, we'll need to do something
about initializing any .plt and .got entries in relocate_section. */
Index: elf64-x86-64.c
===================================================================
--- elf64-x86-64.c (revision 6155)
+++ elf64-x86-64.c (working copy)
@@ -559,13 +559,6 @@ elf64_x86_64_link_hash_newfunc (struct b
return entry;
}
-static hashval_t
-elf64_x86_64_local_hash (int id, int r_sym)
-{
- return ((((id & 0xff) << 24) | ((id & 0xff00) << 8))
- ^ r_sym ^ (id >> 16));
-}
-
/* Compute a hash of a local hash entry. We use elf_link_hash_entry
for local symbol so that we can handle local STT_GNU_IFUNC symbols
as global symbol. We reuse indx and dynstr_index for local symbol
@@ -576,7 +569,7 @@ elf64_x86_64_local_htab_hash (const void
{
struct elf_link_hash_entry *h
= (struct elf_link_hash_entry *) ptr;
- return elf64_x86_64_local_hash (h->indx, h->dynstr_index);
+ return ELF_LOCAL_HASH (h->indx, h->dynstr_index);
}
/* Compare local hash entries. */
@@ -601,8 +594,7 @@ elf64_x86_64_get_local_sym_hash (struct
{
struct elf64_x86_64_link_hash_entry e, *ret;
asection *sec = abfd->sections;
- hashval_t h = elf64_x86_64_local_hash (sec->id,
- ELF64_R_SYM (rel->r_info));
+ hashval_t h = ELF_LOCAL_HASH (sec->id, ELF64_R_SYM (rel->r_info));
void **slot;
e.elf.indx = sec->id;
Index: elf32-i386.c
===================================================================
--- elf32-i386.c (revision 6155)
+++ elf32-i386.c (working copy)
@@ -745,13 +745,6 @@ elf_i386_link_hash_newfunc (struct bfd_h
return entry;
}
-static hashval_t
-elf_i386_local_hash (int id, int r_sym)
-{
- return ((((id & 0xff) << 24) | ((id & 0xff00) << 8))
- ^ r_sym ^ (id >> 16));
-}
-
/* Compute a hash of a local hash entry. We use elf_link_hash_entry
for local symbol so that we can handle local STT_GNU_IFUNC symbols
as global symbol. We reuse indx and dynstr_index for local symbol
@@ -762,7 +755,7 @@ elf_i386_local_htab_hash (const void *pt
{
struct elf_link_hash_entry *h
= (struct elf_link_hash_entry *) ptr;
- return elf_i386_local_hash (h->indx, h->dynstr_index);
+ return ELF_LOCAL_HASH (h->indx, h->dynstr_index);
}
/* Compare local hash entries. */
@@ -787,8 +780,7 @@ elf_i386_get_local_sym_hash (struct elf_
{
struct elf_i386_link_hash_entry e, *ret;
asection *sec = abfd->sections;
- hashval_t h = elf_i386_local_hash (sec->id,
- ELF32_R_SYM (rel->r_info));
+ hashval_t h = ELF_LOCAL_HASH (sec->id, ELF32_R_SYM (rel->r_info));
void **slot;
e.elf.indx = sec->id;