13 files changed, 40 insertions, 40 deletions
diff --git a/gcc/testsuite/gcc.dg/format/attr-6.c b/gcc/testsuite/gcc.dg/format/attr-6.c
index ead7bfc..211ee00 100644
--- a/gcc/testsuite/gcc.dg/format/attr-6.c
+++ b/gcc/testsuite/gcc.dg/format/attr-6.c
@@ -18,5 +18,5 @@ void
 foo (const char *s, int *p)
 {
   scanf("%ld", p); /* { dg-warning "12:format" "implicit scanf" } */
-  /* { dg-warning "implicit" "implicit decl warning" { target *-*-* } 20 } */
+  /* { dg-warning "implicit" "implicit decl warning" { target *-*-* } .-1 } */
 }
diff --git a/gcc/testsuite/gcc.dg/format/branch-1.c b/gcc/testsuite/gcc.dg/format/branch-1.c
index f180f43..1782064 100644
--- a/gcc/testsuite/gcc.dg/format/branch-1.c
+++ b/gcc/testsuite/gcc.dg/format/branch-1.c
@@ -24,5 +24,5 @@ foo (long l, int nfoo)
   printf ((nfoo > 1) ? "%d foos" : ((nfoo > 0) ? "%ld foo" : "%d foos"), nfoo); /* { dg-warning "53:long int" "wrong type" } */
   /* Extra arguments to NULL should be complained about.  */
   printf (0, "foo"); /* { dg-warning "14:too many" "NULL extra args" } */
-  /* { dg-warning "null" "null format arg" { target *-*-* } 26 } */
+  /* { dg-warning "null" "null format arg" { target *-*-* } .-1 } */
 }
diff --git a/gcc/testsuite/gcc.dg/format/c90-printf-1.c b/gcc/testsuite/gcc.dg/format/c90-printf-1.c
index 5329dad..c8652fc 100644
--- a/gcc/testsuite/gcc.dg/format/c90-printf-1.c
+++ b/gcc/testsuite/gcc.dg/format/c90-printf-1.c
@@ -42,9 +42,9 @@ foo (int i, int i1, int i2, unsigned int u, double d, char *s, void *p,
      construct should be warned about.
   */
   printf ("%.-5d\n", i); /* { dg-warning "14:format|precision" "negative precision warning" } */
-  /* { dg-warning "too many arguments for format" "too many arguments" { target *-*-* } 44 } */
+  /* { dg-warning "too many arguments for format" "too many arguments" { target *-*-* } .-1 } */
   printf ("%.-*d\n", i); /* { dg-warning "14:format" "broken %.-*d format" } */
-  /* { dg-warning "too many arguments for format" "too many arguments" { target *-*-* } 46 } */
+  /* { dg-warning "too many arguments for format" "too many arguments" { target *-*-* } .-1 } */
   printf ("%.3c\n", i); /* { dg-warning "15:precision" "precision with %c" } */
   printf ("%.3p\n", p); /* { dg-warning "15:precision" "precision with %p" } */
   printf ("%.3n\n", n); /* { dg-warning "15:precision" "precision with %n" } */
@@ -54,15 +54,15 @@ foo (int i, int i1, int i2, unsigned int u, double d, char *s, void *p,
   */
   printf ("%%");
   printf ("%.3%"); /* { dg-warning "14:type" "missing type" } */
-  /* { dg-warning "15:trailing" "bogus %%" { target *-*-* } 56 } */
+  /* { dg-warning "15:trailing" "bogus %%" { target *-*-* } .-1 } */
   printf ("%-%"); /* { dg-warning "13:type" "missing type" } */
-  /* { dg-warning "14:trailing" "bogus %%" { target *-*-* } 58 } */
+  /* { dg-warning "14:trailing" "bogus %%" { target *-*-* } .-1 } */
   printf ("%-%\n"); /* { dg-warning "13:format" "bogus %%" } */
-  /* { dg-warning "15:format" "bogus %%" { target *-*-* } 60 } */
+  /* { dg-warning "15:format" "bogus %%" { target *-*-* } .-1 } */
   printf ("%5%\n"); /* { dg-warning "13:format" "bogus %%" } */
-  /* { dg-warning "15:format" "bogus %%" { target *-*-* } 62 } */
+  /* { dg-warning "15:format" "bogus %%" { target *-*-* } .-1 } */
   printf ("%h%\n"); /* { dg-warning "13:format" "bogus %%" } */
-  /* { dg-warning "15:format" "bogus %%" { target *-*-* } 64 } */
+  /* { dg-warning "15:format" "bogus %%" { target *-*-* } .-1 } */
   /* Valid and invalid %h, %l, %L constructions.  */
   printf ("%hd", i);
   printf ("%hi", i);
diff --git a/gcc/testsuite/gcc.dg/format/c90-strftime-2.c b/gcc/testsuite/gcc.dg/format/c90-strftime-2.c
index 8b8398e..17aff0d 100644
--- a/gcc/testsuite/gcc.dg/format/c90-strftime-2.c
+++ b/gcc/testsuite/gcc.dg/format/c90-strftime-2.c
@@ -11,11 +11,11 @@ foo (char *s, size_t m, const struct tm *tp)
 {
   strftime (s, m, "%C", tp); /* { dg-warning "C" "%C not in C90" } */
   strftime (s, m, "%D", tp); /* { dg-warning "C" "%D not in C90" } */
-  /* { dg-warning "only last 2" "2-digit year" { target *-*-* } 13 } */
+  /* { dg-warning "only last 2" "2-digit year" { target *-*-* } .-1 } */
   strftime (s, m, "%e", tp); /* { dg-warning "C" "%e not in C90" } */
   strftime (s, m, "%F", tp); /* { dg-warning "C" "%F not in C90" } */
   strftime (s, m, "%g", tp); /* { dg-warning "C" "%g not in C90" } */
-  /* { dg-warning "only last 2" "2-digit year" { target *-*-* } 17 } */
+  /* { dg-warning "only last 2" "2-digit year" { target *-*-* } .-1 } */
   strftime (s, m, "%G", tp); /* { dg-warning "C" "%G not in C90" } */
   strftime (s, m, "%h", tp); /* { dg-warning "C" "%h not in C90" } */
   strftime (s, m, "%n", tp); /* { dg-warning "C" "%n not in C90" } */
diff --git a/gcc/testsuite/gcc.dg/format/c99-strftime-1.c b/gcc/testsuite/gcc.dg/format/c99-strftime-1.c
index 1730738..7530bbd 100644
--- a/gcc/testsuite/gcc.dg/format/c99-strftime-1.c
+++ b/gcc/testsuite/gcc.dg/format/c99-strftime-1.c
@@ -39,11 +39,11 @@ foo (char *s, size_t m, const struct tm *tp)
   strftime (s, m, "%EB", tp); /* { dg-warning "flag|modifier" "bad %EB" } */
   strftime (s, m, "%Ed", tp); /* { dg-warning "flag|modifier" "bad %Ed" } */
   strftime (s, m, "%ED", tp); /* { dg-warning "flag|modifier" "bad %ED" } */
-  /* { dg-warning "only last 2" "2-digit year" { target *-*-* } 41 } */
+  /* { dg-warning "only last 2" "2-digit year" { target *-*-* } .-1 } */
   strftime (s, m, "%Ee", tp); /* { dg-warning "flag|modifier" "bad %Ee" } */
   strftime (s, m, "%EF", tp); /* { dg-warning "flag|modifier" "bad %EF" } */
   strftime (s, m, "%Eg", tp); /* { dg-warning "flag|modifier" "bad %Eg" } */
-  /* { dg-warning "only last 2" "2-digit year" { target *-*-* } 45 } */
+  /* { dg-warning "only last 2" "2-digit year" { target *-*-* } .-1 } */
   strftime (s, m, "%EG", tp); /* { dg-warning "flag|modifier" "bad %EG" } */
   strftime (s, m, "%Eh", tp); /* { dg-warning "flag|modifier" "bad %Eh" } */
   strftime (s, m, "%EH", tp); /* { dg-warning "flag|modifier" "bad %EH" } */
@@ -71,13 +71,13 @@ foo (char *s, size_t m, const struct tm *tp)
   strftime (s, m, "%Ob", tp); /* { dg-warning "flag|modifier" "bad %Ob" } */
   strftime (s, m, "%OB", tp); /* { dg-warning "flag|modifier" "bad %OB" } */
   strftime (s, m, "%Oc", tp); /* { dg-warning "flag|modifier" "bad %Oc" } */
-  /* { dg-warning "in some locales" "2-digit year" { target *-*-* } 73 } */
+  /* { dg-warning "in some locales" "2-digit year" { target *-*-* } .-1 } */
   strftime (s, m, "%OC", tp); /* { dg-warning "flag|modifier|C" "bad %OC" } */
   strftime (s, m, "%OD", tp); /* { dg-warning "flag|modifier" "bad %OD" } */
-  /* { dg-warning "only last 2" "2-digit year" { target *-*-* } 76 } */
+  /* { dg-warning "only last 2" "2-digit year" { target *-*-* } .-1 } */
   strftime (s, m, "%OF", tp); /* { dg-warning "flag|modifier" "bad %OF" } */
   strftime (s, m, "%Og", tp); /* { dg-warning "flag|modifier|C" "bad %Og" } */
-  /* { dg-warning "only last 2" "2-digit year" { target *-*-* } 79 } */
+  /* { dg-warning "only last 2" "2-digit year" { target *-*-* } .-1 } */
   strftime (s, m, "%OG", tp); /* { dg-warning "flag|modifier|C" "bad %OG" } */
   strftime (s, m, "%Oh", tp); /* { dg-warning "flag|modifier" "bad %Oh" } */
   strftime (s, m, "%Oj", tp); /* { dg-warning "flag|modifier|C" "bad %Oj" } */
@@ -88,7 +88,7 @@ foo (char *s, size_t m, const struct tm *tp)
   strftime (s, m, "%Ot", tp); /* { dg-warning "flag|modifier" "bad %Ot" } */
   strftime (s, m, "%OT", tp); /* { dg-warning "flag|modifier" "bad %OT" } */
   strftime (s, m, "%Ox", tp); /* { dg-warning "flag|modifier" "bad %Ox" } */
-  /* { dg-warning "in some locales" "2-digit year" { target *-*-* } 90 } */
+  /* { dg-warning "in some locales" "2-digit year" { target *-*-* } .-1 } */
   strftime (s, m, "%OX", tp); /* { dg-warning "flag|modifier" "bad %OX" } */
   strftime (s, m, "%OY", tp); /* { dg-warning "flag|modifier|C" "bad %OY" } */
   strftime (s, m, "%Oz", tp); /* { dg-warning "flag|modifier|C" "bad %Oz" } */
diff --git a/gcc/testsuite/gcc.dg/format/cmn-err-1.c b/gcc/testsuite/gcc.dg/format/cmn-err-1.c
index fd5ca59..aea7779 100644
--- a/gcc/testsuite/gcc.dg/format/cmn-err-1.c
+++ b/gcc/testsuite/gcc.dg/format/cmn-err-1.c
@@ -30,7 +30,7 @@ int main()
   cmn_err_func (0, "%i", i);		/* { dg-warning "unknown|too many" } */
   cmn_err_func (0, "%d", l);		/* { dg-warning "expects argument" } */
   cmn_err_func (0, "%b");		/* { dg-warning "'int'" } */
-/* { dg-warning "'char \\*'" "" { target *-*-solaris2.* } 32 } */
+/* { dg-warning "'char \\*'" "" { target *-*-solaris2.* } .-1 } */
   cmn_err_func (0, "%b", i);		/* { dg-warning "matching" } */
   cmn_err_func (0, "%b", i, i);		/* { dg-warning "expects argument" } */
   cmn_err_func (0, "%b", string, i);	/* { dg-warning "expects argument" } */
diff --git a/gcc/testsuite/gcc.dg/format/few-1.c b/gcc/testsuite/gcc.dg/format/few-1.c
index cf41140..6c5d636 100644
--- a/gcc/testsuite/gcc.dg/format/few-1.c
+++ b/gcc/testsuite/gcc.dg/format/few-1.c
@@ -4,27 +4,27 @@
 int f(int *ip, char *cp)
 {
 	__builtin_printf ("%*.*s");
-/* { dg-warning "field width specifier '\\*' expects a matching 'int' argument" "width" { target *-*-* } 6 } */
-/* { dg-warning "field precision specifier '\\.\\*' expects a matching 'int' argument" "precision" { target *-*-* } 6 } */
-/* { dg-warning "format '%s' expects a matching 'char \\*' argument" "format" { target *-*-* } 6 } */
+/* { dg-warning "field width specifier '\\*' expects a matching 'int' argument" "width" { target *-*-* } .-1 } */
+/* { dg-warning "field precision specifier '\\.\\*' expects a matching 'int' argument" "precision" { target *-*-* } .-2 } */
+/* { dg-warning "format '%s' expects a matching 'char \\*' argument" "format" { target *-*-* } .-3 } */
 	__builtin_printf ("%*.*s", ip, *cp);
-/* { dg-warning "field width specifier '\\*' expects argument of type 'int'" "width" { target *-*-* } 10 } */
-/* { dg-warning "format '%s' expects a matching 'char \\*' argument" "format" { target *-*-* } 10 } */
+/* { dg-warning "field width specifier '\\*' expects argument of type 'int'" "width" { target *-*-* } .-1 } */
+/* { dg-warning "format '%s' expects a matching 'char \\*' argument" "format" { target *-*-* } .-2 } */
 	__builtin_printf ("%s %i", ip, ip);
-/* { dg-warning "format '%s' expects argument of type 'char \\*'" "char" { target *-*-* } 13 } */
-/* { dg-warning "format '%i' expects argument of type 'int'" "int" { target *-*-* } 13 } */
+/* { dg-warning "format '%s' expects argument of type 'char \\*'" "char" { target *-*-* } .-1 } */
+/* { dg-warning "format '%i' expects argument of type 'int'" "int" { target *-*-* } .-2 } */
 	__builtin_printf ("%s %i", cp);
-/* { dg-warning "format '%i' expects a matching 'int' argument" "" { target *-*-* } 16 } */
+/* { dg-warning "format '%i' expects a matching 'int' argument" "" { target *-*-* } .-1 } */
 	__builtin_printf ("%lc");
-/* { dg-warning "format '%lc' expects a matching 'wint_t' argument" "" { target *-*-* } 18 } */
+/* { dg-warning "format '%lc' expects a matching 'wint_t' argument" "" { target *-*-* } .-1 } */
 	__builtin_printf ("%lc", cp);
-/* { dg-warning "format '%lc' expects argument of type 'wint_t'" "" { target *-*-* } 20 } */
+/* { dg-warning "format '%lc' expects argument of type 'wint_t'" "" { target *-*-* } .-1 } */
 	__builtin_scanf ("%s");
-/* { dg-warning "format '%s' expects a matching 'char \\*' argument" "" { target *-*-* } 22 } */
+/* { dg-warning "format '%s' expects a matching 'char \\*' argument" "" { target *-*-* } .-1 } */
 	__builtin_scanf ("%i", cp);
-/* { dg-warning "format '%i' expects argument of type 'int \\*'" "" { target *-*-* } 24 } */
+/* { dg-warning "format '%i' expects argument of type 'int \\*'" "" { target *-*-* } .-1 } */
 	__builtin_scanf ("%lc");
-/* { dg-warning "format '%lc' expects a matching 'wchar_t \\*' argument" "" { target *-*-* } 26 } */
+/* { dg-warning "format '%lc' expects a matching 'wchar_t \\*' argument" "" { target *-*-* } .-1 } */
 	__builtin_scanf ("%lc", cp);
-/* { dg-warning "format '%lc' expects argument of type 'wchar_t \\*'" "" { target *-*-* } 28 } */
+/* { dg-warning "format '%lc' expects argument of type 'wchar_t \\*'" "" { target *-*-* } .-1 } */
 }
diff --git a/gcc/testsuite/gcc.dg/format/ms_branch-1.c b/gcc/testsuite/gcc.dg/format/ms_branch-1.c
index fe3f80e..4e53cf0 100644
--- a/gcc/testsuite/gcc.dg/format/ms_branch-1.c
+++ b/gcc/testsuite/gcc.dg/format/ms_branch-1.c
@@ -24,5 +24,5 @@ foo (long l, int nfoo)
   printf ((nfoo > 1) ? "%d foos" : ((nfoo > 0) ? "%ld foo" : "%d foos"), nfoo); /* { dg-warning "long int" "wrong type" } */
   /* Extra arguments to NULL should be complained about.  */
   printf (NULL, "foo"); /* { dg-warning "too many" "NULL extra args" } */
-  /* { dg-warning "null" "null format arg" { target *-*-* } 26 } */
+  /* { dg-warning "null" "null format arg" { target *-*-* } .-1 } */
 }
diff --git a/gcc/testsuite/gcc.dg/format/ms_unnamed-1.c b/gcc/testsuite/gcc.dg/format/ms_unnamed-1.c
index ac12942..a3a0e6a 100644
--- a/gcc/testsuite/gcc.dg/format/ms_unnamed-1.c
+++ b/gcc/testsuite/gcc.dg/format/ms_unnamed-1.c
@@ -21,5 +21,5 @@ f (TItype x)
 {
   printf("%d", x); /* { dg-warning "expects argument" } */
   printf("%d", 141592653589793238462643383279502884197169399375105820974944); /* { dg-warning "expects argument" } */
-  /* { dg-warning "unsigned only|too large" "constant" { target *-*-* } 23 } */
+  /* { dg-warning "unsigned only|too large" "constant" { target *-*-* } .-1 } */
 }
diff --git a/gcc/testsuite/gcc.dg/format/ms_va-1.c b/gcc/testsuite/gcc.dg/format/ms_va-1.c
index 97d2979..03c7c19 100644
--- a/gcc/testsuite/gcc.dg/format/ms_va-1.c
+++ b/gcc/testsuite/gcc.dg/format/ms_va-1.c
@@ -10,5 +10,5 @@ void
 foo (void *p)
 {
   printf ("%d", p); /* { dg-bogus "va_list" "wrong type in format warning" } */
-  /* { dg-warning "format" "format error" { target *-*-* } 12 } */
+  /* { dg-warning "format" "format error" { target *-*-* } .-1 } */
 }
diff --git a/gcc/testsuite/gcc.dg/format/unnamed-1.c b/gcc/testsuite/gcc.dg/format/unnamed-1.c
index e54b06f..cb19c14 100644
--- a/gcc/testsuite/gcc.dg/format/unnamed-1.c
+++ b/gcc/testsuite/gcc.dg/format/unnamed-1.c
@@ -21,5 +21,5 @@ f (TItype x)
 {
   printf("%d", x); /* { dg-warning "expects argument" } */
   printf("%d", 141592653589793238462643383279502884197169399375105820974944); /* { dg-warning "expects argument" } */
-  /* { dg-warning "unsigned only|too large" "constant" { target *-*-* } 23 } */
+  /* { dg-warning "unsigned only|too large" "constant" { target *-*-* } .-1 } */
 }
diff --git a/gcc/testsuite/gcc.dg/format/va-1.c b/gcc/testsuite/gcc.dg/format/va-1.c
index 5f5eeab..facb3ad 100644
--- a/gcc/testsuite/gcc.dg/format/va-1.c
+++ b/gcc/testsuite/gcc.dg/format/va-1.c
@@ -9,5 +9,5 @@ void
 foo (void *p)
 {
   printf ("%d", p); /* { dg-bogus "va_list" "wrong type in format warning" } */
-  /* { dg-warning "format" "format error" { target *-*-* } 11 } */
+  /* { dg-warning "format" "format error" { target *-*-* } .-1 } */
 }
diff --git a/gcc/testsuite/gcc.dg/format/xopen-1.c b/gcc/testsuite/gcc.dg/format/xopen-1.c
index 9b098fb..b278fcc 100644
--- a/gcc/testsuite/gcc.dg/format/xopen-1.c
+++ b/gcc/testsuite/gcc.dg/format/xopen-1.c
@@ -110,15 +110,15 @@ foo (int i, unsigned int u, wint_t lc, wchar_t *ls, int *ip, double d,
      warning about unused arguments rather than the more serious one about
      argument gaps.  */
   scanf ("%3$d%1$d", ip, ip, ip); /* { dg-bogus "before used" "unused $ scanf pointer operand" } */
-  /* { dg-warning "unused" "unused $ scanf pointer operand" { target *-*-* } 112 } */
+  /* { dg-warning "unused" "unused $ scanf pointer operand" { target *-*-* } .-1 } */
   /* If there are non-pointer arguments unused at the end, this is also OK.  */
   scanf ("%3$d%1$d", ip, ip, ip, i); /* { dg-bogus "before used" "unused $ scanf pointer operand" } */
-  /* { dg-warning "unused" "unused $ scanf pointer operand" { target *-*-* } 115 } */
+  /* { dg-warning "unused" "unused $ scanf pointer operand" { target *-*-* } .-1 } */
   scanf ("%3$d%1$d", ip, i, ip); /* { dg-warning "before used" "unused $ scanf non-pointer operand" } */
   /* Can't check the arguments in the vscanf case, so should suppose the
      lesser problem.  */
   vscanf ("%3$d%1$d", va); /* { dg-bogus "before used" "unused $ scanf pointer operand" } */
-  /* { dg-warning "unused" "unused $ scanf pointer operand" { target *-*-* } 120 } */
+  /* { dg-warning "unused" "unused $ scanf pointer operand" { target *-*-* } .-1 } */
   scanf ("%2$*d%1$d", ip, ip); /* { dg-warning "operand" "operand number with suppression" } */
   printf ("%1$d%1$d", i);
   scanf ("%1$d%1$d", ip); /* { dg-warning "more than once" "multiple use of scanf argument" } */