aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bfd/ChangeLog5
-rw-r--r--bfd/elf32-nds32.c7
2 files changed, 8 insertions, 4 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 12797b5..1f06e7e 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2014-09-22 Kuan-Lin Chen <kuanlinchentw@gmail.com>
+
+ * elf32-nds32.c (nds32_elf_ex9_build_hash_table,
+ nds32_elf_ex9_relocation_check): Synchronize the argument type.
+
2014-09-19 Andreas Krebbel <krebbel@linux.vnet.ibm.com>
* elf32-s390.c: Don't replace R_390_TLS_LE32 with R_390_TLS_TPOFF
diff --git a/bfd/elf32-nds32.c b/bfd/elf32-nds32.c
index 4a0fad2..2b63024 100644
--- a/bfd/elf32-nds32.c
+++ b/bfd/elf32-nds32.c
@@ -14275,8 +14275,7 @@ nds32_elf_ex9_relocation_check (struct bfd_link_info *info,
Elf_Internal_Rela **irel,
Elf_Internal_Rela *irelend,
nds32_elf_blank_t *relax_blank_list,
- asection *sec,
- long unsigned int *off,
+ asection *sec,bfd_vma *off,
bfd_byte *contents)
{
/* Suppress ex9 if `.no_relax ex9' or inner loop. */
@@ -15292,7 +15291,7 @@ nds32_elf_ex9_reloc_jmp (struct bfd_link_info *link_info)
/* Generate ex9 hash table. */
static bfd_boolean
-nds32_elf_ex9_build_hash_table (bfd * abfd, asection * sec,
+nds32_elf_ex9_build_hash_table (bfd *abfd, asection *sec,
struct bfd_link_info *link_info)
{
Elf_Internal_Rela *internal_relocs;
@@ -15305,7 +15304,7 @@ nds32_elf_ex9_build_hash_table (bfd * abfd, asection * sec,
asection *isec;
struct elf_link_hash_entry **sym_hashes;
bfd_byte *contents = NULL;
- long unsigned int off = 0;
+ bfd_vma off = 0;
unsigned long r_symndx;
uint32_t insn, insn_with_reg;
struct elf_link_hash_entry *h;