diff options
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/tlink.c | 29 |
2 files changed, 22 insertions, 13 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0d2aef8..8b04e88 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +Sun Oct 4 18:33:24 1998 Jason Merrill <jason@yorick.cygnus.com> + scott snyder <snyder@d0sgif.fnal.gov> + + * tlink.c (scan_linker_output): Recognize errors from irix 6.2 + linker. Recognize mangled names in quotes. + Sun Oct 4 02:58:20 1998 Jakub Jelinek <jj@sunsite.ms.mff.cuni.cz> * config/sparc/sparc.md (ashldi3+1): Name it ashldi3_sp64. diff --git a/gcc/tlink.c b/gcc/tlink.c index d5fa00c..a4c5b53 100644 --- a/gcc/tlink.c +++ b/gcc/tlink.c @@ -550,26 +550,29 @@ scan_linker_output (fname) sym = symbol_hash_lookup (p, false); if (! sym && ! end) - /* Try a mangled name in `quotes'. */ + /* Try a mangled name in quotes. */ { + char *oldq = q+1; demangled *dem = 0; - p = index (q+1, '`'); q = 0; -#define MUL "multiple definition of " -#define UND "undefined reference to " + /* First try `GNU style'. */ + p = index (oldq, '`'); + if (p) + p++, q = index (p, '\''); + /* Then try "double quotes". */ + else if (p = index (oldq, '"'), p) + p++, q = index (p, '"'); - if (p && (p - line > sizeof (MUL))) + if (q) { - char *beg = p - sizeof (MUL) + 1; - *p = 0; - if (!strcmp (beg, MUL) || !strcmp (beg, UND)) - p++, q = index (p, '\''); + *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 (q) - *q = 0, dem = demangled_hash_lookup (p, false); - if (dem) - sym = symbol_hash_lookup (dem->mangled, false); } if (sym && sym->tweaked) |