X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=ld%2Femultempl%2Farmelf.em;h=27f95f2a2e40e8e665b5ed1481e6f34e297374f4;hb=29063f8bfb9d68a213efd1d0ab7a66f97ed9a013;hp=6c4c78d504782bfd8779c7442f47b062fcd808e5;hpb=85fdf9067facc06446531798a158b53c03c1373c;p=deliverable%2Fbinutils-gdb.git diff --git a/ld/emultempl/armelf.em b/ld/emultempl/armelf.em index 6c4c78d504..27f95f2a2e 100644 --- a/ld/emultempl/armelf.em +++ b/ld/emultempl/armelf.em @@ -1,7 +1,5 @@ # This shell script emits a C file. -*- C -*- -# Copyright 1991, 1993, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, -# 2004, 2005, 2006, 2007, 2008, 2009 -# Free Software Foundation, Inc. +# Copyright (C) 1991-2016 Free Software Foundation, Inc. # # This file is part of the GNU Binutils. # @@ -30,18 +28,26 @@ fragment <dynamic_sections_created) + if (elf_hash_table (&link_info)->dynobj == NULL) { /* Here we rummage through the found bfds to collect glue information. */ LANG_FOR_EACH_INPUT_STATEMENT (is) @@ -77,7 +106,9 @@ arm_elf_before_allocation (void) if (!bfd_elf32_arm_process_before_allocation (is->the_bfd, &link_info) - || !bfd_elf32_arm_vfp11_erratum_scan (is->the_bfd, &link_info)) + || !bfd_elf32_arm_vfp11_erratum_scan (is->the_bfd, &link_info) + || !bfd_elf32_arm_stm32l4xx_erratum_scan (is->the_bfd, + &link_info)) /* xgettext:c-format */ einfo (_("Errors encountered processing file %s"), is->filename); } @@ -182,13 +213,13 @@ hook_in_stub (struct hook_stub_info *info, lang_statement_union_type **lp) immediately after INPUT_SECTION. */ static asection * -elf32_arm_add_stub_section (const char *stub_sec_name, - asection *input_section) +elf32_arm_add_stub_section (const char * stub_sec_name, + asection * output_section, + asection * after_input_section, + unsigned int alignment_power) { asection *stub_sec; flagword flags; - asection *output_section; - const char *secname; lang_output_section_statement_type *os; struct hook_stub_info info; @@ -199,21 +230,36 @@ elf32_arm_add_stub_section (const char *stub_sec_name, if (stub_sec == NULL) goto err_ret; - bfd_set_section_alignment (stub_file->the_bfd, stub_sec, 3); + bfd_set_section_alignment (stub_file->the_bfd, stub_sec, alignment_power); - output_section = input_section->output_section; - secname = bfd_get_section_name (output_section->owner, output_section); - os = lang_output_section_find (secname); + os = lang_output_section_get (output_section); - info.input_section = input_section; + info.input_section = after_input_section; lang_list_init (&info.add); - lang_add_section (&info.add, stub_sec, os); + lang_add_section (&info.add, stub_sec, NULL, os); if (info.add.head == NULL) goto err_ret; - if (hook_in_stub (&info, &os->children.head)) - return stub_sec; + if (after_input_section == NULL) + { + lang_statement_union_type **lp = &os->children.head; + lang_statement_union_type *l, *lprev = NULL; + + for (; (l = *lp) != NULL; lp = &l->header.next, lprev = l); + + if (lprev) + lprev->header.next = info.add.head; + else + os->children.head = info.add.head; + + return stub_sec; + } + else + { + if (hook_in_stub (&info, &os->children.head)) + return stub_sec; + } err_ret: einfo ("%X%P: can not make stub section: %E\n"); @@ -239,7 +285,7 @@ build_section_lists (lang_statement_union_type *statement) { asection *i = statement->input_section.section; - if (!((lang_input_statement_type *) i->owner->usrdata)->just_syms_flag + if (i->sec_info_type != SEC_INFO_TYPE_JUST_SYMS && (i->flags & SEC_EXCLUDE) == 0 && i->output_section != NULL && i->output_section->owner == link_info.output_bfd) @@ -253,88 +299,92 @@ compare_output_sec_vma (const void *a, const void *b) asection *asec = *(asection **) a, *bsec = *(asection **) b; asection *aout = asec->output_section, *bout = bsec->output_section; bfd_vma avma, bvma; - + /* If there's no output section for some reason, compare equal. */ if (!aout || !bout) return 0; - + avma = aout->vma + asec->output_offset; bvma = bout->vma + bsec->output_offset; - + if (avma > bvma) return 1; else if (avma < bvma) return -1; - + return 0; } static void gld${EMULATION_NAME}_after_allocation (void) { - if (!link_info.relocatable) + int ret; + + /* Build a sorted list of input text sections, then use that to process + the unwind table index. */ + unsigned int list_size = 10; + asection **sec_list = (asection **) + xmalloc (list_size * sizeof (asection *)); + unsigned int sec_count = 0; + + LANG_FOR_EACH_INPUT_STATEMENT (is) { - /* Build a sorted list of input text sections, then use that to process - the unwind table index. */ - unsigned int list_size = 10; - asection **sec_list = (asection **) - xmalloc (list_size * sizeof (asection *)); - unsigned int sec_count = 0; + bfd *abfd = is->the_bfd; + asection *sec; - LANG_FOR_EACH_INPUT_STATEMENT (is) + if ((abfd->flags & (EXEC_P | DYNAMIC)) != 0) + continue; + + for (sec = abfd->sections; sec != NULL; sec = sec->next) { - bfd *abfd = is->the_bfd; - asection *sec; - - if ((abfd->flags & (EXEC_P | DYNAMIC)) != 0) - continue; - - for (sec = abfd->sections; sec != NULL; sec = sec->next) + asection *out_sec = sec->output_section; + + if (out_sec + && elf_section_data (sec) + && elf_section_type (sec) == SHT_PROGBITS + && (elf_section_flags (sec) & SHF_EXECINSTR) != 0 + && (sec->flags & SEC_EXCLUDE) == 0 + && sec->sec_info_type != SEC_INFO_TYPE_JUST_SYMS + && out_sec != bfd_abs_section_ptr) { - asection *out_sec = sec->output_section; - - if (out_sec - && elf_section_data (sec) - && elf_section_type (sec) == SHT_PROGBITS - && (elf_section_flags (sec) & SHF_EXECINSTR) != 0 - && (sec->flags & SEC_EXCLUDE) == 0 - && sec->sec_info_type != ELF_INFO_TYPE_JUST_SYMS - && out_sec != bfd_abs_section_ptr) + if (sec_count == list_size) { - if (sec_count == list_size) - { - list_size *= 2; - sec_list = (asection **) - xrealloc (sec_list, list_size * sizeof (asection *)); - } - - sec_list[sec_count++] = sec; + list_size *= 2; + sec_list = (asection **) + xrealloc (sec_list, list_size * sizeof (asection *)); } + + sec_list[sec_count++] = sec; } } - - qsort (sec_list, sec_count, sizeof (asection *), &compare_output_sec_vma); - - if (elf32_arm_fix_exidx_coverage (sec_list, sec_count, &link_info, - merge_exidx_entries)) - need_laying_out = 1; - - free (sec_list); } + qsort (sec_list, sec_count, sizeof (asection *), &compare_output_sec_vma); + + if (elf32_arm_fix_exidx_coverage (sec_list, sec_count, &link_info, + params.merge_exidx_entries)) + need_laying_out = 1; + + free (sec_list); + /* bfd_elf32_discard_info just plays with debugging sections, ie. doesn't affect any code, so we can delay resizing the sections. It's likely we'll resize everything in the process of adding stubs. */ - if (bfd_elf_discard_info (link_info.output_bfd, & link_info)) + ret = bfd_elf_discard_info (link_info.output_bfd, & link_info); + if (ret < 0) + { + einfo ("%X%P: .eh_frame/.stab edit: %E\n"); + return; + } + else if (ret > 0) need_laying_out = 1; /* If generating a relocatable output file, then we don't have to examine the relocs. */ - if (stub_file != NULL && !link_info.relocatable) + if (stub_file != NULL && !bfd_link_relocatable (&link_info)) { - int ret = elf32_arm_setup_section_lists (link_info.output_bfd, & link_info); - + ret = elf32_arm_setup_section_lists (link_info.output_bfd, &link_info); if (ret != 0) { if (ret < 0) @@ -374,10 +424,14 @@ gld${EMULATION_NAME}_finish (void) /* Figure out where VFP11 erratum veneers (and the labels returning from same) have been placed. */ bfd_elf32_arm_vfp11_fix_veneer_locations (is->the_bfd, &link_info); + + /* Figure out where STM32L4XX erratum veneers (and the labels returning + from them) have been placed. */ + bfd_elf32_arm_stm32l4xx_fix_veneer_locations (is->the_bfd, &link_info); } } - if (! link_info.relocatable) + if (!bfd_link_relocatable (&link_info)) { /* Now build the linker stubs. */ if (stub_file->the_bfd->sections != NULL) @@ -389,9 +443,9 @@ gld${EMULATION_NAME}_finish (void) finish_default (); - if (thumb_entry_symbol) + if (params.thumb_entry_symbol) { - h = bfd_link_hash_lookup (link_info.hash, thumb_entry_symbol, + h = bfd_link_hash_lookup (link_info.hash, params.thumb_entry_symbol, FALSE, FALSE, TRUE); } else @@ -404,7 +458,8 @@ gld${EMULATION_NAME}_finish (void) h = bfd_link_hash_lookup (link_info.hash, entry_symbol.name, FALSE, FALSE, TRUE); eh = (struct elf_link_hash_entry *)h; - if (!h || ELF_ST_TYPE(eh->type) != STT_ARM_TFUNC) + if (!h || ARM_GET_SYM_BRANCH_TYPE (eh->target_internal) + != ST_BRANCH_TO_THUMB) return; } @@ -433,15 +488,15 @@ gld${EMULATION_NAME}_finish (void) sprintf_vma (buffer + 2, val); - if (thumb_entry_symbol != NULL && entry_symbol.name != NULL + if (params.thumb_entry_symbol != NULL && entry_symbol.name != NULL && entry_from_cmdline) einfo (_("%P: warning: '--thumb-entry %s' is overriding '-e %s'\n"), - thumb_entry_symbol, entry_symbol.name); + params.thumb_entry_symbol, entry_symbol.name); entry_symbol.name = buffer; } else einfo (_("%P: warning: cannot find thumb start symbol %s\n"), - thumb_entry_symbol); + params.thumb_entry_symbol); } /* This is a convenient point to tell BFD about target specific flags. @@ -459,12 +514,19 @@ arm_elf_create_output_section_statements (void) return; } - bfd_elf32_arm_set_target_relocs (link_info.output_bfd, &link_info, - target1_is_rel, - target2_type, fix_v4bx, use_blx, - vfp11_denorm_fix, no_enum_size_warning, - no_wchar_size_warning, - pic_veneer, fix_cortex_a8); + if (in_implib_filename) + { + params.in_implib_bfd = bfd_openr (in_implib_filename, + bfd_get_target (link_info.output_bfd)); + + if (params.in_implib_bfd == NULL) + einfo ("%F%s: Can't open: %E\n", in_implib_filename); + + if (!bfd_check_format (params.in_implib_bfd, bfd_object)) + einfo ("%F%s: Not a relocatable file: %E\n", in_implib_filename); + } + + bfd_elf32_arm_set_target_params (link_info.output_bfd, &link_info, ¶ms); stub_file = lang_add_input_file ("linker stubs", lang_input_file_is_fake_enum, @@ -478,7 +540,7 @@ arm_elf_create_output_section_statements (void) einfo ("%X%P: can not create BFD %E\n"); return; } - + stub_file->the_bfd->flags |= BFD_LINKER_CREATED; ldlang_add_file (stub_file); @@ -524,11 +586,17 @@ PARSE_AND_LIST_PROLOGUE=' #define OPTION_NO_ENUM_SIZE_WARNING 309 #define OPTION_PIC_VENEER 310 #define OPTION_FIX_V4BX_INTERWORKING 311 -#define OPTION_STUBGROUP_SIZE 312 +#define OPTION_STUBGROUP_SIZE 312 #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 +#define OPTION_NO_MERGE_EXIDX_ENTRIES 316 +#define OPTION_FIX_ARM1176 317 +#define OPTION_NO_FIX_ARM1176 318 +#define OPTION_LONG_PLT 319 +#define OPTION_STM32L4XX_FIX 320 +#define OPTION_CMSE_IMPLIB 321 +#define OPTION_IN_IMPLIB 322 ' PARSE_AND_LIST_SHORTOPTS=p @@ -544,6 +612,7 @@ PARSE_AND_LIST_LONGOPTS=' { "fix-v4bx-interworking", no_argument, NULL, OPTION_FIX_V4BX_INTERWORKING}, { "use-blx", no_argument, NULL, OPTION_USE_BLX}, { "vfp11-denorm-fix", required_argument, NULL, OPTION_VFP11_DENORM_FIX}, + { "fix-stm32l4xx-629360", optional_argument, NULL, OPTION_STM32L4XX_FIX}, { "no-enum-size-warning", no_argument, NULL, OPTION_NO_ENUM_SIZE_WARNING}, { "pic-veneer", no_argument, NULL, OPTION_PIC_VENEER}, { "stub-group-size", required_argument, NULL, OPTION_STUBGROUP_SIZE }, @@ -551,6 +620,11 @@ PARSE_AND_LIST_LONGOPTS=' { "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 }, + { "fix-arm1176", no_argument, NULL, OPTION_FIX_ARM1176 }, + { "no-fix-arm1176", no_argument, NULL, OPTION_NO_FIX_ARM1176 }, + { "long-plt", no_argument, NULL, OPTION_LONG_PLT }, + { "cmse-implib", no_argument, NULL, OPTION_CMSE_IMPLIB }, + { "in-implib", required_argument, NULL, OPTION_IN_IMPLIB }, ' PARSE_AND_LIST_OPTIONS=' @@ -563,23 +637,30 @@ PARSE_AND_LIST_OPTIONS=' fprintf (file, _(" --fix-v4bx-interworking Rewrite BX rn branch to ARMv4 interworking veneer\n")); fprintf (file, _(" --use-blx Enable use of BLX instructions\n")); fprintf (file, _(" --vfp11-denorm-fix Specify how to fix VFP11 denorm erratum\n")); + fprintf (file, _(" --fix-stm32l4xx-629360 Specify how to fix STM32L4XX 629360 erratum\n")); fprintf (file, _(" --no-enum-size-warning Don'\''t warn about objects with incompatible\n" " enum sizes\n")); - fprintf (file, _(" --no-wchar-size-warning Don'\''t warn about objects with incompatible" + fprintf (file, _(" --no-wchar-size-warning Don'\''t warn about objects with incompatible\n" " wchar_t sizes\n")); fprintf (file, _(" --pic-veneer Always generate PIC interworking veneers\n")); + fprintf (file, _(" --long-plt Generate long .plt entries\n" + " to handle large .plt/.got displacements\n")); + fprintf (file, _(" --cmse-implib Make import library to be a secure gateway import\n" + " library as per ARMv8-M Security Extensions\n")); + fprintf (file, _(" --in-implib Import library whose symbols address must\n" + " remain stable\n")); fprintf (file, _("\ - --stub-group-size=N Maximum size of a group of input sections that can be\n\ - handled by one stub section. A negative value\n\ - locates all stubs after their branches (with a\n\ - group size of -N), while a positive value allows\n\ - two groups of input sections, one before, and one\n\ - after each stub section. Values of +/-1 indicate\n\ - the linker should choose suitable defaults.\n" - )); + --stub-group-size=N Maximum size of a group of input sections that\n\ + can be handled by one stub section. A negative\n\ + value locates all stubs after their branches\n\ + (with a group size of -N), while a positive\n\ + value allows two groups of input sections, one\n\ + before, and one after each stub section.\n\ + Values of +/-1 indicate the linker should\n\ + 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")); - + fprintf (file, _(" --[no-]fix-arm1176 Disable/enable ARM1176 BLX immediate erratum fix\n")); ' PARSE_AND_LIST_ARGS_CASES=' @@ -588,58 +669,71 @@ PARSE_AND_LIST_ARGS_CASES=' break; case OPTION_THUMB_ENTRY: - thumb_entry_symbol = optarg; + params.thumb_entry_symbol = optarg; break; case OPTION_BE8: - byteswap_code = 1; + params.byteswap_code = 1; break; case OPTION_TARGET1_REL: - target1_is_rel = 1; + params.target1_is_rel = 1; break; case OPTION_TARGET1_ABS: - target1_is_rel = 0; + params.target1_is_rel = 0; break; case OPTION_TARGET2: - target2_type = optarg; + params.target2_type = optarg; break; case OPTION_FIX_V4BX: - fix_v4bx = 1; + params.fix_v4bx = 1; break; case OPTION_FIX_V4BX_INTERWORKING: - fix_v4bx = 2; + params.fix_v4bx = 2; break; case OPTION_USE_BLX: - use_blx = 1; + params.use_blx = 1; break; case OPTION_VFP11_DENORM_FIX: if (strcmp (optarg, "none") == 0) - vfp11_denorm_fix = BFD_ARM_VFP11_FIX_NONE; + params.vfp11_denorm_fix = BFD_ARM_VFP11_FIX_NONE; else if (strcmp (optarg, "scalar") == 0) - vfp11_denorm_fix = BFD_ARM_VFP11_FIX_SCALAR; + params.vfp11_denorm_fix = BFD_ARM_VFP11_FIX_SCALAR; else if (strcmp (optarg, "vector") == 0) - vfp11_denorm_fix = BFD_ARM_VFP11_FIX_VECTOR; + params.vfp11_denorm_fix = BFD_ARM_VFP11_FIX_VECTOR; else einfo (_("Unrecognized VFP11 fix type '\''%s'\''.\n"), optarg); break; + case OPTION_STM32L4XX_FIX: + if (!optarg) + params.stm32l4xx_fix = BFD_ARM_STM32L4XX_FIX_DEFAULT; + else if (strcmp (optarg, "none") == 0) + params.stm32l4xx_fix = BFD_ARM_STM32L4XX_FIX_NONE; + else if (strcmp (optarg, "default") == 0) + params.stm32l4xx_fix = BFD_ARM_STM32L4XX_FIX_DEFAULT; + else if (strcmp (optarg, "all") == 0) + params.stm32l4xx_fix = BFD_ARM_STM32L4XX_FIX_ALL; + else + einfo (_("Unrecognized STM32L4XX fix type '\''%s'\''.\n"), optarg); + break; + case OPTION_NO_ENUM_SIZE_WARNING: - no_enum_size_warning = 1; + params.no_enum_size_warning = 1; break; case OPTION_NO_WCHAR_SIZE_WARNING: - no_wchar_size_warning = 1; + params.no_wchar_size_warning = 1; break; case OPTION_PIC_VENEER: - pic_veneer = 1; + params.pic_veneer = 1; break; case OPTION_STUBGROUP_SIZE: @@ -653,16 +747,36 @@ PARSE_AND_LIST_ARGS_CASES=' break; case OPTION_FIX_CORTEX_A8: - fix_cortex_a8 = 1; + params.fix_cortex_a8 = 1; break; case OPTION_NO_FIX_CORTEX_A8: - fix_cortex_a8 = 0; + params.fix_cortex_a8 = 0; break; case OPTION_NO_MERGE_EXIDX_ENTRIES: - merge_exidx_entries = 0; + params.merge_exidx_entries = 0; + break; + case OPTION_FIX_ARM1176: + params.fix_arm1176 = 1; + break; + + case OPTION_NO_FIX_ARM1176: + params.fix_arm1176 = 0; + break; + + case OPTION_LONG_PLT: + bfd_elf32_arm_use_long_plt (); + break; + + case OPTION_CMSE_IMPLIB: + params.cmse_implib = 1; + break; + + case OPTION_IN_IMPLIB: + in_implib_filename = optarg; + break; ' # We have our own before_allocation etc. functions, but they call @@ -673,6 +787,7 @@ LDEMUL_CREATE_OUTPUT_SECTION_STATEMENTS=arm_elf_create_output_section_statements # Replace the elf before_parse function with our own. LDEMUL_BEFORE_PARSE=gld"${EMULATION_NAME}"_before_parse +LDEMUL_SET_SYMBOLS=gld"${EMULATION_NAME}"_set_symbols # Call the extra arm-elf function LDEMUL_FINISH=gld${EMULATION_NAME}_finish