From 67f95b96b4d5e8e19520d94bebae92db2f67af74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20=C3=81vila=20de=20Esp=C3=ADndola?= Date: Mon, 23 Mar 2015 09:16:49 -0400 Subject: Remove is_merge_section_for. Now that Input_merge_map has an Output_section_data, we can use it in implementing find_merge_section and replace the only use of is_merge_section_for with it. --- gold/object.cc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'gold/object.cc') diff --git a/gold/object.cc b/gold/object.cc index f983b66..cbe73ca 100644 --- a/gold/object.cc +++ b/gold/object.cc @@ -303,14 +303,12 @@ Relobj::merge_output_offset(unsigned int shndx, section_offset_type offset, return object_merge_map->get_output_offset(shndx, offset, poutput); } -bool -Relobj::is_merge_section_for(const Output_section_data* output_data, - unsigned int shndx) const { +const Output_section_data* +Relobj::find_merge_section(unsigned int shndx) const { Object_merge_map* object_merge_map = this->object_merge_map_; if (object_merge_map == NULL) - return false; - return object_merge_map->is_merge_section_for(output_data, shndx); - + return NULL; + return object_merge_map->find_merge_section(shndx); } // To copy the symbols data read from the file to a local data structure. -- cgit v1.1