This is the mail archive of the
binutils-cvs@sourceware.org
mailing list for the binutils project.
[binutils-gdb] Fix the signature of a virtual method to match the one in the parent class.
- From: Rafael "थvila" de "Espथऐndola" <espindola at sourceware dot org>
- To: bfd-cvs at sourceware dot org
- Date: 6 Apr 2015 19:50:20 -0000
- Subject: [binutils-gdb] Fix the signature of a virtual method to match the one in the parent class.
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=7fa5525f8e8bc5d5e08998718149bda1928e314a
commit 7fa5525f8e8bc5d5e08998718149bda1928e314a
Author: Rafael Ã?vila de EspÃndola <rafael.espindola@gmail.com>
Date: Mon Apr 6 15:49:50 2015 -0400
Fix the signature of a virtual method to match the one in the parent class.
Diff:
---
gold/ChangeLog | 4 ++++
gold/aarch64.cc | 10 ++++------
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/gold/ChangeLog b/gold/ChangeLog
index 25d4588..ee0abcb 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,5 +1,9 @@
2015-04-06 Rafael Ã?vila de EspÃndola <rafael.espindola@gmail.com>
+ * aarch64.cc (do_reloc_addend): Fix signature to match the parent one.
+
+2015-04-06 Rafael Ã?vila de EspÃndola <rafael.espindola@gmail.com>
+
* gc.cc (Garbage_collection::do_transitive_closure): Avoid a call
to find by using the return value of insert.
diff --git a/gold/aarch64.cc b/gold/aarch64.cc
index 4ae987f..dea64c0 100644
--- a/gold/aarch64.cc
+++ b/gold/aarch64.cc
@@ -1749,9 +1749,8 @@ class Target_aarch64 : public Sized_target<size, big_endian>
}
// Return the addend to use for a target specific relocation.
- typename elfcpp::Elf_types<size>::Elf_Addr
- do_reloc_addend(void* arg, unsigned int r_type,
- typename elfcpp::Elf_types<size>::Elf_Addr addend) const;
+ uint64_t
+ do_reloc_addend(void* arg, unsigned int r_type, uint64_t addend) const;
// Return the PLT section.
uint64_t
@@ -4389,10 +4388,9 @@ Target_aarch64<size, big_endian>::new_stub_table(
template<int size, bool big_endian>
-typename elfcpp::Elf_types<size>::Elf_Addr
+uint64_t
Target_aarch64<size, big_endian>::do_reloc_addend(
- void* arg, unsigned int r_type,
- typename elfcpp::Elf_types<size>::Elf_Addr) const
+ void* arg, unsigned int r_type, uint64_t) const
{
gold_assert(r_type == elfcpp::R_AARCH64_TLSDESC);
uintptr_t intarg = reinterpret_cast<uintptr_t>(arg);