X-Git-Url: https://oss.titaniummirror.com/gitweb?p=msp430-binutils.git;a=blobdiff_plain;f=ld%2Femultempl%2Fhppaelf.em;h=3ce5d54af7f3c657a79b55935fe815d95bcf504a;hp=f1e1c4507b42d83cc451117ff53e4f8d4c9bb197;hb=88750007d7869f178f0ba528f41efd3b74c424cf;hpb=6df9443a374e2b81278c61b8afc0a1eef7db280b diff --git a/ld/emultempl/hppaelf.em b/ld/emultempl/hppaelf.em index f1e1c45..3ce5d54 100644 --- a/ld/emultempl/hppaelf.em +++ b/ld/emultempl/hppaelf.em @@ -1,6 +1,6 @@ # This shell script emits a C file. -*- C -*- # Copyright 1991, 1993, 1994, 1997, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2007 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # # This file is part of the GNU Binutils. # @@ -59,6 +59,8 @@ hppaelf_after_parse (void) lang_input_file_is_l_enum, NULL); */ + + after_parse_default (); } /* This is called before the input files are opened. We create a new @@ -67,23 +69,18 @@ hppaelf_after_parse (void) static void hppaelf_create_output_section_statements (void) { - extern const bfd_target bfd_elf32_hppa_linux_vec; - extern const bfd_target bfd_elf32_hppa_nbsd_vec; - extern const bfd_target bfd_elf32_hppa_vec; - - if (link_info.hash->creator != &bfd_elf32_hppa_linux_vec - && link_info.hash->creator != &bfd_elf32_hppa_nbsd_vec - && link_info.hash->creator != &bfd_elf32_hppa_vec) + if (!(bfd_get_flavour (link_info.output_bfd) == bfd_target_elf_flavour + && elf_object_id (link_info.output_bfd) == HPPA_ELF_TDATA)) return; stub_file = lang_add_input_file ("linker stubs", lang_input_file_is_fake_enum, NULL); - stub_file->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; @@ -184,13 +181,11 @@ hppaelf_add_stub_section (const char *stub_sec_name, asection *input_section) 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; @@ -236,7 +231,7 @@ build_section_lists (lang_statement_union_type *statement) if (!((lang_input_statement_type *) i->owner->usrdata)->just_syms_flag && (i->flags & SEC_EXCLUDE) == 0 && i->output_section != NULL - && i->output_section->owner == output_bfd) + && i->output_section->owner == link_info.output_bfd) { elf32_hppa_next_input_section (&link_info, i); } @@ -244,24 +239,24 @@ build_section_lists (lang_statement_union_type *statement) } -/* 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 (void) +gld${EMULATION_NAME}_after_allocation (void) { - /* bfd_elf_discard_info just plays with debugging sections, - ie. doesn't affect any code, so we can delay resizing the + /* 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_discard_info (output_bfd, &link_info)) + if (bfd_elf_discard_info (link_info.output_bfd, &link_info)) 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) { - int ret = elf32_hppa_setup_section_lists (output_bfd, &link_info); + int ret = elf32_hppa_setup_section_lists (link_info.output_bfd, + &link_info); if (ret != 0) { @@ -274,7 +269,7 @@ gld${EMULATION_NAME}_finish (void) 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, @@ -294,7 +289,7 @@ gld${EMULATION_NAME}_finish (void) 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; @@ -307,8 +302,6 @@ gld${EMULATION_NAME}_finish (void) einfo ("%X%P: can not build stubs: %E\n"); } } - - finish_default (); } @@ -349,17 +342,18 @@ PARSE_AND_LIST_LONGOPTS=' 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" )); ' @@ -381,5 +375,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