Re: [patch][gold] Remove empty Merge_map class

["H.J. Lu" <hjl dot tools at gmail dot com>]

On Wed, Mar 4, 2015 at 3:22 PM, Cary Coutant <ccoutant@google.com> wrote:
> I've committed this patch on your behalf. Thanks!
>
> -cary
>
> commit dbe40a889191708b6e32441b1c64937844645574
> Author: Rafael Ãvila de EspÃndola <rafael.espindola@gmail.com>
> Date:   Wed Mar 4 15:10:18 2015 -0800
>
>     Remove empty class Merge_map.
>
>     2015-03-02  Rafael Ãvila de EspÃndola <rafael.espindola@gmail.com>
>
>         * ehframe.cc (Cie::set_output_offset): Pass in and use a
>         Output_section_data instead of a Merge_map.
>         (Eh_frame::Eh_frame): Don't initialize merge_map_.
>         (Eh_frame::read_cie): Use add_merge_mapping instead of
>         Merge_map::add_mapping.
>         (Eh_frame::read_fde): Ditto.
>         (Eh_frame::set_final_data_size): Use this instead of this->merge_map_.
>         (Eh_frame::do_output_offset): Use merge_output_offset istead of
>         merge_map_->get_output_offset.
>         (Eh_frame::do_is_merge_section_for): Delete.
>         * ehframe.h (Fde::add_mapping): Pass in and use a Output_section_data
>         instead of a Merge_map.
>         (Cie::set_output_offset): Pass in a Output_section_data instead of a
>         Merge_map.
>         (Eh_frame::do_is_merge_section_for): Delete.
>         (Eh_frame::merge_map_): Delete.
>         * merge.cc (Object_merge_map::get_or_make_input_merge_map): Pass in
>         and use a Output_section_data instead of a Merge_map.
>         (Object_merge_map::add_mapping): Ditto.
>         (Object_merge_map::get_output_offset): Remove the merge_map argument.
>         (Object_merge_map::is_merge_section_for): Pass in and use a
>         Output_section_data instead of a Merge_map.
>         (Merge_map): Delete.
>         (Output_merge_base::do_output_offset): Use merge_output_offset instead
>         of merge_map_.get_output_offset.
>         (Output_merge_base::do_is_merge_section_for): Delete.
>         (Output_merge_data::do_add_input_section): Use
>         object->add_merge_mapping instead of add_mapping.
>         (Output_merge_string<Char_type>::finalize_merged_data): Ditto.
>         * merge.h (Merge_map): Delete forward declaration.
>         (Object_merge_map::add_mapping): Pass in and use a Output_section_data
>         instead of a Merge_map.
>         (Object_merge_map::get_output_offset): Remove the merge_map argument.
>         (Object_merge_map::is_merge_section_for): Pass in and use a
>         Output_section_data instead of a Merge_map.
>         (Input_merge_map::Object_merge_map::merge_map): Replace with
>         output_data.
>         (Object_merge_map::get_or_make_input_merge_map): Pass in and use a
>         Output_section_data instead of a Merge_map.
>         (Merge_map): Delete.
>         (Output_merge_base::Output_merge_base): Don't initialize merge_map_.
>         (Output_merge_base::do_is_merge_section_for): Delete.
>         (Output_merge_base::add_mapping): Delete.
>         (Output_merge_base::merge_map_): Delete.
>         * object.cc (Relobj::initialize_input_to_output_map): New.
>         (Relobj::initialize_input_to_output_map): New.
>         (Relobj::merge_output_offset): New.
>         (Relobj::is_merge_section_for): New.
>         (Relobj::initialize_input_to_output_map): Instantiate for 32 and 64
>         bits.
>         * object.h (Relobj::merge_map): Delete.
>         (initialize_input_to_output_map): New.
>         (set_merge_map): Delete.
>         (add_merge_mapping): New.
>         (merge_output_offset): New.
>         (is_merge_section_for): New.
>         * output.cc (Output_section::Input_section::is_merge_section_for):
>         Use object->is_merge_section_for.
>         * output.h (Output_section_data::is_merge_section_for): Delete.
>         (Output_section_data::do_is_merge_section_for): Delete.
>         * reloc.cc (Merged_symbol_value<size>::initialize_input_to_output_map):
>         Use object->initialize_input_to_output_map.
>         (Merged_symbol_value<size>::value_from_output_section): Use
>         object->merge_output_offset.

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.
I checked it in as an obvious fix.

* output.cc (Relobj::initialize_input_to_output_map<size>):
Remove typename on elfcpp::Elf_types<size>::Elf_Addr.


-- 
H.J.

From beb8418f4799b50ce414b7a63ac7a2a363dc8a05 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Thu, 5 Mar 2015 07:52:41 -0800
Subject: [PATCH] Remove typename on elfcpp::Elf_types<size>::Elf_Addr
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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.
---
 gold/ChangeLog | 5 +++++
 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
-- 
1.9.3