diff options
Diffstat (limited to 'ld/emultempl/armelf.em')
| -rw-r--r-- | ld/emultempl/armelf.em | 12 |
1 files changed, 11 insertions, 1 deletions
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 |