/* 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"
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));
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 *));
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,
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,
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);
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)
{
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)
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);
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;
*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. */
{
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';
/* 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 (old, "nresolved")
+ || strstr (oldq, "nresolved")
+ || strstr (oldq, "nsatisfied")
|| strstr (oldq, "ultiple")))
{
*q = 0;
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);
if (! recompile_files ())
break;
if (tlink_verbose)
- fprintf (stderr, "collect: relinking\n");
+ fprintf (stderr, _("collect: relinking\n"));
exit = tlink_execute ("ld", ld_argv, ldout);
}
}
OSDN Git Service
