* 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 bfa637e..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, 1999 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.
@@ -72,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));
@@ -81,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 *));
@@ -129,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, 
@@ -201,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, 
@@ -327,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);
 
@@ -630,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.  */
        {
@@ -638,12 +652,12 @@ 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.  */