Daily bump.

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

diff --git a/gcc/tlink.c b/gcc/tlink.c
index cafa0c6..78840ca 100644 (file)
--- a/gcc/tlink.c
+++ b/gcc/tlink.c
@@ -1,28 +1,29 @@
 /* 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.
+This file is part of GCC.
 
-GNU CC 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 2, or (at your option)
-any later version.
+GCC 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 2, or (at your option) any later
+version.
 
-GNU CC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GCC is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of 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 GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+along with GCC; see the file COPYING.  If not, write to the Free
+Software Foundation, 59 Temple Place - Suite 330, 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);
 
@@ -494,11 +495,14 @@ recompile_files ()
 {
   file *f;
 
+  putenv (xstrdup ("COMPILER_PATH"));
+  putenv (xstrdup ("LIBRARY_PATH"));
+  
   while ((f = file_pop ()) != NULL)
     {
       char *line, *command;
       FILE *stream = fopen ((char*) f->root.key, "r");
-      const char *outname = frob_extension ((char*) f->root.key, ".rnw");
+      const char *const outname = frob_extension ((char*) f->root.key, ".rnw");
       FILE *output = fopen (outname, "w");
 
       while ((line = tfgets (stream)) != NULL)
@@ -629,6 +633,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.  */
        {
@@ -637,12 +655,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.  */
@@ -653,6 +671,7 @@ scan_linker_output (fname)
             mistakenly use GNU ld's "In function `foo':" message.  */
          if (q && (strstr (oldq, "ndefined")
                    || strstr (oldq, "nresolved")
+                   || strstr (oldq, "nsatisfied")
                    || strstr (oldq, "ultiple")))
            {
              *q = 0;