diff options
| author | Cary Coutant <ccoutant@gmail.com> | 2017-01-11 11:47:27 -0800 |
|---|---|---|
| committer | Cary Coutant <ccoutant@gmail.com> | 2017-01-11 11:47:27 -0800 |
| commit | 976e204b369fd01f9d35d87ea2cd07707c3a40cf (patch) | |
| tree | fa864e1d2d984c5219d897b680f1a495cf1dd355 /gold/x86_64.cc | |
| parent | 1fa5f68bf38fc29f173990614db70fed1b66c0e0 (diff) | |
| download | binutils-gdb-976e204b369fd01f9d35d87ea2cd07707c3a40cf.tar.gz | |
Fix compile errors with GCC 4.2.
gold/
PR gold/21040
* x86_64.cc (Output_data_plt_x86_64_bnd::do_fill_first_plt_entry):
Remove unnecessary 'typename' keyword.
(Output_data_plt_x86_64_bnd::do_fill_plt_entry): Likewise.
(Output_data_plt_x86_64_bnd::do_fill_tlsdesc_entry): Likewise.
(Output_data_plt_x86_64_bnd::fill_aplt_entry): Likewise.
* testsuite/copy_test_relro_1.cc (p, b, c, q): Add separate extern
declarations.
Diffstat (limited to 'gold/x86_64.cc')
| -rw-r--r-- | gold/x86_64.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gold/x86_64.cc b/gold/x86_64.cc index 4116429e27b..d4d76b51ec6 100644 --- a/gold/x86_64.cc +++ b/gold/x86_64.cc @@ -478,29 +478,29 @@ class Output_data_plt_x86_64_bnd : public Output_data_plt_x86_64<64> virtual void do_fill_first_plt_entry(unsigned char* pov, - typename elfcpp::Elf_types<64>::Elf_Addr got_addr, - typename elfcpp::Elf_types<64>::Elf_Addr plt_addr); + elfcpp::Elf_types<64>::Elf_Addr got_addr, + elfcpp::Elf_types<64>::Elf_Addr plt_addr); virtual unsigned int do_fill_plt_entry(unsigned char* pov, - typename elfcpp::Elf_types<64>::Elf_Addr got_address, - typename elfcpp::Elf_types<64>::Elf_Addr plt_address, + elfcpp::Elf_types<64>::Elf_Addr got_address, + elfcpp::Elf_types<64>::Elf_Addr plt_address, unsigned int got_offset, unsigned int plt_offset, unsigned int plt_index); virtual void do_fill_tlsdesc_entry(unsigned char* pov, - typename elfcpp::Elf_types<64>::Elf_Addr got_address, - typename elfcpp::Elf_types<64>::Elf_Addr plt_address, - typename elfcpp::Elf_types<64>::Elf_Addr got_base, + elfcpp::Elf_types<64>::Elf_Addr got_address, + elfcpp::Elf_types<64>::Elf_Addr plt_address, + elfcpp::Elf_types<64>::Elf_Addr got_base, unsigned int tlsdesc_got_offset, unsigned int plt_offset); void fill_aplt_entry(unsigned char* pov, - typename elfcpp::Elf_types<64>::Elf_Addr got_address, - typename elfcpp::Elf_types<64>::Elf_Addr plt_address, + elfcpp::Elf_types<64>::Elf_Addr got_address, + elfcpp::Elf_types<64>::Elf_Addr plt_address, unsigned int got_offset, unsigned int plt_offset, unsigned int plt_index); |