public inbox for binutils@sourceware.org
 help / color / mirror / Atom feed
* Fix virtual method signature
@ 2015-04-01 21:19 Rafael Espíndola
  2015-04-02 23:03 ` Cary Coutant
  0 siblings, 1 reply; 2+ messages in thread
From: Rafael Espíndola @ 2015-04-01 21:19 UTC (permalink / raw)
  To: Binutils; +Cc: Cary Coutant

[-- Attachment #1: Type: text/plain, Size: 108 bytes --]

This method signature is not matching the one in the base class.

Found by a clang warning.

Cheers,
Rafael

[-- Attachment #2: t.patch --]
[-- Type: text/x-patch, Size: 1044 bytes --]

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);

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: Fix virtual method signature
  2015-04-01 21:19 Fix virtual method signature Rafael Espíndola
@ 2015-04-02 23:03 ` Cary Coutant
  0 siblings, 0 replies; 2+ messages in thread
From: Cary Coutant @ 2015-04-02 23:03 UTC (permalink / raw)
  To: Rafael Espíndola; +Cc: Binutils, Jing Yu

> This method signature is not matching the one in the base class.

This is OK, with a ChangeLog entry. Thanks!

-cary

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2015-04-02 23:03 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-04-01 21:19 Fix virtual method signature Rafael Espíndola
2015-04-02 23:03 ` Cary Coutant

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).