mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2025-03-01 13:26:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Rafael Ávila de Espíndola 2015-04-06 15:49:50 -04:00
parent 5368dcf2ba
commit 7fa5525f8e
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gold/ChangeLog
View File

@ -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

10
gold/aarch64.cc
View File

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