diff options
| author | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-09-17 18:35:31 +0000 |
|---|---|---|
| committer | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-09-17 18:35:31 +0000 |
| commit | b51e1cf8c6b72b9cab9598380ad9319d52a7907d (patch) | |
| tree | 966d2020038c82e23efcc533b6def53c0f0a2e30 | |
| parent | 1206f166dcc6c802b945f45e31fdca80e81487bb (diff) | |
| download | gcc-b51e1cf8c6b72b9cab9598380ad9319d52a7907d.tar.gz | |
* tlink.c (scan_linker_output): Look for keywords before accepting
a mangled name in quotes.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@29479 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/tlink.c | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5667361e87b..8860f6cc835 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +Fri Sep 17 11:14:17 1999 Jason Merrill <jason@yorick.cygnus.com> + + * tlink.c (scan_linker_output): Look for keywords before accepting + a mangled name in quotes. + Thu Sep 16 16:47:08 1999 Richard Henderson <rth@cygnus.com> * alpha/alpha-interix.h (DWARF2_UNWIND_INFO): Define to zero. diff --git a/gcc/tlink.c b/gcc/tlink.c index a3df317389f..619c8c83b20 100644 --- 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 Free Software Foundation, Inc. + Copyright (C) 1995, 1998, 1999 Free Software Foundation, Inc. Contributed by Jason Merrill (jason@cygnus.com). This file is part of GNU CC. @@ -638,7 +638,11 @@ scan_linker_output (fname) else if (p = index (oldq, '"'), p) p++, q = index (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 && (strstr (oldq, "ndefined") + || strstr (old, "nresolved") + || strstr (oldq, "ultiple"))) { *q = 0; dem = demangled_hash_lookup (p, false); |