+2015-03-23 Rafael Ávila de Espíndola <rafael.espindola@gmail.com>
+
+ * merge.cc (Object_merge_map::get_input_merge_map): Make it const.
+ (Object_merge_map::is_merge_section_for): Remove.
+ (Object_merge_map::find_merge_section): New.
+ * merge.h (Object_merge_map::is_merge_section_for): Remove.
+ (Object_merge_map::find_merge_section): New.
+ (Object_merge_map::get_input_merge_map): Add a const version.
+ * object.cc (Relobj::is_merge_section_for): Remove.
+ (Relobj::find_merge_section): New.
+ * object.h (Relobj::is_merge_section_for): Remove.
+ (Relobj::find_merge_section): New.
+ * output.cc
+ (Output_section::Input_section::is_merge_section_for): Remove.
+ (Output_section::add_merge_input_section): Don't call
+ add_merge_input_section.
+ (Output_section::find_merge_section): Return const. Use
+ object->find_merge_section.
+ (Output_section::build_lookup_maps): Don't build a map for
+ merge sections.
+ (Output_section::is_input_address_mapped): Return false if
+ section is not found.
+ (Output_section::find_starting_output_address): Use
+ find_merge_section instead of is_merge_section_for.
+ (Output_section::add_script_input_section): Don't build a map for
+ merge sections.
+ * output.h (Output_section_lookup_maps::merge_sections_by_id_): Remove.
+ (Output_section_lookup_maps::find_merge_section): Remove.
+ (Output_section_lookup_maps::add_merge_input_section) Remove.
+ (Output_section::find_merge_section): Return const.
+
2015-03-22 Cary Coutant <cary@google.com>
PR gold/18106