X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=ld%2Fmri.c;h=d39186c61008505409a2073f68d64d9fbd788c35;hb=9e673ad141def557b71d5593dc80b63db4f58b4a;hp=03ef2602f735bbf09edfd4a7f2931aa5da2937db;hpb=8ddef5528d34f05ff9a492e23b15ef5c6c8eb5fb;p=deliverable%2Fbinutils-gdb.git diff --git a/ld/mri.c b/ld/mri.c index 03ef2602f7..d39186c610 100644 --- a/ld/mri.c +++ b/ld/mri.c @@ -1,10 +1,11 @@ -/* Copyright (C) 1991 Free Software Foundation, Inc. - +/* mri.c -- handle MRI style linker scripts + Copyright (C) 1991, 92, 93, 94, 95, 96, 1997, 1998 Free Software Foundation, Inc. + This file is part of GLD, the Gnu Linker. GLD 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 1, or (at your option) +the Free Software Foundation; either version 2, or (at your option) any later version. GLD is distributed in the hope that it will be useful, @@ -13,8 +14,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with GLD; see the file COPYING. If not, write to -the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ +along with GLD; see the file COPYING. If not, write to the Free +Software Foundation, 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. */ /* This bit does the tree decoration when MRI style link scripts are parsed */ @@ -28,11 +30,12 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "bfd.h" #include "sysdep.h" #include "ld.h" +#include "ldexp.h" #include "ldlang.h" +#include "ldmisc.h" #include "mri.h" #include "ldgram.h" -#include "ldexp.h" - +#include "libiberty.h" struct section_name_struct { struct section_name_struct *next; @@ -44,7 +47,7 @@ struct section_name_struct { int ok_to_load; } ; -int symbol_truncate = 10000; +unsigned int symbol_truncate = 10000; struct section_name_struct *order; struct section_name_struct *only_load; struct section_name_struct *address; @@ -53,7 +56,12 @@ struct section_name_struct *alias; struct section_name_struct *alignment; struct section_name_struct *subalignment; -extern char *strdup(); +static struct section_name_struct **lookup + PARAMS ((const char *name, struct section_name_struct **list)); +static void mri_add_to_list PARAMS ((struct section_name_struct **list, + const char *name, etree_type *vma, + const char *zalias, etree_type *align, + etree_type *subalign)); static struct section_name_struct ** lookup (name, list) @@ -74,16 +82,16 @@ lookup (name, list) } } - *ptr = (struct section_name_struct *)ldmalloc(sizeof(struct section_name_struct)); + *ptr = (struct section_name_struct *)xmalloc(sizeof(struct section_name_struct)); return ptr; } static void -mri_add_to_list (list, name, vma, alias, align, subalign) +mri_add_to_list (list, name, vma, zalias, align, subalign) struct section_name_struct **list; CONST char *name; etree_type *vma; - CONST char *alias; + CONST char *zalias; etree_type *align; etree_type *subalign; { @@ -92,9 +100,9 @@ mri_add_to_list (list, name, vma, alias, align, subalign) (*ptr)->vma = vma; (*ptr)->next = (struct section_name_struct *)NULL; (*ptr)->ok_to_load = 0; - (*ptr)->alias = alias; -(*ptr)->align = align; -(*ptr)->subalign = subalign; + (*ptr)->alias = zalias; + (*ptr)->align = align; + (*ptr)->subalign = subalign; } @@ -117,8 +125,6 @@ mri_only_load (name) } -etree_type *base; - void mri_base (exp) etree_type *exp; @@ -127,11 +133,14 @@ mri_base (exp) } static int done_tree = 0; -static void + +void mri_draw_tree () { if (done_tree) return; + /* We don't bother with memory regions. */ +#if 0 /* Create the regions */ { lang_memory_region_type *r; @@ -141,7 +150,7 @@ mri_draw_tree () r->length = (bfd_size_type) exp_get_vma(0, (bfd_vma) ~((bfd_size_type)0), "length", lang_first_phase_enum); } - +#endif /* Now build the statements for the ldlang machine */ @@ -242,21 +251,24 @@ mri_draw_tree () if (base == 0) { base = p->vma ? p->vma :exp_nameop(NAME, "."); } - lang_enter_output_section_statement(p->name, base, - p->ok_to_load ? 0 : - SEC_NEVER_LOAD, 1, - align, subalign); + lang_enter_output_section_statement (p->name, base, + p->ok_to_load ? 0 : noload_section, + 1, align, subalign, + (etree_type *) NULL); base = 0; - lang_add_wild(p->name, (char *)NULL); + lang_add_wild (p->name, false, (char *)NULL, false, false, NULL); /* If there is an alias for this section, add it too */ for (aptr = alias; aptr; aptr = aptr->next) { if (strcmp(aptr->alias, p->name)== 0) { - lang_add_wild(aptr->name, (char *)NULL); + lang_add_wild (aptr->name, false, (char *)NULL, false, false, NULL); } } - - lang_leave_output_section_statement(0, "long"); + + lang_leave_output_section_statement + (0, "*default*", (struct lang_output_section_phdr_list *) NULL, + "*default*"); + p = p->next; } } @@ -269,8 +281,6 @@ void mri_load (name) CONST char *name; { - mri_draw_tree(); - base = 0; lang_add_input_file(name, lang_input_file_is_file_enum, (char *)NULL); @@ -295,7 +305,9 @@ mri_alias (want, is, isn) /* Some sections are digits - */ char buf[20]; sprintf(buf, "%d", isn); - is =strdup(buf); + is = xstrdup (buf); + if (is == NULL) + abort (); } mri_add_to_list(&alias, is, 0, want,0,0); @@ -306,7 +318,7 @@ void mri_name (name) CONST char *name; { - lang_add_output(name); + lang_add_output(name, 1); } @@ -317,18 +329,18 @@ mri_format (name) { if (strcmp(name, "S") == 0) { - lang_add_output_format("srec"); + lang_add_output_format("srec", (char *) NULL, (char *) NULL, 1); } else if (strcmp(name, "IEEE") == 0) { - lang_add_output_format("ieee"); + lang_add_output_format("ieee", (char *) NULL, (char *) NULL, 1); } else if (strcmp(name, "COFF") == 0) { - lang_add_output_format("coff-m68k"); + lang_add_output_format("coff-m68k", (char *) NULL, (char *) NULL, 1); } else { - einfo("%P%F: unknown format type %s\n", name); + einfo(_("%P%F: unknown format type %s\n"), name); } } @@ -360,7 +372,7 @@ mri_alignmod (name, exp) void mri_truncate (exp) - int exp; + unsigned int exp; { symbol_truncate = exp; }