From 9860cbcfb60bdae2f9800e6a6ea5f21ef1507d08 Mon Sep 17 00:00:00 2001 From: Cary Coutant Date: Wed, 2 Jul 2014 09:39:41 -0700 Subject: Fix problem with optimization of .eh_frame section and --sort-section option. When --sort-section=name is used, gold will sort the linker-generated contents of .eh_frame (after optimization) after the endcap provided by crtendS.o. This causes two problems: the .eh_frame_hdr section is generated assuming that the optimized .eh_frame contents will be placed at the very beginning of the section, and the endcap no longer appears at the end of the section. This patch fixes the first problem by adjusting FDE offsets to take into account the actual starting offset within the output section, and fixes the second problem by sorting linker-generated (Output_section_data) sections based on the name of the output section. gold/ PR gold/17005 * ehframe.cc (Fde::write): Add output_offset parameter. (Cie::write): Likewise. (Eh_frame::set_final_data_size): Account for offset within output section. (Eh_frame::do_sized_write): Likewise. * ehframe.h (Fde::write): Add output_offset parameter. (Cie::write): Likewise. * output.cc (Output_section::Input_section_sort_entry): Remove section_has_name_; add output_section_name parameter. Use output section name for non-input sections. (Output_section::Input_section_sort_entry::section_has_name): Remove. (Output_section::Input_section_sort_entry::section_has_name_): Remove. (Output_section::Input_section_sort_compare): Remove logic for sections without names. (Output_section::Input_section_sort_init_fini_compare): Likewise. (Output_section::Input_section_sort_section_prefix_special_ordering_compare): Likewise. (Output_section::Input_section_sort_section_name_compare): Likewise. --- gold/ChangeLog | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gold/ChangeLog') diff --git a/gold/ChangeLog b/gold/ChangeLog index 4fce2cb..0fa1561 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,25 @@ +2014-09-02 Cary Coutant + + PR gold/17005 + * ehframe.cc (Fde::write): Add output_offset parameter. + (Cie::write): Likewise. + (Eh_frame::set_final_data_size): Account for offset within output + section. + (Eh_frame::do_sized_write): Likewise. + * ehframe.h (Fde::write): Add output_offset parameter. + (Cie::write): Likewise. + * output.cc (Output_section::Input_section_sort_entry): Remove + section_has_name_; add output_section_name parameter. Use + output section name for non-input sections. + (Output_section::Input_section_sort_entry::section_has_name): Remove. + (Output_section::Input_section_sort_entry::section_has_name_): Remove. + (Output_section::Input_section_sort_compare): Remove logic for + sections without names. + (Output_section::Input_section_sort_init_fini_compare): Likewise. + (Output_section::Input_section_sort_section_prefix_special_ordering_compare): + Likewise. + (Output_section::Input_section_sort_section_name_compare): Likewise. + 2014-08-29 Han Shen Jing Yu -- cgit v1.1