This is the mail archive of the binutils@sourceware.org mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [PATCH] bfd/elf64-aarch64.c: Use ELF64_R_SYM instead of ELF32_R_SYM.


On 11/06/13 08:29, Will Newton wrote:

Fix incorrect usage of ELF32_R_SYM introduced in ifunc changes.

bfd/ChangeLog:

2013-06-11  Will Newton  <will.newton@linaro.org>

	* elf64-aarch64.c (elf_aarch64_get_local_sym_hash): Use
	ELF64_R_SYM instead of ELF32_R_SYM.
---
  bfd/elf64-aarch64.c | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bfd/elf64-aarch64.c b/bfd/elf64-aarch64.c
index 5f1b700..19e18b4 100644
--- a/bfd/elf64-aarch64.c
+++ b/bfd/elf64-aarch64.c
@@ -2033,11 +2033,11 @@ elf_aarch64_get_local_sym_hash (struct elf64_aarch64_link_hash_table *htab,
    struct elf64_aarch64_link_hash_entry e, *ret;
    asection *sec = abfd->sections;
    hashval_t h = ELF_LOCAL_SYMBOL_HASH (sec->id,
-				       ELF32_R_SYM (rel->r_info));
+				       ELF64_R_SYM (rel->r_info));
    void **slot;

    e.root.indx = sec->id;
-  e.root.dynstr_index = ELF32_R_SYM (rel->r_info);
+  e.root.dynstr_index = ELF64_R_SYM (rel->r_info);
    slot = htab_find_slot_with_hash (htab->loc_hash_table, &e, h,
  				   create ? INSERT : NO_INSERT);

@@ -2057,7 +2057,7 @@ elf_aarch64_get_local_sym_hash (struct elf64_aarch64_link_hash_table *htab,
      {
        memset (ret, 0, sizeof (*ret));
        ret->root.indx = sec->id;
-      ret->root.dynstr_index = ELF32_R_SYM (rel->r_info);
+      ret->root.dynstr_index = ELF64_R_SYM (rel->r_info);
        ret->root.dynindx = -1;
        *slot = ret;
      }


OK

/Marcus


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]