diff options
author | H.J. Lu <hjl.tools@gmail.com> | 2015-03-05 07:52:41 -0800 |
---|---|---|
committer | H.J. Lu <hjl.tools@gmail.com> | 2015-03-05 07:52:41 -0800 |
commit | beb8418f4799b50ce414b7a63ac7a2a363dc8a05 (patch) | |
tree | 0dc6d1e82babf3c6c0875e7295fa8c1ff3a2086f /gold | |
parent | 81fb971a3d8626d7e051ff5df807442c8d233329 (diff) | |
download | gdb-beb8418f4799b50ce414b7a63ac7a2a363dc8a05.zip gdb-beb8418f4799b50ce414b7a63ac7a2a363dc8a05.tar.gz gdb-beb8418f4799b50ce414b7a63ac7a2a363dc8a05.tar.bz2 |
Remove typename on elfcpp::Elf_types<size>::Elf_Addr
GCC 4.2 complains:
binutils/gold/object.cc:3261: error: using ‘typename’ outside of template
This patch removes typename. It works with both GCC 4.2 and 4.8.
* output.cc (Relobj::initialize_input_to_output_map<size>):
Remove typename on elfcpp::Elf_types<size>::Elf_Addr.
Diffstat (limited to 'gold')
-rw-r--r-- | gold/ChangeLog | 5 | ||||
-rw-r--r-- | gold/object.cc | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog index fe6a56b..24d3560 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,8 @@ +2015-03-05 H.J. Lu <hongjiu.lu@intel.com> + + * output.cc (Relobj::initialize_input_to_output_map<size>): + Remove typename on elfcpp::Elf_types<size>::Elf_Addr. + 2015-03-04 Cary Coutant <ccoutant@google.com> * parameters.cc (Parameters::set_target_once): Call diff --git a/gold/object.cc b/gold/object.cc index 7286e5a..84e4568 100644 --- a/gold/object.cc +++ b/gold/object.cc @@ -3258,18 +3258,18 @@ make_elf_object(const std::string& name, Input_file* input_file, off_t offset, template void Relobj::initialize_input_to_output_map<64>(unsigned int shndx, - typename elfcpp::Elf_types<64>::Elf_Addr starting_address, + elfcpp::Elf_types<64>::Elf_Addr starting_address, Unordered_map<section_offset_type, - typename elfcpp::Elf_types<64>::Elf_Addr>* output_addresses) const; + elfcpp::Elf_types<64>::Elf_Addr>* output_addresses) const; #endif #if defined(HAVE_TARGET_32_LITTLE) || defined(HAVE_TARGET_32_BIG) template void Relobj::initialize_input_to_output_map<32>(unsigned int shndx, - typename elfcpp::Elf_types<32>::Elf_Addr starting_address, + elfcpp::Elf_types<32>::Elf_Addr starting_address, Unordered_map<section_offset_type, - typename elfcpp::Elf_types<32>::Elf_Addr>* output_addresses) const; + elfcpp::Elf_types<32>::Elf_Addr>* output_addresses) const; #endif #ifdef HAVE_TARGET_32_LITTLE |