/* 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, 2003, 2004, 2005, 2007, 2008
+ 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 3, 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 COPYING3. If not see
+<http://www.gnu.org/licenses/>. */
#include "config.h"
#include "system.h"
-#include "hash.h"
+#include "coretypes.h"
+#include "tm.h"
+#include "intl.h"
+#include "obstack.h"
+#include "hashtab.h"
#include "demangle.h"
-#include "toplev.h"
#include "collect2.h"
+#include "libiberty.h"
#define MAX_ITERATIONS 17
-/* Obstack allocation and deallocation routines. */
-#define obstack_chunk_alloc xmalloc
-#define obstack_chunk_free free
-
-/* Defined in collect2.c. */
-extern int vflag, debug;
-extern char *ldout;
-extern char *c_file_name;
-extern struct obstack temporary_obstack;
-extern struct obstack permanent_obstack;
-extern char * temporary_firstobj;
-
/* Defined in the automatically-generated underscore.c. */
extern int prepends_underscore;
static int tlink_verbose;
+
+static char *initial_cwd;
\f
-/* Hash table boilerplate for working with hash.[ch]. We have hash tables
+/* Hash table boilerplate for working with htab_t. We have hash tables
for symbol names, file names, and demangled symbols. */
typedef struct symbol_hash_entry
{
- struct hash_entry root;
+ const char *key;
struct file_hash_entry *file;
int chosen;
int tweaking;
typedef struct file_hash_entry
{
- struct hash_entry root;
+ const char *key;
const char *args;
const char *dir;
const char *main;
typedef struct demangled_hash_entry
{
- struct hash_entry root;
+ const char *key;
const char *mangled;
} demangled;
-static struct hash_table symbol_table;
-
-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));
-static struct hash_entry * file_hash_newfunc PARAMS ((struct hash_entry *,
- struct hash_table *,
- hash_table_key));
-static struct file_hash_entry * file_hash_lookup PARAMS ((const char *));
-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));
-static void symbol_push PARAMS ((symbol *));
-static symbol * symbol_pop PARAMS ((void));
-static void file_push PARAMS ((file *));
-static file * file_pop PARAMS ((void));
-static void tlink_init PARAMS ((void));
-static int tlink_execute PARAMS ((char *, char **, char *));
-static char * frob_extension PARAMS ((char *, const char *));
-static char * obstack_fgets PARAMS ((FILE *, struct obstack *));
-static char * tfgets PARAMS ((FILE *));
-static char * pfgets PARAMS ((FILE *));
-static void freadsym PARAMS ((FILE *, file *, int));
-static void read_repo_file PARAMS ((file *));
-static void maybe_tweak PARAMS ((char *, file *));
-static int recompile_files PARAMS ((void));
-static int read_repo_files PARAMS ((char **));
-static void demangle_new_symbols PARAMS ((void));
-static int scan_linker_output PARAMS ((const char *));
-
-/* Create a new entry for the symbol hash table.
- Passed to hash_table_init. */
-
-static struct hash_entry *
-symbol_hash_newfunc (entry, table, string)
- struct hash_entry *entry;
- struct hash_table *table;
- hash_table_key string;
+/* Hash and comparison functions for these hash tables. */
+
+static int hash_string_eq (const void *, const void *);
+static hashval_t hash_string_hash (const void *);
+
+static int
+hash_string_eq (const void *s1_p, const void *s2_p)
{
- struct symbol_hash_entry *ret = (struct symbol_hash_entry *) entry;
- if (ret == NULL)
- {
- ret = ((struct symbol_hash_entry *)
- hash_allocate (table, sizeof (struct symbol_hash_entry)));
- if (ret == NULL)
- return NULL;
- }
- ret->file = NULL;
- ret->chosen = 0;
- ret->tweaking = 0;
- ret->tweaked = 0;
- return (struct hash_entry *) ret;
+ const char *const *s1 = (const char *const *) s1_p;
+ const char *s2 = (const char *) s2_p;
+ return strcmp (*s1, s2) == 0;
}
-/* Look up an entry in the symbol hash table. */
-
-static struct symbol_hash_entry *
-symbol_hash_lookup (string, create)
- const char *string;
- boolean create;
+static hashval_t
+hash_string_hash (const void *s_p)
{
- return ((struct symbol_hash_entry *)
- hash_lookup (&symbol_table, (hash_table_key) string,
- create, &string_copy));
+ const char *const *s = (const char *const *) s_p;
+ return (*htab_hash_string) (*s);
}
-static struct hash_table file_table;
+static htab_t symbol_table;
+
+static struct symbol_hash_entry * symbol_hash_lookup (const char *, int);
+static struct file_hash_entry * file_hash_lookup (const char *);
+static struct demangled_hash_entry *demangled_hash_lookup (const char *, int);
+static void symbol_push (symbol *);
+static symbol * symbol_pop (void);
+static void file_push (file *);
+static file * file_pop (void);
+static void tlink_init (void);
+static int tlink_execute (const char *, char **, const char *, const char *);
+static char * frob_extension (const char *, const char *);
+static char * obstack_fgets (FILE *, struct obstack *);
+static char * tfgets (FILE *);
+static char * pfgets (FILE *);
+static void freadsym (FILE *, file *, int);
+static void read_repo_file (file *);
+static void maybe_tweak (char *, file *);
+static int recompile_files (void);
+static int read_repo_files (char **);
+static void demangle_new_symbols (void);
+static int scan_linker_output (const char *);
-/* Create a new entry for the file hash table.
- Passed to hash_table_init. */
+/* Look up an entry in the symbol hash table. */
-static struct hash_entry *
-file_hash_newfunc (entry, table, string)
- struct hash_entry *entry;
- struct hash_table *table;
- hash_table_key string;
+static struct symbol_hash_entry *
+symbol_hash_lookup (const char *string, int create)
{
- struct file_hash_entry *ret = (struct file_hash_entry *) entry;
- if (ret == NULL)
+ void **e;
+ e = htab_find_slot_with_hash (symbol_table, string,
+ (*htab_hash_string) (string),
+ create ? INSERT : NO_INSERT);
+ if (e == NULL)
+ return NULL;
+ if (*e == NULL)
{
- ret = ((struct file_hash_entry *)
- hash_allocate (table, sizeof (struct file_hash_entry)));
- if (ret == NULL)
- return NULL;
+ struct symbol_hash_entry *v;
+ *e = v = XCNEW (struct symbol_hash_entry);
+ v->key = xstrdup (string);
}
- ret->args = NULL;
- ret->dir = NULL;
- ret->main = NULL;
- ret->tweaking = 0;
- return (struct hash_entry *) ret;
+ return (struct symbol_hash_entry *) *e;
}
+static htab_t file_table;
+
/* Look up an entry in the file hash table. */
static struct file_hash_entry *
-file_hash_lookup (string)
- const char *string;
+file_hash_lookup (const char *string)
{
- return ((struct file_hash_entry *)
- hash_lookup (&file_table, (hash_table_key) string, true,
- &string_copy));
-}
-
-static struct hash_table demangled_table;
-
-/* Create a new entry for the demangled name hash table.
- Passed to hash_table_init. */
-
-static struct hash_entry *
-demangled_hash_newfunc (entry, table, string)
- struct hash_entry *entry;
- struct hash_table *table;
- hash_table_key string;
-{
- struct demangled_hash_entry *ret = (struct demangled_hash_entry *) entry;
- if (ret == NULL)
+ void **e;
+ e = htab_find_slot_with_hash (file_table, string,
+ (*htab_hash_string) (string),
+ INSERT);
+ if (*e == NULL)
{
- ret = ((struct demangled_hash_entry *)
- hash_allocate (table, sizeof (struct demangled_hash_entry)));
- if (ret == NULL)
- return NULL;
+ struct file_hash_entry *v;
+ *e = v = XCNEW (struct file_hash_entry);
+ v->key = xstrdup (string);
}
- ret->mangled = NULL;
- return (struct hash_entry *) ret;
+ return (struct file_hash_entry *) *e;
}
+static htab_t demangled_table;
+
/* Look up an entry in the demangled name hash table. */
static struct demangled_hash_entry *
-demangled_hash_lookup (string, create)
- const char *string;
- boolean create;
+demangled_hash_lookup (const char *string, int create)
{
- return ((struct demangled_hash_entry *)
- hash_lookup (&demangled_table, (hash_table_key) string,
- create, &string_copy));
+ void **e;
+ e = htab_find_slot_with_hash (demangled_table, string,
+ (*htab_hash_string) (string),
+ create ? INSERT : NO_INSERT);
+ if (e == NULL)
+ return NULL;
+ if (*e == NULL)
+ {
+ struct demangled_hash_entry *v;
+ *e = v = XCNEW (struct demangled_hash_entry);
+ v->key = xstrdup (string);
+ }
+ return (struct demangled_hash_entry *) *e;
}
\f
/* Stack code. */
struct file_stack_entry *file_stack;
static void
-symbol_push (p)
- symbol *p;
+symbol_push (symbol *p)
{
- struct symbol_stack_entry *ep = (struct symbol_stack_entry *) 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;
}
static symbol *
-symbol_pop ()
+symbol_pop (void)
{
struct symbol_stack_entry *ep = symbol_stack;
symbol *p;
}
static void
-file_push (p)
- file *p;
+file_push (file *p)
{
struct file_stack_entry *ep;
if (p->tweaking)
return;
- ep = (struct file_stack_entry *) 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;
}
static file *
-file_pop ()
+file_pop (void)
{
struct file_stack_entry *ep = file_stack;
file *p;
/* Initialize the tlink machinery. Called from do_tlink. */
static void
-tlink_init ()
+tlink_init (void)
{
- char *p;
-
- hash_table_init (&symbol_table, symbol_hash_newfunc, &string_hash,
- &string_compare);
- hash_table_init (&file_table, file_hash_newfunc, &string_hash,
- &string_compare);
- hash_table_init (&demangled_table, demangled_hash_newfunc,
- &string_hash, &string_compare);
+ const char *p;
+
+ symbol_table = htab_create (500, hash_string_hash, hash_string_eq,
+ NULL);
+ file_table = htab_create (500, hash_string_hash, hash_string_eq,
+ NULL);
+ demangled_table = htab_create (500, hash_string_hash, hash_string_eq,
+ NULL);
+
obstack_begin (&symbol_stack_obstack, 0);
obstack_begin (&file_stack_obstack, 0);
if (debug)
tlink_verbose = 3;
}
+
+ initial_cwd = getpwd ();
}
static int
-tlink_execute (prog, argv, redir)
- char *prog;
- char **argv;
- char *redir;
+tlink_execute (const char *prog, char **argv, const char *outname,
+ const char *errname)
{
- collect_execute (prog, argv, redir);
- return collect_wait (prog);
-}
+ struct pex_obj *pex;
+
+ pex = collect_execute (prog, argv, outname, errname);
+ return collect_wait (prog, pex);
+}
static char *
-frob_extension (s, ext)
- char *s;
- const char *ext;
+frob_extension (const char *s, const char *ext)
{
- 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);
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 *
-obstack_fgets (stream, ob)
- FILE *stream;
- struct obstack *ob;
+obstack_fgets (FILE *stream, struct obstack *ob)
{
int c;
while ((c = getc (stream)) != EOF && c != '\n')
if (obstack_object_size (ob) == 0)
return NULL;
obstack_1grow (ob, '\0');
- return obstack_finish (ob);
+ return XOBFINISH (ob, char *);
}
static char *
-tfgets (stream)
- FILE *stream;
+tfgets (FILE *stream)
{
return obstack_fgets (stream, &temporary_obstack);
}
static char *
-pfgets (stream)
- FILE *stream;
+pfgets (FILE *stream)
{
- return obstack_fgets (stream, &permanent_obstack);
+ return xstrdup (tfgets (stream));
}
\f
/* Real tlink code. */
/* Subroutine of read_repo_file. We are reading the repo file for file F,
which is coming in on STREAM, and the symbol that comes next in STREAM
- is offerred, chosen or provided if CHOSEN is 0, 1 or 2, respectively.
+ is offered, chosen or provided if CHOSEN is 0, 1 or 2, respectively.
XXX "provided" is unimplemented, both here and in the compiler. */
static void
-freadsym (stream, f, chosen)
- FILE *stream;
- file *f;
- int chosen;
+freadsym (FILE *stream, file *f, int chosen)
{
symbol *sym;
{
- char *name = tfgets (stream);
+ const char *name = tfgets (stream);
sym = symbol_hash_lookup (name, true);
}
/* Read in the repo file denoted by F, and record all its information. */
static void
-read_repo_file (f)
- file *f;
+read_repo_file (file *f)
{
char c;
- FILE *stream = fopen ((char*) f->root.key, "r");
+ FILE *stream = fopen (f->key, "r");
if (tlink_verbose >= 2)
- fprintf (stderr, "collect: reading %s\n",
- (char*) f->root.key);
+ fprintf (stderr, _("collect: reading %s\n"), f->key);
while (fscanf (stream, "%c ", &c) == 1)
{
this one wants to emit it as well. */
static void
-maybe_tweak (line, f)
- char *line;
- file *f;
+maybe_tweak (char *line, file *f)
{
symbol *sym = symbol_hash_lookup (line + 2, false);
}
/* Update the repo files for each of the object files we have adjusted and
- recompile.
-
- XXX Should this use collect_execute instead of system? */
+ recompile. */
static int
-recompile_files ()
+recompile_files (void)
{
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");
- char *outname = frob_extension ((char*) f->root.key, ".rnw");
+ char *line;
+ const char *p, *q;
+ char **argv;
+ struct obstack arg_stack;
+ FILE *stream = fopen (f->key, "r");
+ const char *const outname = frob_extension (f->key, ".rnw");
FILE *output = fopen (outname, "w");
while ((line = tfgets (stream)) != NULL)
}
fclose (stream);
fclose (output);
- rename (outname, (char*) f->root.key);
+ /* On Windows "rename" returns -1 and sets ERRNO to EACCESS if
+ the new file name already exists. Therefore, we explicitly
+ remove the old file first. */
+ if (remove (f->key) == -1)
+ fatal_perror ("removing .rpo file");
+ if (rename (outname, f->key) == -1)
+ fatal_perror ("renaming .rpo file");
+
+ if (!f->args)
+ {
+ error ("repository file '%s' does not contain command-line "
+ "arguments", f->key);
+ return 0;
+ }
+
+ /* Build a null-terminated argv array suitable for
+ tlink_execute(). Manipulate arguments on the arg_stack while
+ building argv on the temporary_obstack. */
+
+ obstack_init (&arg_stack);
+ obstack_ptr_grow (&temporary_obstack, c_file_name);
+
+ for (p = f->args; *p != '\0'; p = q + 1)
+ {
+ /* Arguments are delimited by single-quotes. Find the
+ opening quote. */
+ p = strchr (p, '\'');
+ if (!p)
+ goto done;
+
+ /* Find the closing quote. */
+ q = strchr (p + 1, '\'');
+ if (!q)
+ goto done;
+
+ obstack_grow (&arg_stack, p + 1, q - (p + 1));
+
+ /* Replace '\'' with '. This is how set_collect_gcc_options
+ encodes a single-quote. */
+ while (q[1] == '\\' && q[2] == '\'' && q[3] == '\'')
+ {
+ const char *r;
+
+ r = strchr (q + 4, '\'');
+ if (!r)
+ goto done;
- obstack_grow (&temporary_obstack, "cd ", 3);
- obstack_grow (&temporary_obstack, f->dir, strlen (f->dir));
- obstack_grow (&temporary_obstack, "; ", 2);
- obstack_grow (&temporary_obstack, c_file_name, strlen (c_file_name));
- obstack_1grow (&temporary_obstack, ' ');
- obstack_grow (&temporary_obstack, f->args, strlen (f->args));
- obstack_1grow (&temporary_obstack, ' ');
- command = obstack_copy0 (&temporary_obstack, f->main, strlen (f->main));
+ obstack_grow (&arg_stack, q + 3, r - (q + 3));
+ q = r;
+ }
+
+ obstack_1grow (&arg_stack, '\0');
+ obstack_ptr_grow (&temporary_obstack, obstack_finish (&arg_stack));
+ }
+ done:
+ obstack_ptr_grow (&temporary_obstack, f->main);
+ obstack_ptr_grow (&temporary_obstack, NULL);
+ argv = XOBFINISH (&temporary_obstack, char **);
if (tlink_verbose)
- fprintf (stderr, "collect: recompiling %s\n", f->main);
- if (tlink_verbose >= 3)
- fprintf (stderr, "%s\n", command);
+ fprintf (stderr, _("collect: recompiling %s\n"), f->main);
- if (system (command) != 0)
+ if (chdir (f->dir) != 0
+ || tlink_execute (c_file_name, argv, NULL, NULL) != 0
+ || chdir (initial_cwd) != 0)
return 0;
read_repo_file (f);
+ obstack_free (&arg_stack, NULL);
obstack_free (&temporary_obstack, temporary_firstobj);
}
return 1;
.rpo files associated with them, and read in the information. */
static int
-read_repo_files (object_lst)
- char **object_lst;
+read_repo_files (char **object_lst)
{
char **object = object_lst;
for (; *object; object++)
{
- 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;
/* Add the demangled forms of any new symbols to the hash table. */
static void
-demangle_new_symbols ()
+demangle_new_symbols (void)
{
symbol *sym;
while ((sym = symbol_pop ()) != NULL)
{
demangled *dem;
- char *p = cplus_demangle ((char*) sym->root.key,
- DMGL_PARAMS | DMGL_ANSI);
+ const char *p = cplus_demangle (sym->key, DMGL_PARAMS | DMGL_ANSI);
if (! p)
continue;
dem = demangled_hash_lookup (p, true);
- dem->mangled = (char*) sym->root.key;
+ dem->mangled = sym->key;
}
}
adjust the settings for each symbol encountered. */
static int
-scan_linker_output (fname)
- const char *fname;
+scan_linker_output (const char *fname)
{
FILE *stream = fopen (fname, "r");
char *line;
+ int skip_next_in_line = 0;
while ((line = tfgets (stream)) != NULL)
{
char *p = line, *q;
symbol *sym;
int end;
-
- while (*p && ISSPACE ((unsigned char)*p))
+ int ok = 0;
+
+ /* On darwin9, we might have to skip " in " lines as well. */
+ if (skip_next_in_line
+ && strstr (p, " in "))
+ continue;
+ skip_next_in_line = 0;
+
+ while (*p && ISSPACE ((unsigned char) *p))
++p;
if (! *p)
continue;
- for (q = p; *q && ! ISSPACE ((unsigned char)*q); ++q)
+ for (q = p; *q && ! ISSPACE ((unsigned char) *q); ++q)
;
/* Try the first word on the line. */
if (*p == '.')
++p;
- if (*p == '_' && prepends_underscore)
- ++p;
+ if (!strncmp (p, USER_LABEL_PREFIX, strlen (USER_LABEL_PREFIX)))
+ p += strlen (USER_LABEL_PREFIX);
end = ! *q;
*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 (!strncmp (p, USER_LABEL_PREFIX, strlen (USER_LABEL_PREFIX)))
+ p += strlen (USER_LABEL_PREFIX);
+ sym = symbol_hash_lookup (p, false);
+ }
+
if (! sym && ! end)
/* Try a mangled name in quotes. */
{
- char *oldq = q+1;
+ char *oldq = q + 1;
demangled *dem = 0;
q = 0;
+ /* On darwin9, we look for "foo" referenced from:\n\(.* in .*\n\)* */
+ if (strcmp (oldq, "referenced from:") == 0)
+ {
+ /* We have to remember that we found a symbol to tweak. */
+ ok = 1;
+
+ /* We actually want to start from the first word on the
+ line. */
+ oldq = p;
+
+ /* Since the format is multiline, we have to skip
+ following lines with " in ". */
+ skip_next_in_line = 1;
+ }
+
/* 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, '"');
+ /* Then try 'single quotes'. */
+ else if (p = strchr (oldq, '\''), p)
+ p++, q = strchr (p, '\'');
+ else {
+ /* Then try entire line. */
+ q = strchr (oldq, 0);
+ if (q != oldq)
+ p = (char *)oldq;
+ }
+
+ if (p)
+ {
+ /* Don't let the strstr's below see the demangled name; we
+ might get spurious matches. */
+ p[-1] = '\0';
+
+ /* powerpc64-linux references .foo when calling function foo. */
+ if (*p == '.')
+ p++;
+ }
- 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 && (ok
+ || strstr (oldq, "ndefined")
+ || strstr (oldq, "nresolved")
+ || strstr (oldq, "nsatisfied")
+ || strstr (oldq, "ultiple")))
{
*q = 0;
dem = demangled_hash_lookup (p, false);
if (dem)
sym = symbol_hash_lookup (dem->mangled, false);
else
- sym = symbol_hash_lookup (p, false);
+ {
+ if (!strncmp (p, USER_LABEL_PREFIX,
+ strlen (USER_LABEL_PREFIX)))
+ p += strlen (USER_LABEL_PREFIX);
+ sym = symbol_hash_lookup (p, false);
+ }
}
}
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 (tlink_verbose >= 2)
- fprintf (stderr, "collect: tweaking %s in %s\n",
- (char*) sym->root.key, (char*) sym->file->root.key);
+ fprintf (stderr, _("collect: tweaking %s in %s\n"),
+ sym->key, sym->file->key);
sym->tweaking = 1;
file_push (sym->file);
}
-
+
obstack_free (&temporary_obstack, temporary_firstobj);
}
to provide missing definitions. Currently ignored. */
void
-do_tlink (ld_argv, object_lst)
- char **ld_argv, **object_lst;
+do_tlink (char **ld_argv, char **object_lst ATTRIBUTE_UNUSED)
{
- int exit = tlink_execute ("ld", ld_argv, ldout);
+ int exit = tlink_execute ("ld", ld_argv, ldout, lderrout);
tlink_init ();
while (exit && i++ < MAX_ITERATIONS)
{
if (tlink_verbose >= 3)
- dump_file (ldout);
+ {
+ dump_file (ldout, stdout);
+ dump_file (lderrout, stderr);
+ }
demangle_new_symbols ();
- if (! scan_linker_output (ldout))
+ if (! scan_linker_output (ldout)
+ && ! scan_linker_output (lderrout))
break;
if (! recompile_files ())
break;
if (tlink_verbose)
- fprintf (stderr, "collect: relinking\n");
- exit = tlink_execute ("ld", ld_argv, ldout);
+ fprintf (stderr, _("collect: relinking\n"));
+ exit = tlink_execute ("ld", ld_argv, ldout, lderrout);
}
}
- dump_file (ldout);
+ dump_file (ldout, stdout);
unlink (ldout);
+ dump_file (lderrout, stderr);
+ unlink (lderrout);
if (exit)
{
error ("ld returned %d exit status", exit);