diff options
| -rw-r--r-- | gold/ChangeLog | 6 | ||||
| -rw-r--r-- | gold/powerpc.cc | 12 |
2 files changed, 12 insertions, 6 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog index 46726d0ee3..01058c10a8 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,9 @@ +2013-01-17 Serge Pavlov <serge.v.pavlov@gmail.com> + + * powerpc.cc (Stub_table::find_plt_call_entry): Make types + used in declaration and definition consistent. + (Target_powerpc::symval_for_branch): Ditto. + 2013-01-16 Sriraman Tallam <tmsriram@google.com> * testsuite/plugin_final_layout.cc: Fix comment. diff --git a/gold/powerpc.cc b/gold/powerpc.cc index 26ae337f42..f9dadd2ea2 100644 --- a/gold/powerpc.cc +++ b/gold/powerpc.cc @@ -3171,7 +3171,7 @@ Stub_table<size, big_endian>::add_plt_call_entry( // Find a plt call stub. template<int size, bool big_endian> -typename elfcpp::Elf_types<size>::Elf_Addr +typename Stub_table<size, big_endian>::Address Stub_table<size, big_endian>::find_plt_call_entry( const Sized_relobj_file<size, big_endian>* object, const Symbol* gsym, @@ -3184,7 +3184,7 @@ Stub_table<size, big_endian>::find_plt_call_entry( } template<int size, bool big_endian> -typename elfcpp::Elf_types<size>::Elf_Addr +typename Stub_table<size, big_endian>::Address Stub_table<size, big_endian>::find_plt_call_entry(const Symbol* gsym) const { Plt_stub_ent ent(gsym); @@ -3193,7 +3193,7 @@ Stub_table<size, big_endian>::find_plt_call_entry(const Symbol* gsym) const } template<int size, bool big_endian> -typename elfcpp::Elf_types<size>::Elf_Addr +typename Stub_table<size, big_endian>::Address Stub_table<size, big_endian>::find_plt_call_entry( const Sized_relobj_file<size, big_endian>* object, unsigned int locsym_index, @@ -3206,7 +3206,7 @@ Stub_table<size, big_endian>::find_plt_call_entry( } template<int size, bool big_endian> -typename elfcpp::Elf_types<size>::Elf_Addr +typename Stub_table<size, big_endian>::Address Stub_table<size, big_endian>::find_plt_call_entry( const Sized_relobj_file<size, big_endian>* object, unsigned int locsym_index) const @@ -3239,7 +3239,7 @@ Stub_table<size, big_endian>::add_long_branch_entry( // Find long branch stub. template<int size, bool big_endian> -typename elfcpp::Elf_types<size>::Elf_Addr +typename Stub_table<size, big_endian>::Address Stub_table<size, big_endian>::find_long_branch_entry( const Powerpc_relobj<size, big_endian>* object, Address to) @@ -5661,7 +5661,7 @@ ok_lo_toc_insn(uint32_t insn) // Return the value to use for a branch relocation. template<int size, bool big_endian> -typename elfcpp::Elf_types<size>::Elf_Addr +typename Target_powerpc<size, big_endian>::Address Target_powerpc<size, big_endian>::symval_for_branch( Address value, const Sized_symbol<size>* gsym, |