diff options
Diffstat (limited to 'gold')
| -rw-r--r-- | gold/ChangeLog | 10 | ||||
| -rw-r--r-- | gold/x86_64.cc | 24 |
2 files changed, 22 insertions, 12 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog index 64a2dbe..6cc9752 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -4,6 +4,16 @@ * 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::fill_aplt_entry): Likewise. + (Output_data_plt_x86_64_bnd::do_fill_tlsdesc_entry): Likewise. + (Output_data_plt_x86_64_bnd::do_write): Likewise. + +2017-01-11 Cary Coutant <ccoutant@gmail.com> + + 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 diff --git a/gold/x86_64.cc b/gold/x86_64.cc index d4d76b5..ffa8761 100644 --- a/gold/x86_64.cc +++ b/gold/x86_64.cc @@ -1870,8 +1870,8 @@ Output_data_plt_x86_64_bnd::first_plt_entry[plt_entry_size] = void Output_data_plt_x86_64_bnd::do_fill_first_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) { memcpy(pov, first_plt_entry, plt_entry_size); // We do a jmp relative to the PC at the end of this instruction. @@ -1910,8 +1910,8 @@ Output_data_plt_x86_64_bnd::aplt_entry[aplt_entry_size] = unsigned int Output_data_plt_x86_64_bnd::do_fill_plt_entry( unsigned char* pov, - typename elfcpp::Elf_types<64>::Elf_Addr, - typename elfcpp::Elf_types<64>::Elf_Addr, + elfcpp::Elf_types<64>::Elf_Addr, + elfcpp::Elf_types<64>::Elf_Addr, unsigned int, unsigned int plt_offset, unsigned int plt_index) @@ -1925,8 +1925,8 @@ Output_data_plt_x86_64_bnd::do_fill_plt_entry( void Output_data_plt_x86_64_bnd::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) @@ -1959,9 +1959,9 @@ Output_data_plt_x86_64_bnd::tlsdesc_plt_entry[plt_entry_size] = void Output_data_plt_x86_64_bnd::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) { @@ -2161,13 +2161,13 @@ Output_data_plt_x86_64_bnd::do_write(Output_file* of) unsigned char* pov = oview; // The base address of the .plt section. - typename elfcpp::Elf_types<64>::Elf_Addr plt_address = this->address(); + elfcpp::Elf_types<64>::Elf_Addr plt_address = this->address(); // The base address of the .got section. - typename elfcpp::Elf_types<64>::Elf_Addr got_base = got->address(); + elfcpp::Elf_types<64>::Elf_Addr got_base = got->address(); // The base address of the PLT portion of the .got section, // which is where the GOT pointer will point, and where the // three reserved GOT entries are located. - typename elfcpp::Elf_types<64>::Elf_Addr got_address = got_plt->address(); + elfcpp::Elf_types<64>::Elf_Addr got_address = got_plt->address(); this->fill_first_plt_entry(pov, got_address, plt_address); pov += plt_entry_size; |