From 5aa4202af7d5b5f1ab44bc75bb2a19ba76cf7250 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Wed, 26 Jun 2002 13:22:55 +0000 Subject: * ldmisc.c (demangle): Restore dots stripped from sym name. --- ld/ldmisc.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) (limited to 'ld/ldmisc.c') diff --git a/ld/ldmisc.c b/ld/ldmisc.c index 42adceeac3..b24678e917 100644 --- a/ld/ldmisc.c +++ b/ld/ldmisc.c @@ -78,13 +78,31 @@ demangle (string) /* This is a hack for better error reporting on XCOFF, PowerPC64-ELF or the MS PE format. These formats have a number of leading '.'s - on at least some symbols, so we remove all dots. */ + on at least some symbols, so we remove all dots to avoid + confusing the demangler. */ p = string; while (*p == '.') ++p; res = cplus_demangle (p, DMGL_ANSI | DMGL_PARAMS); - return res ? res : xstrdup (string); + if (res) + { + size_t dots = p - string; + + /* Now put back any stripped dots. */ + if (dots != 0) + { + size_t len = strlen (res) + 1; + char *add_dots = xmalloc (len + dots); + + memcpy (add_dots, string, dots); + memcpy (add_dots + dots, res, len); + free (res); + res = add_dots; + } + return res; + } + return xstrdup (string); } static void -- cgit v1.2.1