From f166beaf427b75a84ea6bd2c848633bdafc49fd5 Mon Sep 17 00:00:00 2001
From: Tom de Vries <tom@codesourcery.com>
Date: Fri, 28 Apr 2017 07:26:32 +0000
Subject: [PATCH] Remove superfluous '{ target *-*-* }' in
 dg-(error|warning|message|bogus)

find $(find -type d -name testsuite) -type f \
     | xargs sed -ri \
       's#(dg-(error|warning|message|bogus).*) \{ target \*-\*-\* \} \}#\1 }#'

2017-04-28  Tom de Vries  <tom@codesourcery.com>

	* g++.dg/parse/error2.C: Remove superfluous '{ target *-*-* }' in
	dg-(error|warning|message|bogus).
	* g++.dg/parse/parameter-declaration-1.C: Same.
	* g++.dg/warn/Wstrict-aliasing-float-ref-int-obj.C: Same.
	* gcc.dg/Wpointer-sign-Wall.c: Same.
	* gcc.dg/Wpointer-sign-pedantic.c: Same.
	* gcc.dg/cpp/19990413-1.c: Same.
	* gcc.dg/dg-test-1.c: Same.
	* gcc.dg/empty-source-2.c: Same.
	* gcc.dg/empty-source-3.c: Same.
	* gcc.dg/format/c99-printf-1.c: Same.
	* gcc.dg/format/c99-scanf-1.c: Same.
	* gcc.dg/label-decl-2.c: Same.
	* gcc.dg/m-un-2.c: Same.
	* gcc.dg/uninit-pr20644-O0.c: Same.
	* gfortran.dg/pr70006.f90: Same.
	* obj-c++.dg/fsf-package-0.m: Same.

	* testsuite/17_intro/headers/c++1998/stdc++_assert_neg.cc: Remove
	superfluous '{ target *-*-* }' in dg-(error|warning|message|bogus).

From-SVN: r247364
---
 gcc/testsuite/ChangeLog                       | 20 +++++++++++++++++++
 gcc/testsuite/g++.dg/parse/error2.C           |  2 +-
 .../g++.dg/parse/parameter-declaration-1.C    |  2 +-
 .../warn/Wstrict-aliasing-float-ref-int-obj.C |  2 +-
 gcc/testsuite/gcc.dg/Wpointer-sign-Wall.c     |  2 +-
 gcc/testsuite/gcc.dg/Wpointer-sign-pedantic.c |  2 +-
 gcc/testsuite/gcc.dg/cpp/19990413-1.c         |  2 +-
 gcc/testsuite/gcc.dg/dg-test-1.c              |  4 ++--
 gcc/testsuite/gcc.dg/empty-source-2.c         |  2 +-
 gcc/testsuite/gcc.dg/empty-source-3.c         |  2 +-
 gcc/testsuite/gcc.dg/format/c99-printf-1.c    |  4 ++--
 gcc/testsuite/gcc.dg/format/c99-scanf-1.c     |  2 +-
 gcc/testsuite/gcc.dg/label-decl-2.c           |  2 +-
 gcc/testsuite/gcc.dg/m-un-2.c                 |  2 +-
 gcc/testsuite/gcc.dg/uninit-pr20644-O0.c      |  2 +-
 gcc/testsuite/gfortran.dg/pr70006.f90         |  8 ++++----
 gcc/testsuite/obj-c++.dg/fsf-package-0.m      |  2 +-
 libstdc++-v3/ChangeLog                        |  5 +++++
 .../headers/c++1998/stdc++_assert_neg.cc      |  2 +-
 19 files changed, 47 insertions(+), 22 deletions(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3893b12a9d2..a33c19a5b76 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,23 @@
+2017-04-28  Tom de Vries  <tom@codesourcery.com>
+
+	* g++.dg/parse/error2.C: Remove superfluous '{ target *-*-* }' in
+	dg-(error|warning|message|bogus).
+	* g++.dg/parse/parameter-declaration-1.C: Same.
+	* g++.dg/warn/Wstrict-aliasing-float-ref-int-obj.C: Same.
+	* gcc.dg/Wpointer-sign-Wall.c: Same.
+	* gcc.dg/Wpointer-sign-pedantic.c: Same.
+	* gcc.dg/cpp/19990413-1.c: Same.
+	* gcc.dg/dg-test-1.c: Same.
+	* gcc.dg/empty-source-2.c: Same.
+	* gcc.dg/empty-source-3.c: Same.
+	* gcc.dg/format/c99-printf-1.c: Same.
+	* gcc.dg/format/c99-scanf-1.c: Same.
+	* gcc.dg/label-decl-2.c: Same.
+	* gcc.dg/m-un-2.c: Same.
+	* gcc.dg/uninit-pr20644-O0.c: Same.
+	* gfortran.dg/pr70006.f90: Same.
+	* obj-c++.dg/fsf-package-0.m: Same.
+
 2017-04-28  Tom de Vries  <tom@codesourcery.com>
 
 	* c-c++-common/Wimplicit-fallthrough-6.c: Remove superfluous ' . ' in
diff --git a/gcc/testsuite/g++.dg/parse/error2.C b/gcc/testsuite/g++.dg/parse/error2.C
index cb8f4136ce5..1cca27cdd57 100644
--- a/gcc/testsuite/g++.dg/parse/error2.C
+++ b/gcc/testsuite/g++.dg/parse/error2.C
@@ -8,7 +8,7 @@ int func(double);
 template <int>
 struct Foo {};
 
-Foo<func(g)> f; // { dg-error "5:'int func.double.' cannot appear in a constant-expression" "func double" { target *-*-* } }
+Foo<func(g)> f; // { dg-error "5:'int func.double.' cannot appear in a constant-expression" "func double" }
 // { dg-error "10:'g' cannot appear in a constant-expression" "g" { target *-*-* } .-1 }
 // { dg-error "11:a function call cannot appear in a constant-expression" "call" { target *-*-* } .-2 }
 // { dg-error "12:template argument 1 is invalid" "invalid template argument" { target *-*-* } .-3 }
diff --git a/gcc/testsuite/g++.dg/parse/parameter-declaration-1.C b/gcc/testsuite/g++.dg/parse/parameter-declaration-1.C
index 22d6f214d7d..1eaa00ee28e 100644
--- a/gcc/testsuite/g++.dg/parse/parameter-declaration-1.C
+++ b/gcc/testsuite/g++.dg/parse/parameter-declaration-1.C
@@ -3,4 +3,4 @@
 // { dg-do compile }
 
 struct {
-   a(void = 0; a(0), a(0)	// { dg-error "" "" { target *-*-* } }
+   a(void = 0; a(0), a(0)	// { dg-error "" "" }
diff --git a/gcc/testsuite/g++.dg/warn/Wstrict-aliasing-float-ref-int-obj.C b/gcc/testsuite/g++.dg/warn/Wstrict-aliasing-float-ref-int-obj.C
index 9027061c5b8..d298555f5f1 100644
--- a/gcc/testsuite/g++.dg/warn/Wstrict-aliasing-float-ref-int-obj.C
+++ b/gcc/testsuite/g++.dg/warn/Wstrict-aliasing-float-ref-int-obj.C
@@ -4,7 +4,7 @@
 
 int foo() {
   int x;
-  float& q = reinterpret_cast<float&> (x);  /* { dg-message "dereferencing type-punned" "deref" { target *-*-* } } */
+  float& q = reinterpret_cast<float&> (x);  /* { dg-message "dereferencing type-punned" "deref" } */
   q = 1.0; /* { dg-warning "does break strict-aliasing" "strict-aliasing" { xfail *-*-* } } */
   return x;
 }
diff --git a/gcc/testsuite/gcc.dg/Wpointer-sign-Wall.c b/gcc/testsuite/gcc.dg/Wpointer-sign-Wall.c
index d29df30a7ad..843885fe276 100644
--- a/gcc/testsuite/gcc.dg/Wpointer-sign-Wall.c
+++ b/gcc/testsuite/gcc.dg/Wpointer-sign-Wall.c
@@ -2,7 +2,7 @@
 
 /* { dg-options "-Wall" } */
 
-void foo(unsigned long* ulp); /* { dg-message "note: expected '\[^\n'\]*' but argument is of type '\[^\n'\]*'" "note: expected" { target *-*-* } } */
+void foo(unsigned long* ulp); /* { dg-message "note: expected '\[^\n'\]*' but argument is of type '\[^\n'\]*'" "note: expected" } */
 
 
 void bar(long* lp) {
diff --git a/gcc/testsuite/gcc.dg/Wpointer-sign-pedantic.c b/gcc/testsuite/gcc.dg/Wpointer-sign-pedantic.c
index aebfbddb666..ab1130d66fe 100644
--- a/gcc/testsuite/gcc.dg/Wpointer-sign-pedantic.c
+++ b/gcc/testsuite/gcc.dg/Wpointer-sign-pedantic.c
@@ -2,7 +2,7 @@
 
 /* { dg-options "-pedantic" } */
 
-void foo(unsigned long* ulp);/* { dg-message "note: expected '\[^'\n\]*' but argument is of type '\[^'\n\]*'" "note: expected" { target *-*-* } } */
+void foo(unsigned long* ulp);/* { dg-message "note: expected '\[^'\n\]*' but argument is of type '\[^'\n\]*'" "note: expected" } */
 
 void bar(long* lp) {
   foo(lp); /* { dg-warning "differ in signedness" } */
diff --git a/gcc/testsuite/gcc.dg/cpp/19990413-1.c b/gcc/testsuite/gcc.dg/cpp/19990413-1.c
index bcb7e529bde..00f62c84501 100644
--- a/gcc/testsuite/gcc.dg/cpp/19990413-1.c
+++ b/gcc/testsuite/gcc.dg/cpp/19990413-1.c
@@ -9,5 +9,5 @@ func(void)
 {
   FOO(i
       = 4)
-  else;  /* { dg-error "'else' without a previous 'if'" "error on this line" { target *-*-* } } */ 
+  else;  /* { dg-error "'else' without a previous 'if'" "error on this line" } */ 
 }
diff --git a/gcc/testsuite/gcc.dg/dg-test-1.c b/gcc/testsuite/gcc.dg/dg-test-1.c
index b4e22e22c7a..c0e672aaeeb 100644
--- a/gcc/testsuite/gcc.dg/dg-test-1.c
+++ b/gcc/testsuite/gcc.dg/dg-test-1.c
@@ -5,7 +5,7 @@
 void
 foo (void)
 {			/* { dg-error "'a' undeclared" "err1" { target *-*-* } .+1 } */
-  int z = a + b + c + d;/* { dg-error "'b' undeclared" "err2" { target *-*-* } } */
+  int z = a + b + c + d;/* { dg-error "'b' undeclared" "err2" } */
 }			/* { dg-error "'c' undeclared" "err3" { target *-*-* } .-1 } */
 
 
@@ -13,7 +13,7 @@ foo (void)
 /* { dg-warning "unused parameter 'e'" "warn1" { target *-*-* } .+3 } */
 
 void				/* { dg-warning "unused parameter 'f'" "warn2" { target *-*-* } .+1 } */
-bar (int e, int f, int g, int h)/* { dg-warning "unused parameter 'g'" "warn3" { target *-*-* } } */
+bar (int e, int f, int g, int h)/* { dg-warning "unused parameter 'g'" "warn3" } */
 {				/* { dg-warning "unused parameter 'h'" "warn4" { target *-*-* } .-1 } */
 }
 
diff --git a/gcc/testsuite/gcc.dg/empty-source-2.c b/gcc/testsuite/gcc.dg/empty-source-2.c
index e0f1e20b22a..ae36159b5af 100644
--- a/gcc/testsuite/gcc.dg/empty-source-2.c
+++ b/gcc/testsuite/gcc.dg/empty-source-2.c
@@ -3,4 +3,4 @@
 /* { dg-do compile } */
 /* { dg-options "-pedantic" } */
 
-/* { dg-warning "ISO C forbids an empty translation unit" "empty" { target *-*-* } } */
+/* { dg-warning "ISO C forbids an empty translation unit" "empty" } */
diff --git a/gcc/testsuite/gcc.dg/empty-source-3.c b/gcc/testsuite/gcc.dg/empty-source-3.c
index a1e1d2c765d..bcd76ac2905 100644
--- a/gcc/testsuite/gcc.dg/empty-source-3.c
+++ b/gcc/testsuite/gcc.dg/empty-source-3.c
@@ -4,4 +4,4 @@
 /* { dg-do compile } */
 /* { dg-options "-pedantic-errors" } */
 
-/* { dg-error "ISO C forbids an empty translation unit" "empty" { target *-*-* } } */
+/* { dg-error "ISO C forbids an empty translation unit" "empty" } */
diff --git a/gcc/testsuite/gcc.dg/format/c99-printf-1.c b/gcc/testsuite/gcc.dg/format/c99-printf-1.c
index 729e41c3dfb..408ad49a680 100644
--- a/gcc/testsuite/gcc.dg/format/c99-printf-1.c
+++ b/gcc/testsuite/gcc.dg/format/c99-printf-1.c
@@ -62,8 +62,8 @@ foo (int i, unsigned int u, double d, char *s, void *p, int *n,
   printf ("%llc", i); /* { dg-warning "length" "bad use of %ll" } */
   printf ("%lls", s); /* { dg-warning "length" "bad use of %ll" } */
   printf ("%llp", p); /* { dg-warning "length" "bad use of %ll" } */
-  printf ("%jd%ji%jo%ju%jx%jX", j, j, uj, uj, uj, uj); /* { dg-bogus "length" "bogus %j warning" { target *-*-* } } */
-  printf ("%jn", jn); /* { dg-bogus "length" "bogus %j warning" { target *-*-* } } */
+  printf ("%jd%ji%jo%ju%jx%jX", j, j, uj, uj, uj, uj); /* { dg-bogus "length" "bogus %j warning" } */
+  printf ("%jn", jn); /* { dg-bogus "length" "bogus %j warning" } */
   printf ("%jf", d); /* { dg-warning "length" "bad use of %j" } */
   printf ("%jF", d); /* { dg-warning "length" "bad use of %j" } */
   printf ("%je", d); /* { dg-warning "length" "bad use of %j" } */
diff --git a/gcc/testsuite/gcc.dg/format/c99-scanf-1.c b/gcc/testsuite/gcc.dg/format/c99-scanf-1.c
index 7a8b3e2456c..521ef1d3c53 100644
--- a/gcc/testsuite/gcc.dg/format/c99-scanf-1.c
+++ b/gcc/testsuite/gcc.dg/format/c99-scanf-1.c
@@ -82,7 +82,7 @@ foo (int *ip, unsigned int *uip, short int *hp, unsigned short int *uhp,
   scanf ("%ll[ac]", s); /* { dg-warning "length" "bad use of %ll" } */
   scanf ("%llc", s); /* { dg-warning "length" "bad use of %ll" } */
   scanf ("%llp", pp); /* { dg-warning "length" "bad use of %ll" } */
-  scanf ("%jd%ji%jo%ju%jx%jX%jn", jp, jp, ujp, ujp, ujp, ujp, jn); /* { dg-bogus "length" "bogus %j warning" { target *-*-* } } */
+  scanf ("%jd%ji%jo%ju%jx%jX%jn", jp, jp, ujp, ujp, ujp, ujp, jn); /* { dg-bogus "length" "bogus %j warning" } */
   scanf ("%ja", fp); /* { dg-warning "length" "bad use of %j" } */
   scanf ("%jA", fp); /* { dg-warning "length" "bad use of %j" } */
   scanf ("%je", fp); /* { dg-warning "length" "bad use of %j" } */
diff --git a/gcc/testsuite/gcc.dg/label-decl-2.c b/gcc/testsuite/gcc.dg/label-decl-2.c
index 2ad427257f9..3ebe290a270 100644
--- a/gcc/testsuite/gcc.dg/label-decl-2.c
+++ b/gcc/testsuite/gcc.dg/label-decl-2.c
@@ -8,7 +8,7 @@ typedef int b;
 void
 f (void)
 {
-  __label__ a, b, c, d; /* { dg-warning "ISO C forbids label declarations" "label decls" { target *-*-* } } */
+  __label__ a, b, c, d; /* { dg-warning "ISO C forbids label declarations" "label decls" } */
   __extension__ (void)&&d; /* { dg-error "label 'd' used but not defined" } */
   goto c; /* { dg-error "label 'c' used but not defined" } */
  a: (void)0;
diff --git a/gcc/testsuite/gcc.dg/m-un-2.c b/gcc/testsuite/gcc.dg/m-un-2.c
index 345b9ff4dc2..b12c7cb5ec9 100644
--- a/gcc/testsuite/gcc.dg/m-un-2.c
+++ b/gcc/testsuite/gcc.dg/m-un-2.c
@@ -15,7 +15,7 @@ struct vtable {
 struct vtable mtable = {
   malloc,
   free
-}; /* { dg-warning "missing initializer" "warning regression" { target *-*-* } } */
+}; /* { dg-warning "missing initializer" "warning regression" } */
    /* { dg-message "declared here" "warning regression 2" { target *-*-* } 12 } */
 
 /* With designated initializers, we assume you meant to leave out the
diff --git a/gcc/testsuite/gcc.dg/uninit-pr20644-O0.c b/gcc/testsuite/gcc.dg/uninit-pr20644-O0.c
index 14bd0e214ae..8ae697abcdf 100644
--- a/gcc/testsuite/gcc.dg/uninit-pr20644-O0.c
+++ b/gcc/testsuite/gcc.dg/uninit-pr20644-O0.c
@@ -18,7 +18,7 @@ int bar ()
   int j; 
 
   if (1 == i)
-    return j; /* { dg-warning "uninitialized" "uninitialized" { target *-*-* } } */
+    return j; /* { dg-warning "uninitialized" "uninitialized" } */
 
   return 0;
 }
diff --git a/gcc/testsuite/gfortran.dg/pr70006.f90 b/gcc/testsuite/gfortran.dg/pr70006.f90
index a98d3da88b8..97b41709769 100644
--- a/gcc/testsuite/gfortran.dg/pr70006.f90
+++ b/gcc/testsuite/gfortran.dg/pr70006.f90
@@ -1,9 +1,9 @@
 ! { dg-do compile }
 program test
-   print 1, 'string 1' ! { dg-error "FORMAT label 1" " " { target *-*-* } }
-   print 1, 'string 2' ! { dg-error "FORMAT label 1" " " { target *-*-* } }
+   print 1, 'string 1' ! { dg-error "FORMAT label 1" " " }
+   print 1, 'string 2' ! { dg-error "FORMAT label 1" " " }
 !1 format(a)
-   goto 2 ! { dg-error "Label 2 referenced" " " { target *-*-* } }
-   goto 2 ! { dg-error "Label 2 referenced" " " { target *-*-* } }
+   goto 2 ! { dg-error "Label 2 referenced" " " }
+   goto 2 ! { dg-error "Label 2 referenced" " " }
 !2 continue
 end program
diff --git a/gcc/testsuite/obj-c++.dg/fsf-package-0.m b/gcc/testsuite/obj-c++.dg/fsf-package-0.m
index c2fc0cff1d8..942c1f4ab87 100644
--- a/gcc/testsuite/obj-c++.dg/fsf-package-0.m
+++ b/gcc/testsuite/obj-c++.dg/fsf-package-0.m
@@ -32,5 +32,5 @@ void foo (void)
   a->v2 = 1;
   a->v3 = [a value] - a->v2;	/* { dg-warning ".v3. is @protected" } */
   a->v4 = a->v3 - 1;		/* { dg-warning ".v4. is @private" } */
-  				/* { dg-warning ".v3. is @protected" "" { target *-*-* } } */
+  				/* { dg-warning ".v3. is @protected" "" } */
 }
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index fed2557d850..ebe939b4363 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2017-04-28  Tom de Vries  <tom@codesourcery.com>
+
+	* testsuite/17_intro/headers/c++1998/stdc++_assert_neg.cc: Remove
+	superfluous '{ target *-*-* }' in dg-(error|warning|message|bogus).
+
 2017-04-27  Jonathan Wakely  <jwakely@redhat.com>
 
 	* include/ext/pb_ds/detail/list_update_map_/iterators_fn_imps.hpp
diff --git a/libstdc++-v3/testsuite/17_intro/headers/c++1998/stdc++_assert_neg.cc b/libstdc++-v3/testsuite/17_intro/headers/c++1998/stdc++_assert_neg.cc
index 76999c4fde4..c16ac6f4ea5 100644
--- a/libstdc++-v3/testsuite/17_intro/headers/c++1998/stdc++_assert_neg.cc
+++ b/libstdc++-v3/testsuite/17_intro/headers/c++1998/stdc++_assert_neg.cc
@@ -31,5 +31,5 @@
 
 void foo()
 {
- assert(true);  // { dg-error "not declared" "" { target *-*-* } } 
+ assert(true);  // { dg-error "not declared" "" } 
 }
-- 
2.30.2