X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=ld%2Femultempl%2Fhppaelf.em;h=695579650f5b3f0ba5f5e2a3755dcc833cd6ac00;hb=0cdcdbf8dbadc70194d46b4c3400ba8cc2a10fc0;hp=c44b01a7b8aa729ce955978c06f999c16a122aa8;hpb=b34976b65aea8f33690229600bbf4527ec3118e1;p=deliverable%2Fbinutils-gdb.git diff --git a/ld/emultempl/hppaelf.em b/ld/emultempl/hppaelf.em index c44b01a7b8..695579650f 100644 --- a/ld/emultempl/hppaelf.em +++ b/ld/emultempl/hppaelf.em @@ -1,12 +1,11 @@ # This shell script emits a C file. -*- C -*- -# Copyright 1991, 1993, 1994, 1997, 1999, 2000, 2001, 2002 -# Free Software Foundation, Inc. +# Copyright (C) 1991-2014 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 # 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"); return; } + stub_file->the_bfd->flags |= BFD_LINKER_CREATED; ldlang_add_file (stub_file); } @@ -99,13 +99,8 @@ struct hook_stub_info /* Traverse the linker tree to find the spot where the stub goes. */ -static bfd_boolean hook_in_stub - PARAMS ((struct hook_stub_info *, lang_statement_union_type **)); - static bfd_boolean -hook_in_stub (info, lp) - struct hook_stub_info *info; - lang_statement_union_type **lp; +hook_in_stub (struct hook_stub_info *info, lang_statement_union_type **lp) { lang_statement_union_type *l; bfd_boolean ret; @@ -177,33 +172,27 @@ hook_in_stub (info, lp) immediately before INPUT_SECTION. */ static asection * -hppaelf_add_stub_section (stub_sec_name, input_section) - const char *stub_sec_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_sec_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); - lang_add_section (&info.add, stub_sec, os, stub_file); + lang_add_section (&info.add, stub_sec, NULL, os); if (info.add.head == NULL) goto err_ret; @@ -220,62 +209,59 @@ hppaelf_add_stub_section (stub_sec_name, input_section) /* Another call-back for elf32_hppa_size_stubs. */ static void -hppaelf_layout_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. */ - need_laying_out = 0; - - lang_reset_memory_regions (); - - /* Resize the sections. */ - lang_size_sections (stat_ptr->head, abs_output_section, - &stat_ptr->head, 0, (bfd_vma) 0, NULL); - - /* Redo special stuff. */ - ldemul_after_allocation (); - - /* Do the assignments again. */ - lang_do_assignments (stat_ptr->head, abs_output_section, - (fill_type *) 0, (bfd_vma) 0); + gld${EMULATION_NAME}_map_segments (TRUE); + need_laying_out = -1; } static void -build_section_lists (statement) - lang_statement_union_type *statement; +build_section_lists (lang_statement_union_type *statement) { - if (statement->header.type == lang_input_section_enum - && !statement->input_section.ifile->just_syms_flag - && statement->input_section.section->output_section != NULL - && statement->input_section.section->output_section->owner == output_bfd) + if (statement->header.type == lang_input_section_enum) { - elf32_hppa_next_input_section (&link_info, - statement->input_section.section); + asection *i = statement->input_section.section; + + 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 -gld${EMULATION_NAME}_finish () +gld${EMULATION_NAME}_after_allocation (void) { - /* bfd_elf32_discard_info just plays with debugging sections, - ie. doesn't affect any code, so we can delay resizing the + 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. */ - if (bfd_elf${ELFSIZE}_discard_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 (! link_info.relocateable) + if (stub_file != NULL && !link_info.relocatable) { - int ret = elf32_hppa_setup_section_lists (output_bfd, &link_info); - + ret = elf32_hppa_setup_section_lists (link_info.output_bfd, &link_info); if (ret != 0) { if (ret < 0) @@ -287,7 +273,7 @@ gld${EMULATION_NAME}_finish () lang_for_each_statement (build_section_lists); /* Call into the BFD backend to do the real work. */ - if (! elf32_hppa_size_stubs (output_bfd, + if (! elf32_hppa_size_stubs (link_info.output_bfd, stub_file->the_bfd, &link_info, multi_subspace, @@ -301,20 +287,20 @@ gld${EMULATION_NAME}_finish () } } - if (need_laying_out) - hppaelf_layout_sections_again (); + if (need_laying_out != -1) + gld${EMULATION_NAME}_map_segments (need_laying_out); - if (! link_info.relocateable) + if (! link_info.relocatable) { /* Set the global data pointer. */ - if (! elf32_hppa_set_gp (output_bfd, &link_info)) + if (! elf32_hppa_set_gp (link_info.output_bfd, &link_info)) { einfo ("%X%P: can not set gp\n"); return; } /* Now build the linker stubs. */ - if (stub_file->the_bfd->sections != NULL) + 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"); @@ -326,23 +312,16 @@ gld${EMULATION_NAME}_finish () /* Avoid processing the fake stub_file in vercheck, stat_needed and check_needed routines. */ -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 *))); +static void (*real_func) (lang_input_statement_type *); -static void (*real_func) PARAMS ((lang_input_statement_type *)); - -static void hppa_for_each_input_file_wrapper (l) - lang_input_statement_type *l; +static void hppa_for_each_input_file_wrapper (lang_input_statement_type *l) { if (l != stub_file) (*real_func) (l); } static void -hppa_lang_for_each_input_file (func) - void (*func) PARAMS ((lang_input_statement_type *)); +hppa_lang_for_each_input_file (void (*func) (lang_input_statement_type *)) { real_func = func; lang_for_each_input_file (&hppa_for_each_input_file_wrapper); @@ -360,28 +339,25 @@ PARSE_AND_LIST_PROLOGUE=' #define OPTION_STUBGROUP_SIZE (OPTION_MULTI_SUBSPACE + 1) ' -# The options are repeated below so that no abbreviations are allowed. -# Otherwise -s matches stub-group-size 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 }, { "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" + --multi-subspace Generate import and export stubs to support\n\ + multiple sub-space shared libraries\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 before 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 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" )); ' @@ -403,5 +379,5 @@ PARSE_AND_LIST_ARGS_CASES=' # Put these extra hppaelf routines in ld_${EMULATION_NAME}_emulation # LDEMUL_AFTER_PARSE=hppaelf_after_parse -LDEMUL_FINISH=gld${EMULATION_NAME}_finish +LDEMUL_AFTER_ALLOCATION=gld${EMULATION_NAME}_after_allocation LDEMUL_CREATE_OUTPUT_SECTION_STATEMENTS=hppaelf_create_output_section_statements