X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=ld%2Femultempl%2Fmmo.em;h=8b8a841939ff90fc8ede62f3f7f1d918dba67ae3;hb=1949ad044a6979e176b0d0ebd5cfebbf162dd4f5;hp=11475751da28bd85d3043b92df738d4057670026;hpb=a4308b792c484d8591846e1ee1850d62739aba3e;p=deliverable%2Fbinutils-gdb.git diff --git a/ld/emultempl/mmo.em b/ld/emultempl/mmo.em index 11475751da..8b8a841939 100644 --- a/ld/emultempl/mmo.em +++ b/ld/emultempl/mmo.em @@ -1,11 +1,11 @@ # This shell script emits a C file. -*- C -*- -# Copyright 2001, 2002, 2003, 2004, 2006 Free Software Foundation, Inc. +# Copyright (C) 2001-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, @@ -15,92 +15,174 @@ # # 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., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, +# MA 02110-1301, USA. # # This file is sourced from generic.em. -cat >>e${EMULATION_NAME}.c <>e${EMULATION_NAME}.c <flags & (SEC_EXCLUDE | SEC_LOAD)) != SEC_LOAD) - return FALSE; + /* We have nothing to say for anything other than a final link or + for sections that are excluded. */ + if (bfd_link_relocatable (&link_info) + || (s->flags & SEC_EXCLUDE) != 0) + return NULL; - /* Only care for sections we're going to load. */ - secname = s->name; os = lang_output_section_find (secname); /* We have an output section by this name. Place the section inside it (regardless of whether the linker script lists it as input). */ if (os != NULL) { - lang_add_section (&os->children, s, os); - return TRUE; + lang_add_section (&os->children, s, NULL, os); + return os; } - /* If this section does not have .text-type section flags or there's no - MMO_TEXT_SECTION_NAME, we don't have anything to say. */ - if ((s->flags & (SEC_CODE | SEC_READONLY)) == 0) - return FALSE; + flags = s->flags; + if (!bfd_link_relocatable (&link_info)) + { + nexts = s; + while ((nexts = bfd_get_next_section_by_name (nexts->owner, nexts)) + != NULL) + if (nexts->output_section == NULL + && (nexts->flags & SEC_EXCLUDE) == 0 + && ((nexts->flags ^ flags) & (SEC_LOAD | SEC_ALLOC)) == 0 + && (nexts->owner->flags & DYNAMIC) == 0 + && !bfd_input_just_syms (nexts->owner)) + flags = (((flags ^ SEC_READONLY) | (nexts->flags ^ SEC_READONLY)) + ^ SEC_READONLY); + } + + /* Check for matching section type flags for sections we care about. + A section without contents can have SEC_LOAD == 0, but we still + want it attached to a sane section so the symbols appear as + expected. */ + + if ((flags & (SEC_ALLOC | SEC_READONLY)) != SEC_READONLY) + for (i = 0; i < sizeof (holds) / sizeof (holds[0]); i++) + if ((flags & holds[i].nonzero_flags) != 0) + { + place = &holds[i].orphansave; + if (place->os == NULL) + place->os = lang_output_section_find (place->name); + break; + } + + if (place == NULL) + { + /* For other combinations, we have to give up, except we make + sure not to place the orphan section after the + linker-generated register section; that'd make it continue + the reg section and we never want that to happen for orphan + sections. */ + lang_output_section_statement_type *before; + lang_output_section_statement_type *lookup; + static struct orphan_save hold_nonreg = + { + NULL, + SEC_READONLY, + 0, 0, 0, 0 + }; - if (hold_text.os == NULL) - hold_text.os = lang_output_section_find (hold_text.name); + if (hold_nonreg.os == NULL) + { + before = lang_output_section_find (MMIX_REG_CONTENTS_SECTION_NAME); - place = &hold_text; - if (hold_text.os != NULL) - after = hold_text.os; - else - after = &lang_output_section_statement.head->output_section_statement; + /* If we have no such section, all fine; we don't care where + it's placed. */ + if (before == NULL) + return NULL; + + /* We have to find the oss before this one, so we can use that as + "after". */ + for (lookup = (void *) lang_os_list.head; + lookup != NULL && lookup->next != before; + lookup = lookup->next) + ; + + hold_nonreg.os = lookup; + } + + place = &hold_nonreg; + } - /* If there's an output section by this name, we'll use it, regardless - of section flags, in contrast to what's done in elf32.em. */ - os = lang_insert_orphan (s, secname, after, place, NULL, NULL); + after = place->os; + if (after == NULL) + return NULL; - /* We need an output section for .text as a root, so if there was none - (might happen with a peculiar linker script such as in "map - addresses", map-address.exp), we grab the output section created - above. */ - if (hold_text.os == NULL) - hold_text.os = os; + /* If there's an output section by *this* name, we'll use it, regardless + of actual section flags, in contrast to what's done in elf.em. */ + os = lang_insert_orphan (s, secname, 0, after, place, NULL, NULL); - return TRUE; + return os; } /* Remove the spurious settings of SEC_RELOC that make it to the output at @@ -108,20 +190,19 @@ mmo_place_orphan (asection *s) paper over the bug similarly. */ static void -mmo_wipe_sec_reloc_flag (bfd *abfd, asection *sec, void *ptr ATTRIBUTE_UNUSED) +mmo_wipe_sec_reloc_flag (bfd *abfd ATTRIBUTE_UNUSED, asection *sec, + void *ptr ATTRIBUTE_UNUSED) { - bfd_set_section_flags (abfd, sec, - bfd_get_section_flags (abfd, sec) & ~SEC_RELOC); + bfd_set_section_flags (sec, bfd_section_flags (sec) & ~SEC_RELOC); } /* Iterate with bfd_map_over_sections over mmo_wipe_sec_reloc_flag... */ static void -mmo_finish (void) +gld${EMULATION_NAME}_after_allocation (void) { - bfd_map_over_sections (output_bfd, mmo_wipe_sec_reloc_flag, NULL); - gld${EMULATION_NAME}_map_segments (FALSE); - finish_default (); + bfd_map_over_sections (link_info.output_bfd, mmo_wipe_sec_reloc_flag, NULL); + ldelf_map_segments (FALSE); } /* To get on-demand global register allocation right, we need to parse the @@ -138,19 +219,19 @@ mmo_after_open (void) example), we'd count relocs twice because they'd also be counted along the usual route for ELF-only linking, which would lead to an internal accounting error. */ - if (bfd_get_flavour (output_bfd) != bfd_target_elf_flavour) + if (bfd_get_flavour (link_info.output_bfd) != bfd_target_elf_flavour) { LANG_FOR_EACH_INPUT_STATEMENT (is) { if (bfd_get_flavour (is->the_bfd) == bfd_target_elf_flavour && !_bfd_mmix_check_all_relocs (is->the_bfd, &link_info)) - einfo ("%X%P: Internal problems scanning %B after opening it", + einfo (_("%X%P: internal problems scanning %pB after opening it"), is->the_bfd); } } + after_open_default (); } EOF LDEMUL_PLACE_ORPHAN=mmo_place_orphan -LDEMUL_FINISH=mmo_finish LDEMUL_AFTER_OPEN=mmo_after_open