From 85fdf9067facc06446531798a158b53c03c1373c Mon Sep 17 00:00:00 2001 From: Andrew Haley Date: Wed, 21 Apr 2010 16:32:31 +0000 Subject: 2010-04-15 Andrew Haley * emultempl/armelf.em (merge_exidx_entries): New variable. (OPTION_NO_MERGE_EXIDX_ENTRIES): New definition. ("no-merge-exidx-entries"): New option. * ld.texinfo (merge-exidx-entries): Document this option. 2010-04-15 Andrew Haley * bfd-in.h (elf32_arm_fix_exidx_coverage): Add new flag: merge_exidx_entries. * bfd-in2.h: Likewise. * elf32-arm.c (elf32_arm_fix_exidx_coverage): Likewise. Use it to control merging of exidx entries. 2010-04-15 Andrew Haley * options.h (merge_exidx_entries): New option. * arm.cc (class Arm_exidx_fixup): Add new arg, merge_exidx_entries. (class Arm_exidx_fixup::merge_exidx_entries_): New member. (Output_section::fix_exidx_coverage): Add new arg, merge_exidx_entries. (Target_arm::merge_exidx_entries): New function. (process_exidx_entry): Don't merge if merge_exidx_entries_ is false. (Arm_output_section::fix_exidx_coverage): Pass merge_exidx_entries to Arm_exidx_fixup constructor. Add new arg, merge_exidx_entries. (Target_arm::fix_exidx_coverage): pass merge_exidx_entries to Arm_output_section::fix_exidx_coverage. --- ld/ChangeLog | 7 +++++++ ld/emultempl/armelf.em | 12 +++++++++++- ld/ld.texinfo | 4 ++++ 3 files changed, 22 insertions(+), 1 deletion(-) (limited to 'ld') diff --git a/ld/ChangeLog b/ld/ChangeLog index 4268690..e0745e5 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,10 @@ +2010-04-15 Andrew Haley + + * emultempl/armelf.em (merge_exidx_entries): New variable. + (OPTION_NO_MERGE_EXIDX_ENTRIES): New definition. + ("no-merge-exidx-entries"): New option. + * ld.texinfo (merge-exidx-entries): Document this option. + 2010-04-14 Tristan Gingold * emulparams/alphavms.sh: New file. diff --git a/ld/emultempl/armelf.em b/ld/emultempl/armelf.em index 4783bf8..6c4c78d 100644 --- a/ld/emultempl/armelf.em +++ b/ld/emultempl/armelf.em @@ -41,6 +41,7 @@ static int fix_cortex_a8 = -1; static int no_enum_size_warning = 0; static int no_wchar_size_warning = 0; static int pic_veneer = 0; +static int merge_exidx_entries = -1; static void gld${EMULATION_NAME}_before_parse (void) @@ -314,7 +315,8 @@ gld${EMULATION_NAME}_after_allocation (void) qsort (sec_list, sec_count, sizeof (asection *), &compare_output_sec_vma); - if (elf32_arm_fix_exidx_coverage (sec_list, sec_count, &link_info)) + if (elf32_arm_fix_exidx_coverage (sec_list, sec_count, &link_info, + merge_exidx_entries)) need_laying_out = 1; free (sec_list); @@ -526,6 +528,7 @@ PARSE_AND_LIST_PROLOGUE=' #define OPTION_NO_WCHAR_SIZE_WARNING 313 #define OPTION_FIX_CORTEX_A8 314 #define OPTION_NO_FIX_CORTEX_A8 315 +#define OPTION_NO_MERGE_EXIDX_ENTRIES 316 ' PARSE_AND_LIST_SHORTOPTS=p @@ -547,6 +550,7 @@ PARSE_AND_LIST_LONGOPTS=' { "no-wchar-size-warning", no_argument, NULL, OPTION_NO_WCHAR_SIZE_WARNING}, { "fix-cortex-a8", no_argument, NULL, OPTION_FIX_CORTEX_A8 }, { "no-fix-cortex-a8", no_argument, NULL, OPTION_NO_FIX_CORTEX_A8 }, + { "no-merge-exidx-entries", no_argument, NULL, OPTION_NO_MERGE_EXIDX_ENTRIES }, ' PARSE_AND_LIST_OPTIONS=' @@ -574,6 +578,8 @@ PARSE_AND_LIST_OPTIONS=' the linker should choose suitable defaults.\n" )); fprintf (file, _(" --[no-]fix-cortex-a8 Disable/enable Cortex-A8 Thumb-2 branch erratum fix\n")); + fprintf (file, _(" --no-merge-exidx-entries Disable merging exidx entries\n")); + ' PARSE_AND_LIST_ARGS_CASES=' @@ -653,6 +659,10 @@ PARSE_AND_LIST_ARGS_CASES=' case OPTION_NO_FIX_CORTEX_A8: fix_cortex_a8 = 0; break; + + case OPTION_NO_MERGE_EXIDX_ENTRIES: + merge_exidx_entries = 0; + ' # We have our own before_allocation etc. functions, but they call diff --git a/ld/ld.texinfo b/ld/ld.texinfo index 6bcc6ff..6532742 100644 --- a/ld/ld.texinfo +++ b/ld/ld.texinfo @@ -5939,6 +5939,10 @@ The @samp{--fix-cortex-a8} switch enables a link-time workaround for an erratum The erratum only affects Thumb-2 code. Please contact ARM for further details. +@kindex --merge-exidx-entries +@kindex --no-merge-exidx-entries +The @samp{--no-merge-exidx-entries} switch disables the merging of adjacent exidx entries in debuginfo. + @ifclear GENERIC @lowersections @end ifclear -- cgit v1.1