* unwind-dw2-fde.c (__deregister_frame_info): Stringize use

[pf3gnuchains/gcc-fork.git] / gcc / tlink.c

diff --git a/gcc/tlink.c b/gcc/tlink.c
index a3df317..8b8ca0c 100644 (file)
--- a/gcc/tlink.c
+++ b/gcc/tlink.c
@@ -1,7 +1,7 @@
 /* Scan linker error messages for missing template instantiations and provide
    them.
 
-   Copyright (C) 1995, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
    Contributed by Jason Merrill (jason@cygnus.com).
 
 This file is part of GNU CC.
@@ -23,6 +23,7 @@ Boston, MA 02111-1307, USA.  */
 
 #include "config.h"
 #include "system.h"
+#include "intl.h"
 #include "hash.h"
 #include "demangle.h"
 #include "collect2.h"
@@ -71,7 +72,7 @@ static struct hash_entry * symbol_hash_newfunc PARAMS ((struct hash_entry *,
                                                        struct hash_table *,
                                                        hash_table_key));
 static struct symbol_hash_entry * symbol_hash_lookup PARAMS ((const char *,
-                                                             boolean));
+                                                             int));
 static struct hash_entry * file_hash_newfunc PARAMS ((struct hash_entry *,
                                                      struct hash_table *,
                                                      hash_table_key));
@@ -80,7 +81,7 @@ static struct hash_entry * demangled_hash_newfunc PARAMS ((struct hash_entry *,
                                                           struct hash_table *,
                                                           hash_table_key));
 static struct demangled_hash_entry *
-  demangled_hash_lookup PARAMS ((const char *, boolean));
+  demangled_hash_lookup PARAMS ((const char *, int));
 static void symbol_push PARAMS ((symbol *));
 static symbol * symbol_pop PARAMS ((void));
 static void file_push PARAMS ((file *));
@@ -128,7 +129,7 @@ symbol_hash_newfunc (entry, table, string)
 static struct symbol_hash_entry *
 symbol_hash_lookup (string, create)
      const char *string;
-     boolean create;
+     int create;
 {
   return ((struct symbol_hash_entry *)
          hash_lookup (&symbol_table, (const hash_table_key) string, 
@@ -200,7 +201,7 @@ demangled_hash_newfunc (entry, table, string)
 static struct demangled_hash_entry *
 demangled_hash_lookup (string, create)
      const char *string;
-     boolean create;
+     int create;
 {
   return ((struct demangled_hash_entry *)
          hash_lookup (&demangled_table, (const hash_table_key) string, 
@@ -326,10 +327,10 @@ frob_extension (s, ext)
      const char *s;
      const char *ext;
 {
-  const char *p = rindex (s, '/');
+  const char *p = strrchr (s, '/');
   if (! p)
     p = s;
-  p = rindex (p, '.');
+  p = strrchr (p, '.');
   if (! p)
     p = s + strlen (s);
 
@@ -424,7 +425,7 @@ read_repo_file (f)
   FILE *stream = fopen ((char*) f->root.key, "r");
 
   if (tlink_verbose >= 2)
-    fprintf (stderr, "collect: reading %s\n", 
+    fprintf (stderr, _("collect: reading %s\n"), 
             (char*) f->root.key);
 
   while (fscanf (stream, "%c ", &c) == 1)
@@ -525,7 +526,7 @@ recompile_files ()
       command = obstack_copy0 (&temporary_obstack, f->main, strlen (f->main));
 
       if (tlink_verbose)
-       fprintf (stderr, "collect: recompiling %s\n", f->main);
+       fprintf (stderr, _("collect: recompiling %s\n"), f->main);
       if (tlink_verbose >= 3)
        fprintf (stderr, "%s\n", command);
 
@@ -550,9 +551,15 @@ read_repo_files (object_lst)
 
   for (; *object; object++)
     {
-      const char *p = frob_extension (*object, ".rpo");
+      const char *p;
       file *f;
 
+      /* Don't bother trying for ld flags.  */
+      if (*object[0] == '-')
+       continue;
+
+      p = frob_extension (*object, ".rpo");
+
       if (! file_exists (p))
        continue;
 
@@ -623,6 +630,20 @@ scan_linker_output (fname)
       *q = 0;
       sym = symbol_hash_lookup (p, false);
 
+      /* Some SVR4 linkers produce messages like
+        ld: 0711-317 ERROR: Undefined symbol: .g__t3foo1Zi
+        */
+      if (! sym && ! end && strstr (q+1, "Undefined symbol: "))
+       {
+         char *p = strrchr (q+1, ' ');
+         p++;
+         if (*p == '.')
+           p++;
+         if (*p == '_' && prepends_underscore)
+           p++;
+         sym = symbol_hash_lookup (p, false);
+       }
+
       if (! sym && ! end)
        /* Try a mangled name in quotes.  */
        {
@@ -631,14 +652,23 @@ scan_linker_output (fname)
          q = 0;
 
          /* First try `GNU style'.  */
-         p = index (oldq, '`');
+         p = strchr (oldq, '`');
          if (p)
-           p++, q = index (p, '\'');
+           p++, q = strchr (p, '\'');
          /* Then try "double quotes".  */
-         else if (p = index (oldq, '"'), p)
-           p++, q = index (p, '"');
+         else if (p = strchr (oldq, '"'), p)
+           p++, q = strchr (p, '"');
+
+         /* Don't let the strstr's below see the demangled name; we
+            might get spurious matches.  */
+         if (p)
+           p[-1] = '\0';
 
-         if (q)
+         /* We need to check for certain error keywords here, or we would
+            mistakenly use GNU ld's "In function `foo':" message.  */
+         if (q && (strstr (oldq, "ndefined")
+                   || strstr (oldq, "nresolved")
+                   || strstr (oldq, "ultiple")))
            {
              *q = 0;
              dem = demangled_hash_lookup (p, false);
@@ -661,7 +691,7 @@ scan_linker_output (fname)
       if (sym && !sym->tweaking)
        {
          if (tlink_verbose >= 2)
-           fprintf (stderr, "collect: tweaking %s in %s\n",
+           fprintf (stderr, _("collect: tweaking %s in %s\n"),
                     (char*) sym->root.key, (char*) sym->file->root.key);
          sym->tweaking = 1;
          file_push (sym->file);
@@ -708,7 +738,7 @@ do_tlink (ld_argv, object_lst)
            if (! recompile_files ())
              break;
            if (tlink_verbose)
-             fprintf (stderr, "collect: relinking\n");
+             fprintf (stderr, _("collect: relinking\n"));
            exit = tlink_execute ("ld", ld_argv, ldout);
          }
     }