re PR debug/7055 ([alpha osf4] G++ 3.1 Produced bad debugging entries if compiled...

	PR debug/7055
	* gcc/mips-tfile.c (parse_def): Fix parsing of def strings
	starting with digits.

From-SVN: r143265

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 22b14d21b3677d71cc8408bf37d406f77d54516d..1b108ed3694a55eee18e6a3e6aaea5fb40237c0b 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-11  Markus Schoepflin  <markus.schoepflin@comsoft.de>
+
+       PR debug/7055
+       * gcc/mips-tfile.c (parse_def): Fix parsing of def strings
+       starting with digits.
+
 2009-01-10  Jakub Jelinek  <jakub@redhat.com>
 
        PR target/38695

diff --git a/gcc/mips-tfile.c b/gcc/mips-tfile.c
index 87b278ab4d6d016ae64a508e5ab857cfcb2a7252..b984f47cb3faedec5019deba02c1bea85cd289db 100644 (file)
--- a/gcc/mips-tfile.c
+++ b/gcc/mips-tfile.c
@@ -2855,7 +2855,8 @@ parse_def (const char *name_start)
        {
          int ch2;
          arg_number = strtol (arg_start, (char **) &arg_end_p1, 0);
-         if (arg_end_p1 != arg_start || ((ch2 = *arg_end_p1) != ';') || ch2 != ',')
+         /* It's only a number if followed by ';' or ','. */
+         if (arg_end_p1 != arg_start && (((ch2 = *arg_end_p1) == ';') || ch2 == ','))
            arg_was_number++;
        }
 
@@ -2911,7 +2912,7 @@ parse_def (const char *name_start)
                    {
                      int ch2;
                      arg_number = strtol (arg_start, (char **) &arg_end_p1, 0);
-                     if (arg_end_p1 != arg_start || ((ch2 = *arg_end_p1) != ';') || ch2 != ',')
+                     if (arg_end_p1 != arg_start && (((ch2 = *arg_end_p1) == ';') || ch2 == ','))
                        arg_was_number++;
 
                      if (t_ptr == &temp_array[0])
@@ -2985,7 +2986,7 @@ parse_def (const char *name_start)
                    {
                      int ch2;
                      arg_number = strtol (arg_start, (char **) &arg_end_p1, 0);
-                     if (arg_end_p1 != arg_start || ((ch2 = *arg_end_p1) != ';') || ch2 != ',')
+                     if (arg_end_p1 != arg_start && (((ch2 = *arg_end_p1) == ';') || ch2 == ','))
                        arg_was_number++;
 
                      if (t_ptr == &temp_array[0])