/* Scan linker error messages for missing template instantiations and provide
them.
- Copyright (C) 1995, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2007
- Free Software Foundation, Inc.
+ Copyright (C) 1995, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2007, 2008,
+ 2009, 2010, 2011 Free Software Foundation, Inc.
Contributed by Jason Merrill (jason@cygnus.com).
This file is part of GCC.
#include "hashtab.h"
#include "demangle.h"
#include "collect2.h"
+#include "filenames.h"
+#include "diagnostic-core.h"
+#include "vec.h"
+
+/* TARGET_64BIT may be defined to use driver specific functionality. */
+#undef TARGET_64BIT
+#define TARGET_64BIT TARGET_64BIT_DEFAULT
#define MAX_ITERATIONS 17
static int tlink_verbose;
-static char initial_cwd[MAXPATHLEN + 1];
+static char *initial_cwd;
\f
/* Hash table boilerplate for working with htab_t. We have hash tables
for symbol names, file names, and demangled symbols. */
int tweaking;
} file;
+typedef const char *str;
+DEF_VEC_P(str);
+DEF_VEC_ALLOC_P(str,heap);
+
typedef struct demangled_hash_entry
{
const char *key;
- const char *mangled;
+ VEC(str,heap) *mangled;
} demangled;
/* Hash and comparison functions for these hash tables. */
*e = v = XCNEW (struct symbol_hash_entry);
v->key = xstrdup (string);
}
- return *e;
+ return (struct symbol_hash_entry *) *e;
}
static htab_t file_table;
*e = v = XCNEW (struct file_hash_entry);
v->key = xstrdup (string);
}
- return *e;
+ return (struct file_hash_entry *) *e;
}
static htab_t demangled_table;
*e = v = XCNEW (struct demangled_hash_entry);
v->key = xstrdup (string);
}
- return *e;
+ return (struct demangled_hash_entry *) *e;
}
\f
/* Stack code. */
static void
symbol_push (symbol *p)
{
- struct symbol_stack_entry *ep = obstack_alloc
- (&symbol_stack_obstack, sizeof (struct symbol_stack_entry));
+ struct symbol_stack_entry *ep
+ = XOBNEW (&symbol_stack_obstack, struct symbol_stack_entry);
ep->value = p;
ep->next = symbol_stack;
symbol_stack = ep;
if (p->tweaking)
return;
- ep = obstack_alloc
- (&file_stack_obstack, sizeof (struct file_stack_entry));
+ ep = XOBNEW (&file_stack_obstack, struct file_stack_entry);
ep->value = p;
ep->next = file_stack;
file_stack = ep;
tlink_verbose = 3;
}
- getcwd (initial_cwd, sizeof (initial_cwd));
+ initial_cwd = getpwd ();
}
static int
{
struct pex_obj *pex;
- pex = collect_execute (prog, argv, outname, errname);
+ pex = collect_execute (prog, argv, outname, errname, PEX_LAST | PEX_SEARCH);
return collect_wait (prog, pex);
}
static char *
frob_extension (const char *s, const char *ext)
{
- const char *p = strrchr (s, '/');
- if (! p)
- p = s;
- p = strrchr (p, '.');
+ const char *p;
+
+ p = strrchr (lbasename (s), '.');
if (! p)
p = s + strlen (s);
obstack_grow (&temporary_obstack, s, p - s);
- return obstack_copy0 (&temporary_obstack, ext, strlen (ext));
+ return (char *) obstack_copy0 (&temporary_obstack, ext, strlen (ext));
}
static char *
sym->tweaked = 1;
if (line[0] == 'O')
- line[0] = 'C';
+ {
+ line[0] = 'C';
+ sym->chosen = 1;
+ }
else
- line[0] = 'O';
+ {
+ line[0] = 'O';
+ sym->chosen = 0;
+ }
}
}
the new file name already exists. Therefore, we explicitly
remove the old file first. */
if (remove (f->key) == -1)
- fatal_perror ("removing .rpo file");
+ fatal_error ("removing .rpo file: %m");
if (rename (outname, f->key) == -1)
- fatal_perror ("renaming .rpo file");
+ fatal_error ("renaming .rpo file: %m");
if (!f->args)
{
continue;
dem = demangled_hash_lookup (p, true);
- dem->mangled = sym->key;
+ VEC_safe_push (str, heap, dem->mangled, sym->key);
+ }
+}
+
+/* We want to tweak symbol SYM. Return true if all is well, false on
+ error. */
+
+static bool
+start_tweaking (symbol *sym)
+{
+ if (sym && sym->tweaked)
+ {
+ error ("'%s' was assigned to '%s', but was not defined "
+ "during recompilation, or vice versa",
+ sym->key, sym->file->key);
+ return 0;
+ }
+ if (sym && !sym->tweaking)
+ {
+ if (tlink_verbose >= 2)
+ fprintf (stderr, _("collect: tweaking %s in %s\n"),
+ sym->key, sym->file->key);
+ sym->tweaking = 1;
+ file_push (sym->file);
}
+ return true;
}
/* Step through the output of the linker, in the file named FNAME, and
{
char *p = line, *q;
symbol *sym;
+ demangled *dem = 0;
int end;
int ok = 0;
+ unsigned ix;
+ str s;
/* On darwin9, we might have to skip " in " lines as well. */
if (skip_next_in_line
/* Try a mangled name in quotes. */
{
char *oldq = q + 1;
- demangled *dem = 0;
q = 0;
/* On darwin9, we look for "foo" referenced from:\n\(.* in .*\n\)* */
/* Then try "double quotes". */
else if (p = strchr (oldq, '"'), p)
p++, q = strchr (p, '"');
+ /* Then try 'single quotes'. */
+ else if (p = strchr (oldq, '\''), p)
+ p++, q = strchr (p, '\'');
else {
/* Then try entire line. */
q = strchr (oldq, 0);
{
*q = 0;
dem = demangled_hash_lookup (p, false);
- if (dem)
- sym = symbol_hash_lookup (dem->mangled, false);
- else
+ if (!dem)
{
if (!strncmp (p, USER_LABEL_PREFIX,
strlen (USER_LABEL_PREFIX)))
}
}
- if (sym && sym->tweaked)
- {
- error ("'%s' was assigned to '%s', but was not defined "
- "during recompilation, or vice versa",
- sym->key, sym->file->key);
- fclose (stream);
- return 0;
- }
- if (sym && !sym->tweaking)
+ if (dem)
{
- if (tlink_verbose >= 2)
- fprintf (stderr, _("collect: tweaking %s in %s\n"),
- sym->key, sym->file->key);
- sym->tweaking = 1;
- file_push (sym->file);
+ /* We found a demangled name. If this is the name of a
+ constructor or destructor, there can be several mangled names
+ that match it, so choose or unchoose all of them. If some are
+ chosen and some not, leave the later ones that don't match
+ alone for now; either this will cause the link to suceed, or
+ on the next attempt we will switch all of them the other way
+ and that will cause it to succeed. */
+ int chosen = 0;
+ int len = VEC_length (str, dem->mangled);
+ ok = true;
+ FOR_EACH_VEC_ELT (str, dem->mangled, ix, s)
+ {
+ sym = symbol_hash_lookup (s, false);
+ if (ix == 0)
+ chosen = sym->chosen;
+ else if (sym->chosen != chosen)
+ /* Mismatch. */
+ continue;
+ /* Avoid an error about re-tweaking when we guess wrong in
+ the case of mismatch. */
+ if (len > 1)
+ sym->tweaked = false;
+ ok = start_tweaking (sym);
+ }
}
+ else
+ ok = start_tweaking (sym);
obstack_free (&temporary_obstack, temporary_firstobj);
+
+ if (!ok)
+ {
+ fclose (stream);
+ return 0;
+ }
}
fclose (stream);