The fix for bug 85811 added decoding of many extra negative type

numbers in stabs and also removed the expectation of a trailing
semicolon after the type number as gcc didn't seem to be putting
one in. It seems that older gcc's do add one however, so we now
skip one if it is there.

MERGED FROM HEAD

git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_2_2_0_BRANCH@2864

diff --git a/coregrind/vg_stabs.c b/coregrind/vg_stabs.c
index 59bc7e5fed7b0ba3912fd1a6cbaea601825408ac..a815f174fd58488a254bb35220833bc92de1ea6d 100644 (file)
--- a/coregrind/vg_stabs.c
+++ b/coregrind/vg_stabs.c
@@ -675,6 +675,12 @@ static SymType *stabtype_parser(SegInfo *si, SymType *def, Char **pp)
         type = NULL;
         break;
       }
+      /* Different versions of gcc seem to disagree about whether a
+         negative type is followed by a semicolon or not, and the stabs
+         spec (susch as it is) is not clear either so we will skip a
+         semicolon if there is one. */
+      if (*p == ';')
+         p++;
       break;
    }