X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=ld%2Femultempl%2Fhppaelf.em;h=7c47e9918f2f04df43b531fd77840f458dd8452f;hb=49c16254b41d56c35ce788eae76a1c1bc22db7ac;hp=fa32772a6b77309bfda99888058d680db177f043;hpb=3231d22e8fb33768ce829f368b33b8a0594a3e18;p=deliverable%2Fbinutils-gdb.git diff --git a/ld/emultempl/hppaelf.em b/ld/emultempl/hppaelf.em index fa32772a6b..7c47e9918f 100644 --- a/ld/emultempl/hppaelf.em +++ b/ld/emultempl/hppaelf.em @@ -1,12 +1,11 @@ # This shell script emits a C file. -*- C -*- -# Copyright (C) 1991, 93, 94, 95, 97, 99, 2000 -# Free Software Foundation, Inc. +# Copyright (C) 1991-2020 Free Software Foundation, Inc. # -# This file is part of GLD, the Gnu Linker. +# This file is part of the GNU Binutils. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -16,25 +15,18 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, +# MA 02110-1301, USA. # -# This file is sourced from elf32.em, and defines extra hppa-elf +# This file is sourced from elf.em, and defines extra hppa-elf # specific routines. # -cat >>e${EMULATION_NAME}.c <the_bfd = bfd_create ("linker stubs", output_bfd); + stub_file->the_bfd = bfd_create ("linker stubs", link_info.output_bfd); if (stub_file->the_bfd == NULL || ! bfd_set_arch_mach (stub_file->the_bfd, - bfd_get_arch (output_bfd), - bfd_get_mach (output_bfd))) + bfd_get_arch (link_info.output_bfd), + bfd_get_mach (link_info.output_bfd))) { - einfo ("%X%P: can not create BFD %E\n"); + einfo (_("%F%P: can not create BFD: %E\n")); return; } + stub_file->the_bfd->flags |= BFD_LINKER_CREATED; ldlang_add_file (stub_file); -} - -/* Walk all the lang statements splicing out any padding statements from - the list. */ - -static void -hppaelf_delete_padding_statements (list) - lang_statement_list_type *list; -{ - lang_statement_union_type *s; - lang_statement_union_type **ps; - for (ps = &list->head; (s = *ps) != NULL; ps = &s->next) - { - switch (s->header.type) - { - - /* We want to recursively walk these sections. */ - case lang_constructors_statement_enum: - hppaelf_delete_padding_statements (&constructor_list); - break; - - case lang_output_section_statement_enum: - hppaelf_delete_padding_statements (&s->output_section_statement.children); - break; - - case lang_group_statement_enum: - hppaelf_delete_padding_statements (&s->group_statement.children); - break; - - case lang_wild_statement_enum: - hppaelf_delete_padding_statements (&s->wild_statement.children); - break; - - /* Here's what we are really looking for. Splice these out of - the list. */ - case lang_padding_statement_enum: - *ps = s->next; - if (*ps == NULL) - list->tail = ps; - break; - - /* We don't care about these cases. */ - case lang_data_statement_enum: - case lang_object_symbols_statement_enum: - case lang_output_statement_enum: - case lang_target_statement_enum: - case lang_input_section_enum: - case lang_input_statement_enum: - case lang_assignment_statement_enum: - case lang_address_statement_enum: - break; - - default: - abort (); - break; - } - } + elf32_hppa_init_stub_bfd (stub_file->the_bfd, &link_info); } @@ -133,18 +100,13 @@ struct hook_stub_info /* Traverse the linker tree to find the spot where the stub goes. */ -static boolean hook_in_stub - PARAMS ((struct hook_stub_info *, lang_statement_union_type **)); - -static boolean -hook_in_stub (info, lp) - struct hook_stub_info *info; - lang_statement_union_type **lp; +static bfd_boolean +hook_in_stub (struct hook_stub_info *info, lang_statement_union_type **lp) { lang_statement_union_type *l; - boolean ret; + bfd_boolean ret; - for (; (l = *lp) != NULL; lp = &l->next) + for (; (l = *lp) != NULL; lp = &l->header.next) { switch (l->header.type) { @@ -180,7 +142,7 @@ hook_in_stub (info, lp) before its associated input section. */ *lp = info->add.head; *(info->add.tail) = l; - return true; + return TRUE; } break; @@ -201,7 +163,7 @@ hook_in_stub (info, lp) break; } } - return false; + return FALSE; } @@ -211,33 +173,27 @@ hook_in_stub (info, lp) immediately before INPUT_SECTION. */ static asection * -hppaelf_add_stub_section (stub_name, input_section) - const char *stub_name; - asection *input_section; +hppaelf_add_stub_section (const char *stub_sec_name, asection *input_section) { asection *stub_sec; flagword flags; asection *output_section; - const char *secname; lang_output_section_statement_type *os; struct hook_stub_info info; - stub_sec = bfd_make_section_anyway (stub_file->the_bfd, stub_name); - if (stub_sec == NULL) - goto err_ret; - flags = (SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_CODE | SEC_HAS_CONTENTS | SEC_RELOC | SEC_IN_MEMORY | SEC_KEEP); - if (!bfd_set_section_flags (stub_file->the_bfd, stub_sec, flags)) + stub_sec = bfd_make_section_anyway_with_flags (stub_file->the_bfd, + stub_sec_name, flags); + if (stub_sec == NULL) goto err_ret; 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; lang_list_init (&info.add); - wild_doit (&info.add, stub_sec, os, stub_file); + lang_add_section (&info.add, stub_sec, NULL, os); if (info.add.head == NULL) goto err_ret; @@ -246,7 +202,7 @@ hppaelf_add_stub_section (stub_name, input_section) return stub_sec; err_ret: - einfo ("%X%P: can not make stub section: %E\n"); + einfo (_("%X%P: can not make stub section: %E\n")); return NULL; } @@ -254,93 +210,105 @@ hppaelf_add_stub_section (stub_name, input_section) /* Another call-back for elf32_hppa_size_stubs. */ static void -hppaelf_layaout_sections_again () +hppaelf_layout_sections_again (void) { /* If we have changed sizes of the stub sections, then we need to recalculate all the section offsets. This may mean we need to add even more stubs. */ + ldelf_map_segments (TRUE); + need_laying_out = -1; +} - /* Delete all the padding statements, they're no longer valid. */ - hppaelf_delete_padding_statements (stat_ptr); - - /* Resize the sections. */ - lang_size_sections (stat_ptr->head, abs_output_section, - &stat_ptr->head, 0, (bfd_vma) 0, false); - /* Redo special stuff. */ - ldemul_after_allocation (); +static void +build_section_lists (lang_statement_union_type *statement) +{ + if (statement->header.type == lang_input_section_enum) + { + asection *i = statement->input_section.section; - /* Do the assignments again. */ - lang_do_assignments (stat_ptr->head, abs_output_section, - (fill_type) 0, (bfd_vma) 0); + 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) + { + elf32_hppa_next_input_section (&link_info, i); + } + } } -/* Final emulation specific call. For the PA we use this opportunity - to build linker stubs. */ +/* For the PA we use this opportunity to size and build linker stubs. */ static void -hppaelf_finish () +gld${EMULATION_NAME}_after_allocation (void) { - /* If generating a relocateable output file, then we don't - have to examine the relocs. */ - if (link_info.relocateable) - return; - - /* Call into the BFD backend to do the real work. */ - if (! elf32_hppa_size_stubs (stub_file->the_bfd, - multi_subspace, - &link_info, - &hppaelf_add_stub_section, - &hppaelf_layaout_sections_again)) - { - einfo ("%X%P: can not size stub section: %E\n"); - return; - } - - /* Set the global data pointer. */ - if (! elf32_hppa_set_gp (output_bfd, &link_info)) + int ret; + + /* bfd_elf_discard_info just plays with data and debugging sections, + ie. doesn't affect code size, so we can delay resizing the + sections. It's likely we'll resize everything in the process of + adding stubs. */ + ret = bfd_elf_discard_info (link_info.output_bfd, &link_info); + if (ret < 0) { - einfo ("%X%P: can not set gp\n"); + einfo (_("%X%P: .eh_frame/.stab edit: %E\n")); return; } + else if (ret > 0) + need_laying_out = 1; - /* Now build the linker stubs. */ - if (stub_file->the_bfd->sections != NULL) + /* If generating a relocatable output file, then we don't + have to examine the relocs. */ + if (stub_file != NULL && !bfd_link_relocatable (&link_info)) { - if (! elf32_hppa_build_stubs (&link_info)) - einfo ("%X%P: can not build stubs: %E\n"); - } -} - + ret = elf32_hppa_setup_section_lists (link_info.output_bfd, &link_info); + if (ret != 0) + { + if (ret < 0) + { + einfo (_("%X%P: can not size stub section: %E\n")); + return; + } -/* Avoid processing the fake stub_file in vercheck, stat_needed and - check_needed routines. */ + lang_for_each_statement (build_section_lists); -static void hppa_for_each_input_file_wrapper - PARAMS ((lang_input_statement_type *)); -static void hppa_lang_for_each_input_file - PARAMS ((void (*) (lang_input_statement_type *))); + /* Call into the BFD backend to do the real work. */ + if (! elf32_hppa_size_stubs (link_info.output_bfd, + stub_file->the_bfd, + &link_info, + multi_subspace, + group_size, + &hppaelf_add_stub_section, + &hppaelf_layout_sections_again)) + { + einfo (_("%X%P: can not size stub section: %E\n")); + return; + } + } + } -static void (*real_func) PARAMS ((lang_input_statement_type *)); + if (need_laying_out != -1) + ldelf_map_segments (need_laying_out); -static void hppa_for_each_input_file_wrapper (l) - lang_input_statement_type *l; -{ - if (l != stub_file) - (*real_func) (l); -} + if (!bfd_link_relocatable (&link_info)) + { + /* Set the global data pointer. */ + if (! elf32_hppa_set_gp (link_info.output_bfd, &link_info)) + { + einfo (_("%X%P: can not set gp\n")); + return; + } -static void -hppa_lang_for_each_input_file (func) - void (*func) PARAMS ((lang_input_statement_type *)); -{ - real_func = func; - lang_for_each_input_file (&hppa_for_each_input_file_wrapper); + /* Now build the linker stubs. */ + if (stub_file != NULL && stub_file->the_bfd->sections != NULL) + { + if (! elf32_hppa_build_stubs (&link_info)) + einfo (_("%X%P: can not build stubs: %E\n")); + } + } } -#define lang_for_each_input_file hppa_lang_for_each_input_file - EOF # Define some shell vars to insert bits of code into the standard elf @@ -348,16 +316,28 @@ EOF # PARSE_AND_LIST_PROLOGUE=' #define OPTION_MULTI_SUBSPACE 301 +#define OPTION_STUBGROUP_SIZE (OPTION_MULTI_SUBSPACE + 1) ' PARSE_AND_LIST_LONGOPTS=' - { "multi-subspace", no_argument, NULL, OPTION_MULTI_SUBSPACE}, + { "multi-subspace", no_argument, NULL, OPTION_MULTI_SUBSPACE }, + { "stub-group-size", required_argument, NULL, OPTION_STUBGROUP_SIZE }, ' PARSE_AND_LIST_OPTIONS=' fprintf (file, _("\ --multi-subspace Generate import and export stubs to support\n\ - multiple sub-space shared libraries\n" + multiple sub-space shared libraries\n" + )); + fprintf (file, _("\ + --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 before 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" )); ' @@ -365,9 +345,19 @@ PARSE_AND_LIST_ARGS_CASES=' case OPTION_MULTI_SUBSPACE: multi_subspace = 1; break; + + case OPTION_STUBGROUP_SIZE: + { + const char *end; + group_size = bfd_scan_vma (optarg, &end, 0); + if (*end) + einfo (_("%F%P: invalid number `%s'\''\n"), optarg); + } + break; ' # Put these extra hppaelf routines in ld_${EMULATION_NAME}_emulation # -LDEMUL_FINISH=hppaelf_finish +LDEMUL_AFTER_PARSE=hppaelf_after_parse +LDEMUL_AFTER_ALLOCATION=gld${EMULATION_NAME}_after_allocation LDEMUL_CREATE_OUTPUT_SECTION_STATEMENTS=hppaelf_create_output_section_statements