Changeset 609 for branches/GNU/src/binutils/ld/ldcref.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/ldcref.c (modified) (16 diffs, 1 prop)

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

@@ -1 +1 @@
 /* ldcref.c -- output a cross reference table
-   Copyright 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
+   Copyright 1996, 1997, 1998, 2000, 2002 Free Software Foundation, Inc.
    Written by Ian Lance Taylor <ian@cygnus.com>
 
@@ -70 +70 @@
 static struct bfd_hash_entry *cref_hash_newfunc
   PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
-static boolean cref_fill_array PARAMS ((struct cref_hash_entry *, PTR));
+static bfd_boolean cref_fill_array PARAMS ((struct cref_hash_entry *, PTR));
 static int cref_sort_array PARAMS ((const PTR, const PTR));
 static void output_one_cref PARAMS ((FILE *, struct cref_hash_entry *));
-static boolean check_nocrossref PARAMS ((struct cref_hash_entry *, PTR));
+static bfd_boolean check_nocrossref PARAMS ((struct cref_hash_entry *, PTR));
+static void check_section_sym_xref PARAMS ((lang_input_statement_type *));
 static void check_refs
-  PARAMS ((struct cref_hash_entry *, struct bfd_link_hash_entry *,
-           struct lang_nocrossrefs *));
+  PARAMS ((const char *, asection *, bfd *, struct lang_nocrossrefs *));
 static void check_reloc_refs PARAMS ((bfd *, asection *, PTR));
 
@@ -90 +90 @@
   (bfd_hash_traverse                                                    \
    (&(table)->root,                                                     \
-    (boolean (*) PARAMS ((struct bfd_hash_entry *, PTR))) (func),       \
+    (bfd_boolean (*) PARAMS ((struct bfd_hash_entry *, PTR))) (func),   \
     (info)))
 
@@ -99 +99 @@
 /* Whether the cref hash table has been initialized.  */
 
-static boolean cref_initialized;
+static bfd_boolean cref_initialized;
 
 /* The number of symbols seen so far.  */
@@ -157 +157 @@
       if (! bfd_hash_table_init (&cref_table.root, cref_hash_newfunc))
         einfo (_("%X%P: bfd_hash_table_init of cref table failed: %E\n"));
-      cref_initialized = true;
-    }
-
-  h = cref_hash_lookup (&cref_table, name, true, false);
+      cref_initialized = TRUE;
+    }
+
+  h = cref_hash_lookup (&cref_table, name, TRUE, FALSE);
   if (h == NULL)
     einfo (_("%X%P: cref_hash_lookup failed: %E\n"));
@@ -174 +174 @@
       h->refs = r;
       r->abfd = abfd;
-      r->def = false;
-      r->common = false;
-      r->undef = false;
+      r->def = FALSE;
+      r->common = FALSE;
+      r->undef = FALSE;
     }
 
   if (bfd_is_und_section (section))
-    r->undef = true;
+    r->undef = TRUE;
   else if (bfd_is_com_section (section))
-    r->common = true;
+    r->common = TRUE;
   else
-    r->def = true;
+    r->def = TRUE;
 }
 
@@ -191 +191 @@
    name.  */
 
-static boolean
+static bfd_boolean
 cref_fill_array (h, data)
      struct cref_hash_entry *h;
@@ -205 +205 @@
   ++*pph;
 
-  return true;
+  return TRUE;
 }
 
@@ -275 +275 @@
   struct cref_ref *r;
 
-  hl = bfd_link_hash_lookup (link_info.hash, h->root.string, false,
-                             false, true);
+  hl = bfd_link_hash_lookup (link_info.hash, h->root.string, FALSE,
+                             FALSE, TRUE);
   if (hl == NULL)
     einfo ("%P: symbol `%T' missing from main hash table\n",
@@ -343 +343 @@
 
   cref_hash_traverse (&cref_table, check_nocrossref, (PTR) NULL);
+
+  lang_for_each_file (check_section_sym_xref);
+}
+
+/* Checks for prohibited cross references to section symbols.  */
+
+static void
+check_section_sym_xref (statement)
+     lang_input_statement_type *statement;
+{
+  bfd *abfd;
+  asection *sec;
+
+  abfd = statement->the_bfd;
+  if (abfd == NULL)
+    return;
+
+  for (sec = abfd->sections; sec != NULL; sec = sec->next)
+    {
+      asection *outsec;
+
+      outsec = sec->output_section;
+      if (outsec != NULL)
+        {
+          const char *outsecname;
+          struct lang_nocrossrefs *ncrs;
+          struct lang_nocrossref *ncr;
+
+          outsecname = outsec->name;
+          for (ncrs = nocrossref_list; ncrs != NULL; ncrs = ncrs->next)
+            for (ncr = ncrs->list; ncr != NULL; ncr = ncr->next)
+              if (strcmp (ncr->name, outsecname) == 0)
+                check_refs (NULL, sec, abfd, ncrs);
+        }
+    }
 }
 
 /* Check one symbol to see if it is a prohibited cross reference.  */
 
-static boolean
+static bfd_boolean
 check_nocrossref (h, ignore)
      struct cref_hash_entry *h;
@@ -357 +392 @@
   struct lang_nocrossrefs *ncrs;
   struct lang_nocrossref *ncr;
-
-  hl = bfd_link_hash_lookup (link_info.hash, h->root.string, false,
-                             false, true);
+  struct cref_ref *ref;
+
+  hl = bfd_link_hash_lookup (link_info.hash, h->root.string, FALSE,
+                             FALSE, TRUE);
   if (hl == NULL)
     {
       einfo (_("%P: symbol `%T' missing from main hash table\n"),
              h->root.string);
-      return true;
+      return TRUE;
     }
 
   if (hl->type != bfd_link_hash_defined
       && hl->type != bfd_link_hash_defweak)
-    return true;
+    return TRUE;
 
   defsec = hl->u.def.section->output_section;
   if (defsec == NULL)
-    return true;
+    return TRUE;
   defsecname = bfd_get_section_name (defsec->owner, defsec);
 
@@ -379 +415 @@
     for (ncr = ncrs->list; ncr != NULL; ncr = ncr->next)
       if (strcmp (ncr->name, defsecname) == 0)
-        check_refs (h, hl, ncrs);
-
-  return true;
+        for (ref = h->refs; ref != NULL; ref = ref->next)
+          check_refs (hl->root.string, hl->u.def.section, ref->abfd, ncrs);
+
+  return TRUE;
 }
 
@@ -388 +425 @@
 
 struct check_refs_info {
-  struct cref_hash_entry *h;
+  const char *sym_name;
   asection *defsec;
   struct lang_nocrossrefs *ncrs;
   asymbol **asymbols;
-  boolean same;
 };
 
@@ -401 +437 @@
 
 static void
-check_refs (h, hl, ncrs)
-     struct cref_hash_entry *h;
-     struct bfd_link_hash_entry *hl;
+check_refs (name, sec, abfd, ncrs)
+     const char *name;
+     asection *sec;
+     bfd *abfd;
      struct lang_nocrossrefs *ncrs;
 {
-  struct cref_ref *ref;
-
-  for (ref = h->refs; ref != NULL; ref = ref->next)
-    {
-      lang_input_statement_type *li;
-      asymbol **asymbols;
-      struct check_refs_info info;
-
-      /* We need to look through the relocations for this BFD, to see
-         if any of the relocations which refer to this symbol are from
-         a prohibited section.  Note that we need to do this even for
-         the BFD in which the symbol is defined, since even a single
-         BFD might contain a prohibited cross reference; for this
-         case, we set the SAME field in INFO, which will cause
-         CHECK_RELOCS_REFS to check for relocations against the
-         section as well as against the symbol.  */
-
-      li = (lang_input_statement_type *) ref->abfd->usrdata;
-      if (li != NULL && li->asymbols != NULL)
-        asymbols = li->asymbols;
-      else
+  lang_input_statement_type *li;
+  asymbol **asymbols;
+  struct check_refs_info info;
+
+  /* We need to look through the relocations for this BFD, to see
+     if any of the relocations which refer to this symbol are from
+     a prohibited section.  Note that we need to do this even for
+     the BFD in which the symbol is defined, since even a single
+     BFD might contain a prohibited cross reference.  */
+
+  li = (lang_input_statement_type *) abfd->usrdata;
+  if (li != NULL && li->asymbols != NULL)
+    asymbols = li->asymbols;
+  else
+    {
+      long symsize;
+      long symbol_count;
+
+      symsize = bfd_get_symtab_upper_bound (abfd);
+      if (symsize < 0)
+        einfo (_("%B%F: could not read symbols; %E\n"), abfd);
+      asymbols = (asymbol **) xmalloc (symsize);
+      symbol_count = bfd_canonicalize_symtab (abfd, asymbols);
+      if (symbol_count < 0)
+        einfo (_("%B%F: could not read symbols: %E\n"), abfd);
+      if (li != NULL)
         {
-          long symsize;
-          long symbol_count;
-
-          symsize = bfd_get_symtab_upper_bound (ref->abfd);
-          if (symsize < 0)
-            einfo (_("%B%F: could not read symbols; %E\n"), ref->abfd);
-          asymbols = (asymbol **) xmalloc (symsize);
-          symbol_count = bfd_canonicalize_symtab (ref->abfd, asymbols);
-          if (symbol_count < 0)
-            einfo (_("%B%F: could not read symbols: %E\n"), ref->abfd);
-          if (li != NULL)
-            {
-              li->asymbols = asymbols;
-              li->symbol_count = symbol_count;
-            }
+          li->asymbols = asymbols;
+          li->symbol_count = symbol_count;
         }
-
-      info.h = h;
-      info.defsec = hl->u.def.section;
-      info.ncrs = ncrs;
-      info.asymbols = asymbols;
-      if (ref->abfd == hl->u.def.section->owner)
-        info.same = true;
-      else
-        info.same = false;
-      bfd_map_over_sections (ref->abfd, check_reloc_refs, (PTR) &info);
-
-      if (li == NULL)
-        free (asymbols);
-    }
-}
-
-/* This is called via bfd_map_over_sections.  INFO->H is a symbol
+    }
+
+  info.sym_name = name;
+  info.defsec = sec;
+  info.ncrs = ncrs;
+  info.asymbols = asymbols;
+  bfd_map_over_sections (abfd, check_reloc_refs, (PTR) &info);
+
+  if (li == NULL)
+    free (asymbols);
+}
+
+/* This is called via bfd_map_over_sections.  INFO->SYM_NAME is a symbol
    defined in INFO->DEFSECNAME.  If this section maps into any of the
    sections listed in INFO->NCRS, other than INFO->DEFSECNAME, then we
    look through the relocations.  If any of the relocations are to
-   INFO->H, then we report a prohibited cross reference error.  */
+   INFO->SYM_NAME, then we report a prohibited cross reference error.  */
 
 static void
@@ -503 +528 @@
   /* This section is one for which cross references are prohibited.
      Look through the relocations, and see if any of them are to
-     INFO->H.  */
-
-  symname = info->h->root.string;
+     INFO->SYM_NAME.  If INFO->SYMNAME is NULL, check for relocations
+     against the section symbol.  */
+
+  symname = info->sym_name;
 
   relsize = bfd_get_reloc_upper_bound (abfd, sec);
@@ -526 +552 @@
       if (q->sym_ptr_ptr != NULL
           && *q->sym_ptr_ptr != NULL
-          && (strcmp (bfd_asymbol_name (*q->sym_ptr_ptr), symname) == 0
-              || (info->same
-                  && bfd_get_section (*q->sym_ptr_ptr) == info->defsec)))
+          && (symname != NULL
+              ? strcmp (bfd_asymbol_name (*q->sym_ptr_ptr), symname) == 0
+              : (((*q->sym_ptr_ptr)->flags & BSF_SECTION_SYM) != 0
+                 && bfd_get_section (*q->sym_ptr_ptr) == info->defsec)))
         {
           /* We found a reloc for the symbol.  The symbol is defined