Changeset 609 for branches/GNU/src/binutils/ld/mri.c

Timestamp:

Aug 16, 2003, 6:59:22 PM (22 years ago)

Author:

bird

Message:

binutils v2.14 - offical sources.

File:

• branches/GNU/src/binutils/ld/mri.c (modified) (17 diffs, 1 prop)

branches/GNU/src/binutils/ld/mri.c

@@ -1 +1 @@
 /* mri.c -- handle MRI style linker scripts
-   Copyright 1991, 1992, 1993, 1994, 1996, 1997, 1998, 1999, 2000
+   Copyright 1991, 1992, 1993, 1994, 1996, 1997, 1998, 1999, 2000, 2002
    Free Software Foundation, Inc.
 
@@ -32 +32 @@
 #include "ldmisc.h"
 #include "mri.h"
-#include "ldgram.h"
+#include <ldgram.h>
 #include "libiberty.h"
 
 struct section_name_struct {
   struct section_name_struct *next;
-  CONST char *name;
-  CONST char *alias;
+  const char *name;
+  const char *alias;
   etree_type *vma;
   etree_type *align;
@@ -63 +63 @@
 static struct section_name_struct **
 lookup (name, list)
-     CONST char *name;
+     const char *name;
      struct section_name_struct **list;
 {
@@ -85 +85 @@
 mri_add_to_list (list, name, vma, zalias, align, subalign)
      struct section_name_struct **list;
-     CONST char *name;
+     const char *name;
      etree_type *vma;
-     CONST char *zalias;
+     const char *zalias;
      etree_type *align;
      etree_type *subalign;
@@ -104 +104 @@
 void
 mri_output_section (name, vma)
-     CONST char *name;
+     const char *name;
      etree_type *vma;
 {
@@ -115 +115 @@
 void
 mri_only_load (name)
-     CONST char *name;
+     const char *name;
 {
   mri_add_to_list (&only_load, name, 0, 0, 0, 0);
@@ -150 +150 @@
   /* Now build the statements for the ldlang machine.  */
 
-  /* Attatch the addresses of any which have addresses,
+  /* Attach the addresses of any which have addresses,
      and add the ones not mentioned.  */
   if (address != (struct section_name_struct *) NULL)
@@ -221 +221 @@
           etree_type *align = 0;
           etree_type *subalign = 0;
+          struct wildcard_list *tmp;
 
           /* See if an alignment has been specified.  */
@@ -239 +240 @@
                                                (etree_type *) NULL);
           base = 0;
-          lang_add_wild (p->name, false, (char *) NULL, false, false, NULL);
+          tmp = (struct wildcard_list *) xmalloc (sizeof *tmp);
+          tmp->next = NULL;
+          tmp->spec.name = p->name;
+          tmp->spec.exclude_name_list = NULL;
+          tmp->spec.sorted = FALSE;
+          lang_add_wild (NULL, tmp, FALSE);
 
           /* 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, false, (char *) NULL, false, false, NULL);
+              {
+                tmp = (struct wildcard_list *) xmalloc (sizeof *tmp);
+                tmp->next = NULL;
+                tmp->spec.name = aptr->name;
+                tmp->spec.exclude_name_list = NULL;
+                tmp->spec.sorted = FALSE;
+                lang_add_wild (NULL, tmp, FALSE);
+              }
 
           lang_leave_output_section_statement
             (0, "*default*", (struct lang_output_section_phdr_list *) NULL,
-             "*default*");
+             NULL);
 
           p = p->next;
@@ -259 +272 @@
 void
 mri_load (name)
-     CONST char *name;
+     const char *name;
 {
   base = 0;
@@ -271 +284 @@
 void
 mri_order (name)
-     CONST char *name;
+     const char *name;
 {
   mri_add_to_list (&order, name, 0, 0, 0, 0);
@@ -278 +291 @@
 void
 mri_alias (want, is, isn)
-     CONST char *want;
-     CONST char *is;
+     const char *want;
+     const char *is;
      int isn;
 {
@@ -300 +313 @@
 void
 mri_name (name)
-     CONST char *name;
+     const char *name;
 {
   lang_add_output (name, 1);
@@ -307 +320 @@
 void
 mri_format (name)
-     CONST char *name;
+     const char *name;
 {
   if (strcmp (name, "S") == 0)
@@ -324 +337 @@
 void
 mri_public (name, exp)
-     CONST char *name;
+     const char *name;
      etree_type *exp;
 {
@@ -332 +345 @@
 void
 mri_align (name, exp)
-     CONST char *name;
+     const char *name;
      etree_type *exp;
 {
@@ -340 +353 @@
 void
 mri_alignmod (name, exp)
-     CONST char *name;
+     const char *name;
      etree_type *exp;
 {