X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=ld%2Femultempl%2Fmmo.em;h=9568be328b088818f7da772dff56cd5463d8e522;hb=eaeb0a9d5c65fd8dc19878b068e17f90a93a19c2;hp=d6d30e676c0b9da16bb6e62f75523d38ca1f1df8;hpb=0841712ea90a7633d54bbc1f00fa82e068815b66;p=deliverable%2Fbinutils-gdb.git diff --git a/ld/emultempl/mmo.em b/ld/emultempl/mmo.em index d6d30e676c..9568be328b 100644 --- a/ld/emultempl/mmo.em +++ b/ld/emultempl/mmo.em @@ -1,11 +1,12 @@ # This shell script emits a C file. -*- C -*- -# Copyright 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +# Copyright 2001, 2002, 2003, 2004, 2006, 2007, 2008 +# 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,201 +16,95 @@ # # 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 mmo.em, used to define -# linker MMIX-specifics common to ELF and MMO. +# This file is sourced from generic.em. -cat >>e${EMULATION_NAME}.c <>e${EMULATION_NAME}.c <next) - { - lookup = &u->output_section_statement; - if (lookup->constraint == -1) - continue; - if (lookup == os) - break; - if (lookup->bfd_section != NULL - && lookup->bfd_section != bfd_abs_section_ptr - && lookup->bfd_section != bfd_com_section_ptr - && lookup->bfd_section != bfd_und_section_ptr) - s = lookup->bfd_section; - } - - if (u == NULL) - return NULL; +/* We include this header *not* because we expect to handle ELF here + but because we re-use the map_segments function in elf-generic.em, + a file which is rightly somewhat ELF-centric. But this is only to + get a weird testcase right; ld-mmix/bpo-22, forcing ELF to be + output from the mmo emulation: -m mmo --oformat elf64-mmix! */ +#include "elf-bfd.h" - return s; -} +static void gld${EMULATION_NAME}_after_allocation (void); +EOF -struct orphan_save { - lang_output_section_statement_type *os; - asection **section; - lang_statement_union_type **stmt; -}; +source_em ${srcdir}/emultempl/elf-generic.em +source_em ${srcdir}/emultempl/mmix-elfnmmo.em -#define HAVE_SECTION(hold, name) \ -(hold.os != NULL || (hold.os = lang_output_section_find (name)) != NULL) +fragment <owner, s) - & (SEC_EXCLUDE | SEC_LOAD)) != SEC_LOAD) - return FALSE; + || (s->flags & (SEC_EXCLUDE | SEC_LOAD)) != SEC_LOAD) + return NULL; /* Only care for sections we're going to load. */ - os = lang_output_section_find (bfd_get_section_name (s->owner, s)); + 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, file); - return TRUE; + lang_add_section (&os->children, s, 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 ((bfd_get_section_flags (s->owner, s) & (SEC_CODE | SEC_READONLY)) == 0) - return FALSE; + if ((s->flags & (SEC_CODE | SEC_READONLY)) == 0) + return NULL; if (hold_text.os == NULL) - hold_text.os = lang_output_section_find (MMO_TEXT_SECTION_NAME); + hold_text.os = lang_output_section_find (hold_text.name); place = &hold_text; + if (hold_text.os != NULL) + after = hold_text.os; + else + after = &lang_output_section_statement.head->output_section_statement; /* 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. */ - - /* Start building a list of statements for this section. - First save the current statement pointer. */ - old = stat_ptr; - - /* Add the output section statements for this orphan to our own private - list, inserting them later into the global statement list. */ - stat_ptr = &add; - lang_list_init (stat_ptr); - - os = lang_enter_output_section_statement (bfd_get_section_name (s->owner, - s), - NULL, 0, - (etree_type *) NULL, - (etree_type *) NULL, - (etree_type *) NULL, 0); - - lang_add_section (&os->children, s, os, file); - - lang_leave_output_section_statement - ((bfd_vma) 0, "*default*", - (struct lang_output_section_phdr_list *) NULL, NULL); - - /* Restore the global list pointer. */ - stat_ptr = old; - - snew = os->bfd_section; - if (snew == NULL) - /* /DISCARD/ section. */ - return TRUE; + os = lang_insert_orphan (s, secname, 0, after, place, NULL, 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) - { - if (os == NULL) - return FALSE; - hold_text.os = os; - } - - bfd_section = place->os->bfd_section; - if (place->section == NULL && bfd_section == NULL) - bfd_section = output_prev_sec_find (place->os); - - if (place->section != NULL - || (bfd_section != NULL - && bfd_section != snew)) - { - /* Shuffle the section to make the output file look neater. This is - really only cosmetic. */ - if (place->section == NULL) - /* Put orphans after the first section on the list. */ - place->section = &bfd_section->next; - - /* Unlink the section. */ - for (pps = &output_bfd->sections; *pps != snew; pps = &(*pps)->next) - ; - bfd_section_list_remove (output_bfd, pps); - - /* Now tack it on to the "place->os" section list. */ - bfd_section_list_insert (output_bfd, place->section, snew); - } - place->section = &snew->next; /* Save the end of this list. */ - - if (add.head != NULL) - { - /* We try to put the output statements in some sort of reasonable - order here, because they determine the final load addresses of - the orphan sections. */ - if (place->stmt == NULL) - { - /* Put the new statement list right at the head. */ - *add.tail = place->os->header.next; - place->os->header.next = add.head; - } - else - { - /* Put it after the last orphan statement we added. */ - *add.tail = *place->stmt; - *place->stmt = add.head; - } - - /* Fix the global list pointer if we happened to tack our new list - at the tail. */ - if (*old->tail == add.head) - old->tail = add.tail; - - /* Save the end of this list. */ - place->stmt = add.tail; - } + hold_text.os = os; - return TRUE; + return os; } /* Remove the spurious settings of SEC_RELOC that make it to the output at @@ -226,9 +121,10 @@ mmo_wipe_sec_reloc_flag (bfd *abfd, asection *sec, void *ptr ATTRIBUTE_UNUSED) /* 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); + bfd_map_over_sections (link_info.output_bfd, mmo_wipe_sec_reloc_flag, NULL); + gld${EMULATION_NAME}_map_segments (FALSE); } /* To get on-demand global register allocation right, we need to parse the @@ -245,7 +141,7 @@ 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) { @@ -259,5 +155,4 @@ mmo_after_open (void) EOF LDEMUL_PLACE_ORPHAN=mmo_place_orphan -LDEMUL_FINISH=mmo_finish LDEMUL_AFTER_OPEN=mmo_after_open