From: Rafael Ávila de Espíndola <rafael.espindola@gmail.com>
Date: Mon, 6 Apr 2015 19:49:50 +0000 (-0400)
Subject: Fix the signature of a virtual method to match the one in the parent class.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7fa5525f8e8bc5d5e08998718149bda1928e314a;p=binutils-gdb.git

Fix the signature of a virtual method to match the one in the parent class.
---

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 25d45889f73..ee0abcbaeca 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,7 @@
+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
diff --git a/gold/aarch64.cc b/gold/aarch64.cc
index 4ae987f5307..dea64c0ba8f 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);