auto27.C: Add comments to checks for multiple messages reported for one line of source code.

	* g++.dg/cpp0x/auto27.C: Add comments to checks for multiple
	messages reported for one line of source code.
	* g++.dg/cpp0x/constexpr-decl.C: Likewise.
	* g++.dg/cpp0x/decltype2.C: Likewise.
	* g++.dg/cpp0x/decltype3.C: Likewise.
	* g++.dg/cpp0x/lambda/lambda-syntax1.C: Likewise.
	* g++.dg/cpp0x/regress/error-recovery1.C: Likewise.
	* g++.dg/cpp0x/static_assert3.C: Likewise.
	* g++.dg/cpp0x/udlit-cpp98-neg.C: Likewise.
	* g++.dg/cpp0x/udlit-shadow-neg.C: Likewise.
	* g++.dg/cpp0x/union1.C: Likewise.
	* g++.dg/cpp0x/variadic-ex10.C: Likewise.
	* g++.dg/cpp0x/variadic-ex14.C: Likewise.
	* g++.dg/cpp0x/variadic2.C: Likewise.
	* g++.dg/cpp0x/variadic20.C: Likewise.
	* g++.dg/cpp0x/variadic74.C: Likewise.
	* g++.dg/diagnostic/bitfld2.C: Likewise.
	* g++.dg/ext/attrib44.C: Likewise.
	* g++.dg/ext/no-asm-1.C: Likewise.
	* g++.dg/other/error34.C: Likewise.
	* g++.dg/parse/crash46.C: Likewise.
	* g++.dg/parse/error10.C: Likewise.
	* g++.dg/parse/error2.C: Likewise.
	* g++.dg/parse/error3.C: Likewise.
	* g++.dg/parse/error36.C: Likewise.
	* g++.dg/parse/error8.C: Likewise.
	* g++.dg/parse/error9.C: Likewise.
	* g++.dg/parse/parser-pr28152-2.C: Likewise.
	* g++.dg/parse/parser-pr28152.C: Likewise.
	* g++.dg/parse/template25.C: Likewise.
	* g++.dg/parse/typename11.C: Likewise.
	* g++.dg/tc1/dr147.C: Likewise.
	* g++.dg/template/deduce3.C: Likewise.
	* g++.dg/template/koenig9.C: Likewise.
	* g++.dg/template/pr23510.C: Likewise.
	* g++.dg/warn/pr12242.C: Likewise.
	* g++.dg/warn/pr30551-2.C: Likewise.
	* g++.dg/warn/pr30551.C: Likewise.
	* g++.old-deja/g++.other/typename1.C: Likewise.
	* g++.old-deja/g++.pt/niklas01a.C: Likewise.

From-SVN: r188677

40 files changed, 170 insertions, 127 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a81b001..7679c27 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,46 @@
+2012-06-15  Janis Johnson  <janosjo@codesourcery.com>
+
+	* g++.dg/cpp0x/auto27.C: Add comments to checks for multiple
+	messages reported for one line of source code.
+	* g++.dg/cpp0x/constexpr-decl.C: Likewise.
+	* g++.dg/cpp0x/decltype2.C: Likewise.
+	* g++.dg/cpp0x/decltype3.C: Likewise.
+	* g++.dg/cpp0x/lambda/lambda-syntax1.C: Likewise.
+	* g++.dg/cpp0x/regress/error-recovery1.C: Likewise.
+	* g++.dg/cpp0x/static_assert3.C: Likewise.
+	* g++.dg/cpp0x/udlit-cpp98-neg.C: Likewise.
+	* g++.dg/cpp0x/udlit-shadow-neg.C: Likewise.
+	* g++.dg/cpp0x/union1.C: Likewise.
+	* g++.dg/cpp0x/variadic-ex10.C: Likewise.
+	* g++.dg/cpp0x/variadic-ex14.C: Likewise.
+	* g++.dg/cpp0x/variadic2.C: Likewise.
+	* g++.dg/cpp0x/variadic20.C: Likewise.
+	* g++.dg/cpp0x/variadic74.C: Likewise.
+	* g++.dg/diagnostic/bitfld2.C: Likewise.
+	* g++.dg/ext/attrib44.C: Likewise.
+	* g++.dg/ext/no-asm-1.C: Likewise.
+	* g++.dg/other/error34.C: Likewise.
+	* g++.dg/parse/crash46.C: Likewise.
+	* g++.dg/parse/error10.C: Likewise.
+	* g++.dg/parse/error2.C: Likewise.
+	* g++.dg/parse/error3.C: Likewise.
+	* g++.dg/parse/error36.C: Likewise.
+	* g++.dg/parse/error8.C: Likewise.
+	* g++.dg/parse/error9.C: Likewise.
+	* g++.dg/parse/parser-pr28152-2.C: Likewise.
+	* g++.dg/parse/parser-pr28152.C: Likewise.
+	* g++.dg/parse/template25.C: Likewise.
+	* g++.dg/parse/typename11.C: Likewise.
+	* g++.dg/tc1/dr147.C: Likewise.
+	* g++.dg/template/deduce3.C: Likewise.
+	* g++.dg/template/koenig9.C: Likewise.
+	* g++.dg/template/pr23510.C: Likewise.
+	* g++.dg/warn/pr12242.C: Likewise.
+	* g++.dg/warn/pr30551-2.C: Likewise.
+	* g++.dg/warn/pr30551.C: Likewise.
+	* g++.old-deja/g++.other/typename1.C: Likewise.
+	* g++.old-deja/g++.pt/niklas01a.C: Likewise.
+
 2012-06-15  Ramana Radhakrishnan  <ramana.radhakrishnan@linaro.org>
 
 	PR c++/51033
diff --git a/gcc/testsuite/g++.dg/cpp0x/auto27.C b/gcc/testsuite/g++.dg/cpp0x/auto27.C
index c1041df..1921763 100644
--- a/gcc/testsuite/g++.dg/cpp0x/auto27.C
+++ b/gcc/testsuite/g++.dg/cpp0x/auto27.C
@@ -1,6 +1,6 @@
 // PR c++/51186
 
-auto main()->int	       // { dg-error "std=" "" { target c++98 } }
-			       // { dg-error "auto" "" { target c++98 } 3 }
-			       // { dg-error "no type" "" { target c++98 } 3 }
+auto main()->int	       // { dg-error "std=" "std" { target c++98 } }
+			       // { dg-error "auto" "auto" { target c++98 } 3 }
+			       // { dg-error "no type" "no type" { target c++98 } 3 }
 { }
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-decl.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-decl.C
index 0a3fcb6..8c46fab 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-decl.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-decl.C
@@ -2,8 +2,8 @@
 // { dg-options -std=c++0x }
 
 struct S {
-  static constexpr int size;	// { dg-error "must have an initializer" }
-  // { dg-error "previous declaration" "" { target *-*-* } 5 }
+  static constexpr int size;	// { dg-error "must have an initializer" "must have" }
+  // { dg-error "previous declaration" "previous" { target *-*-* } 5 }
 };
 
 const int limit = 2 * S::size;
diff --git a/gcc/testsuite/g++.dg/cpp0x/decltype2.C b/gcc/testsuite/g++.dg/cpp0x/decltype2.C
index 186d75b..e0c5900 100644
--- a/gcc/testsuite/g++.dg/cpp0x/decltype2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/decltype2.C
@@ -45,8 +45,8 @@ int bar(char);
 int bar(int); 
 CHECK_DECLTYPE(decltype(foo), int(char));
 
-decltype(bar) z; // { dg-error "overload" }
-// { dg-error "invalid type" "" { target *-*-* } 48 }
+decltype(bar) z; // { dg-error "overload" "overload" }
+// { dg-error "invalid type" "invalid" { target *-*-* } 48 }
 
 CHECK_DECLTYPE(decltype(&foo), int(*)(char));
 CHECK_DECLTYPE(decltype(*&foo), int(&)(char));
diff --git a/gcc/testsuite/g++.dg/cpp0x/decltype3.C b/gcc/testsuite/g++.dg/cpp0x/decltype3.C
index aeacfae..b44dd17 100644
--- a/gcc/testsuite/g++.dg/cpp0x/decltype3.C
+++ b/gcc/testsuite/g++.dg/cpp0x/decltype3.C
@@ -55,8 +55,8 @@ public:
 }; 
 
 CHECK_DECLTYPE(decltype(aa.*&A::a), int&);
-decltype(aa.*&A::b) zz; // { dg-error "cannot create pointer to reference member" }
-// { dg-error "invalid type" "" { target *-*-* } 58 }
+decltype(aa.*&A::b) zz; // { dg-error "cannot create pointer to reference member" "cannot" }
+// { dg-error "invalid type" "invalid type" { target *-*-* } 58 }
 CHECK_DECLTYPE(decltype(caa.*&A::a), const int&);
 
 class X { 
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-syntax1.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-syntax1.C
index f350133..b3b749c 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-syntax1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-syntax1.C
@@ -1,5 +1,5 @@
 // PR c++/46124
 // { dg-options -std=c++0x }
 
-void foo() { [] () -> void (); } // { dg-error "returning a function" }
-// { dg-error "expected .\{" "" { target *-*-* } 4 }
+void foo() { [] () -> void (); } // { dg-error "returning a function" "returning" }
+// { dg-error "expected .\{" "expected" { target *-*-* } 4 }
diff --git a/gcc/testsuite/g++.dg/cpp0x/regress/error-recovery1.C b/gcc/testsuite/g++.dg/cpp0x/regress/error-recovery1.C
index 9942c58..cdf9940 100644
--- a/gcc/testsuite/g++.dg/cpp0x/regress/error-recovery1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/regress/error-recovery1.C
@@ -5,7 +5,7 @@ template < bool > void
 foo ()
 {
   const bool b =;		// { dg-error "" }
-  foo < b > ();			// { dg-error "constant expression" }
+  foo < b > ();			// { dg-error "constant expression" "const expr" }
 };
 
-// { dg-error "no match" "" { target *-*-* } 8 }
+// { dg-error "no match" "no match" { target *-*-* } 8 }
diff --git a/gcc/testsuite/g++.dg/cpp0x/static_assert3.C b/gcc/testsuite/g++.dg/cpp0x/static_assert3.C
index 1ff2ffc..0a4cbc9 100644
--- a/gcc/testsuite/g++.dg/cpp0x/static_assert3.C
+++ b/gcc/testsuite/g++.dg/cpp0x/static_assert3.C
@@ -1,4 +1,4 @@
 // { dg-options "-std=c++0x" }
-static_assert(7 / 0, "X"); // { dg-error "non-constant condition" }
-// { dg-warning "division by zero" "" { target *-*-* } 2 }
-// { dg-error "7 / 0.. is not a constant expression" "" { target *-*-* } 2 }
+static_assert(7 / 0, "X"); // { dg-error "non-constant condition" "non-constant" }
+// { dg-warning "division by zero" "zero" { target *-*-* } 2 }
+// { dg-error "7 / 0.. is not a constant expression" "not a constant" { target *-*-* } 2 }
diff --git a/gcc/testsuite/g++.dg/cpp0x/udlit-cpp98-neg.C b/gcc/testsuite/g++.dg/cpp0x/udlit-cpp98-neg.C
index cb78a2c..cb4c359 100644
--- a/gcc/testsuite/g++.dg/cpp0x/udlit-cpp98-neg.C
+++ b/gcc/testsuite/g++.dg/cpp0x/udlit-cpp98-neg.C
@@ -12,6 +12,6 @@ int
 operator"" _Q(const char *, std::size_t)	// { dg-warning "user-defined literals only available with" }
 { return 42; }
 
-int x = "Hello"_Q;	// { dg-error "invalid conversion from" }
+int x = "Hello"_Q;	// { dg-error "invalid conversion from" "invalid" }
 
-// { dg-error "expected" "" { target *-*-* } 15 }
+// { dg-error "expected" "expected" { target *-*-* } 15 }
diff --git a/gcc/testsuite/g++.dg/cpp0x/udlit-shadow-neg.C b/gcc/testsuite/g++.dg/cpp0x/udlit-shadow-neg.C
index 6d38252..994d58c 100644
--- a/gcc/testsuite/g++.dg/cpp0x/udlit-shadow-neg.C
+++ b/gcc/testsuite/g++.dg/cpp0x/udlit-shadow-neg.C
@@ -39,11 +39,11 @@ operator"" ull(unsigned long long int k)  // { dg-warning "integer suffix|shadow
 
 }
 
-// { dg-warning "literal operator suffixes not preceded by|are reserved for future standardization" "" { target *-*-* } 5 }
-// { dg-warning "literal operator suffixes not preceded by|are reserved for future standardization" "" { target *-*-* } 9 }
-// { dg-warning "literal operator suffixes not preceded by|are reserved for future standardization" "" { target *-*-* } 13 }
-// { dg-warning "literal operator suffixes not preceded by|are reserved for future standardization" "" { target *-*-* } 17 }
-// { dg-warning "literal operator suffixes not preceded by|are reserved for future standardization" "" { target *-*-* } 25 }
-// { dg-warning "literal operator suffixes not preceded by|are reserved for future standardization" "" { target *-*-* } 29 }
-// { dg-warning "literal operator suffixes not preceded by|are reserved for future standardization" "" { target *-*-* } 33 }
-// { dg-warning "literal operator suffixes not preceded by|are reserved for future standardization" "" { target *-*-* } 37 }
+// { dg-warning "literal operator suffixes not preceded by|are reserved for future standardization" "reserved" { target *-*-* } 5 }
+// { dg-warning "literal operator suffixes not preceded by|are reserved for future standardization" "reserved" { target *-*-* } 9 }
+// { dg-warning "literal operator suffixes not preceded by|are reserved for future standardization" "reserved" { target *-*-* } 13 }
+// { dg-warning "literal operator suffixes not preceded by|are reserved for future standardization" "reserved" { target *-*-* } 17 }
+// { dg-warning "literal operator suffixes not preceded by|are reserved for future standardization" "reserved" { target *-*-* } 25 }
+// { dg-warning "literal operator suffixes not preceded by|are reserved for future standardization" "reserved" { target *-*-* } 29 }
+// { dg-warning "literal operator suffixes not preceded by|are reserved for future standardization" "reserved" { target *-*-* } 33 }
+// { dg-warning "literal operator suffixes not preceded by|are reserved for future standardization" "reserved" { target *-*-* } 37 }
diff --git a/gcc/testsuite/g++.dg/cpp0x/union1.C b/gcc/testsuite/g++.dg/cpp0x/union1.C
index 291853d5..cb0f017 100644
--- a/gcc/testsuite/g++.dg/cpp0x/union1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/union1.C
@@ -14,8 +14,8 @@ union B
   A a;				// { dg-error "union member" }
 };
 
-B b;				// { dg-error "B::B\\(\\)" }
-B b2(b);			// { dg-error "B::B\\(const B&\\)" }
+B b;				// { dg-error "B::B\\(\\)" "B::B" }
+B b2(b);			// { dg-error "B::B\\(const B&\\)" "B::B" }
 
 struct C
 {
@@ -25,10 +25,10 @@ struct C
   };
 };
 
-C c;				// { dg-error "C::C\\(\\)" }
-C c2(c);			// { dg-error "C::C\\(const C&\\)" }
+C c;				// { dg-error "C::C\\(\\)" "C::C" }
+C c2(c);			// { dg-error "C::C\\(const C&\\)" "C::C" }
 
-// { dg-error "B::~B" "" { target *-*-* } 17 }
-// { dg-error "B::~B" "" { target *-*-* } 18 }
-// { dg-error "C::~C" "" { target *-*-* } 28 }
-// { dg-error "C::~C" "" { target *-*-* } 29 }
+// { dg-error "B::~B" "B::~B" { target *-*-* } 17 }
+// { dg-error "B::~B" "B::~B" { target *-*-* } 18 }
+// { dg-error "C::~C" "C::~C" { target *-*-* } 28 }
+// { dg-error "C::~C" "C::~C" { target *-*-* } 29 }
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic-ex10.C b/gcc/testsuite/g++.dg/cpp0x/variadic-ex10.C
index a392bd7..e8b6b72 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic-ex10.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic-ex10.C
@@ -4,6 +4,6 @@ template<typename... Types> struct Tuple { };
 Tuple<> t0; // Types contains no arguments
 Tuple<int> t1; // Types contains one argument: int
 Tuple<int, float> t2; // Types contains two arguments: int and float
-Tuple<0> error; // { dg-error "mismatch" }
-// { dg-error "expected a type" "" { target *-*-* } 7 }
-// { dg-error "in declaration" "" { target *-*-* } 7 }
+Tuple<0> error; // { dg-error "mismatch" "mismatch" }
+// { dg-error "expected a type" "expected a type" { target *-*-* } 7 }
+// { dg-error "in declaration" "in declaration" { target *-*-* } 7 }
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic-ex14.C b/gcc/testsuite/g++.dg/cpp0x/variadic-ex14.C
index f33ca0e8..105096a 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic-ex14.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic-ex14.C
@@ -8,12 +8,12 @@ template<template<class> class P> class X { /* ... */ };
 template<template<class...> class Q> class Y { /* ... */ };
 
 X<A> xA; // okay
-X<B> xB; // { dg-error "mismatch" }
-// { dg-error "expected a template" "" { target *-*-* } 11 }
-// { dg-error "invalid type" "" { target *-*-* } 11 }
-X<C> xC; // { dg-error "mismatch" }
-// { dg-error "expected a template" "" { target *-*-* } 14 }
-// { dg-error "invalid type" "" { target *-*-* } 14 }
+X<B> xB; // { dg-error "mismatch" "mismatch" }
+// { dg-error "expected a template" "expected" { target *-*-* } 11 }
+// { dg-error "invalid type" "invalid" { target *-*-* } 11 }
+X<C> xC; // { dg-error "mismatch" "mismatch" }
+// { dg-error "expected a template" "expected" { target *-*-* } 14 }
+// { dg-error "invalid type" "invalid" { target *-*-* } 14 }
 Y<A> yA;
 Y<B> yB;
 Y<C> yC; // okay
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic2.C b/gcc/testsuite/g++.dg/cpp0x/variadic2.C
index d62a542..207a806 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic2.C
@@ -8,8 +8,8 @@ class tuple3;
 template<typename T1, typename T2, typename... Rest>
 struct two_or_more {}; // { dg-error "provided for" }
 
-typedef two_or_more<int> bad; // { dg-error "2 or more" }
-// { dg-error "invalid type" "" { target *-*-* } 11 }
+typedef two_or_more<int> bad; // { dg-error "2 or more" "2 or more" }
+// { dg-error "invalid type" "invalid type" { target *-*-* } 11 }
 
 void f()
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic20.C b/gcc/testsuite/g++.dg/cpp0x/variadic20.C
index 7f2446e..bfb42be 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic20.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic20.C
@@ -37,11 +37,11 @@ struct metatuple<First, Second, Metafunctions...> { // { dg-error "struct" }
 
 int a0[metatuple<>::value == 0? 1 : -1];
 int a1[metatuple<add_pointer>::value == 1? 1 : -1];
-int a2a[metatuple<add_pointer, add_pointer>::value == 2? 1 : -1]; // { dg-error "ambiguous|array bound" }
+int a2a[metatuple<add_pointer, add_pointer>::value == 2? 1 : -1]; // { dg-error "ambiguous|array bound" "bound" }
 int a2b[metatuple<add_reference, add_reference>::value == 2? 1 : -1];
-int a3[metatuple<add_pointer, add_reference>::value == 3? 1 : -1]; // { dg-error "ambiguous|array bound" }
+int a3[metatuple<add_pointer, add_reference>::value == 3? 1 : -1]; // { dg-error "ambiguous|array bound" "bound" }
 int a4[metatuple<add_reference>::value == 4? 1 : -1];
 int a5[metatuple<add_reference, add_pointer>::value == 5? 1 : -1];
 
-// { dg-error "incomplete" "" { target *-*-* } 40 }
-// { dg-error "incomplete" "" { target *-*-* } 42 }
+// { dg-error "incomplete" "incomplete" { target *-*-* } 40 }
+// { dg-error "incomplete" "incomplete" { target *-*-* } 42 }
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic74.C b/gcc/testsuite/g++.dg/cpp0x/variadic74.C
index 5b502b9..312fe9d 100644
--- a/gcc/testsuite/g++.dg/cpp0x/variadic74.C
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic74.C
@@ -19,8 +19,8 @@ float f;
 A<int*, float*>::X<&i, &f> apple1;
 B<int, float>::X<&i, &f> banana1;
 
-A<int*, float*>::X<&i> apple2; // { dg-error "wrong number of template arguments" }
-// { dg-error "invalid type" "" { target *-*-* } 22 }
-A<int*, float*>::X<&i, &f, &f> apple3; // { dg-error "wrong number of template arguments" }
-// { dg-error "invalid type" "" { target *-*-* } 24 }
+A<int*, float*>::X<&i> apple2; // { dg-error "wrong number of template arguments" "wrong number" }
+// { dg-error "invalid type" "invalid" { target *-*-* } 22 }
+A<int*, float*>::X<&i, &f, &f> apple3; // { dg-error "wrong number of template arguments" "wrong number" }
+// { dg-error "invalid type" "invalid" { target *-*-* } 24 }
 A<int, float> apple4;
diff --git a/gcc/testsuite/g++.dg/diagnostic/bitfld2.C b/gcc/testsuite/g++.dg/diagnostic/bitfld2.C
index 10b7d9c..46d5ee2 100644
--- a/gcc/testsuite/g++.dg/diagnostic/bitfld2.C
+++ b/gcc/testsuite/g++.dg/diagnostic/bitfld2.C
@@ -3,7 +3,7 @@
 
 template<int> struct A
 {
-  struct {} : 2;   // { dg-error "expected ';' after struct" }
+  struct {} : 2;   // { dg-error "expected ';' after struct" "expected" }
 };
-// { dg-error "ISO C.. forbids declaration" "" { target *-*-* } 6 }
-// { dg-error "ISO C.. prohibits anonymous" "" { target *-*-* } 6 }
+// { dg-error "ISO C.. forbids declaration" "declaration" { target *-*-* } 6 }
+// { dg-error "ISO C.. prohibits anonymous" "anonymous" { target *-*-* } 6 }
diff --git a/gcc/testsuite/g++.dg/ext/attrib44.C b/gcc/testsuite/g++.dg/ext/attrib44.C
index ae08191..cb83653 100644
--- a/gcc/testsuite/g++.dg/ext/attrib44.C
+++ b/gcc/testsuite/g++.dg/ext/attrib44.C
@@ -1,4 +1,4 @@
 // PR c++/52671
 // { dg-do compile }
-__attribute__ ((deprecated)) enum E { E0 };	// { dg-warning "attribute ignored in declaration of" }
-// { dg-message "must follow the" "" { target *-*-* } 3 }
+__attribute__ ((deprecated)) enum E { E0 };	// { dg-warning "attribute ignored in declaration of" "ignored" }
+// { dg-message "must follow the" "must follow" { target *-*-* } 3 }
diff --git a/gcc/testsuite/g++.dg/ext/no-asm-1.C b/gcc/testsuite/g++.dg/ext/no-asm-1.C
index 6c4c204..e41ebbe 100644
--- a/gcc/testsuite/g++.dg/ext/no-asm-1.C
+++ b/gcc/testsuite/g++.dg/ext/no-asm-1.C
@@ -5,6 +5,6 @@
 // keywords.
 
 int asm;	// { dg-error "before .asm." }
-int typeof;	// { dg-error "expected" }
-// { dg-error "multiple types" "" { target *-*-* } 8 }
-// { dg-error "declaration" "" { target *-*-* } 8 }
+int typeof;	// { dg-error "expected" "expected" }
+// { dg-error "multiple types" "multiple" { target *-*-* } 8 }
+// { dg-error "declaration" "declaration" { target *-*-* } 8 }
diff --git a/gcc/testsuite/g++.dg/other/error34.C b/gcc/testsuite/g++.dg/other/error34.C
index 10a782d..d6f3eb5 100644
--- a/gcc/testsuite/g++.dg/other/error34.C
+++ b/gcc/testsuite/g++.dg/other/error34.C
@@ -2,5 +2,5 @@
 // { dg-do compile }
 // { dg-options "" }
 
-S () : str(__PRETTY_FUNCTION__) {}	// { dg-error "forbids declaration" }
-// { dg-error "only constructors" "" { target *-*-* } 5 }
+S () : str(__PRETTY_FUNCTION__) {}	// { dg-error "forbids declaration" "decl" }
+// { dg-error "only constructors" "constructor" { target *-*-* } 5 }
diff --git a/gcc/testsuite/g++.dg/parse/crash46.C b/gcc/testsuite/g++.dg/parse/crash46.C
index f454a0a..0ae2248 100644
--- a/gcc/testsuite/g++.dg/parse/crash46.C
+++ b/gcc/testsuite/g++.dg/parse/crash46.C
@@ -2,17 +2,17 @@
 // { dg-do compile }
 
 void
-foo (_Decimal32)	// { dg-error "declared void" }
+foo (_Decimal32)	// { dg-error "declared void" "declared" }
 {
 }
-			// { dg-error "was not declared" "" { target *-*-* } 5 }
+			// { dg-error "was not declared" "not" { target *-*-* } 5 }
 void
-bar (_Bool)		// { dg-error "declared void" }
+bar (_Bool)		// { dg-error "declared void" "declared" }
 {
 }
-			// { dg-error "was not declared" "" { target *-*-* } 10 }
+			// { dg-error "was not declared" "not" { target *-*-* } 10 }
 void
-baz (_Fract)		// { dg-error "declared void" }
+baz (_Fract)		// { dg-error "declared void" "declared" }
 {
 }
-			// { dg-error "was not declared" "" { target *-*-* } 15 }
+			// { dg-error "was not declared" "not" { target *-*-* } 15 }
diff --git a/gcc/testsuite/g++.dg/parse/error10.C b/gcc/testsuite/g++.dg/parse/error10.C
index 8301172..c2cd7e2 100644
--- a/gcc/testsuite/g++.dg/parse/error10.C
+++ b/gcc/testsuite/g++.dg/parse/error10.C
@@ -15,5 +15,5 @@ template <typename T> void foo()
 }
 
 // Here, columns nums are not very accurate either. Still acceptable though
-// { dg-error "30:invalid type in declaration before ';' token" "" { target *-*-* } 14 }
-// { dg-error "30:two or more data types in declaration of 'e4'" "" { target *-*-* } 14 }
+// { dg-error "30:invalid type in declaration before ';' token" "invalid" { target *-*-* } 14 }
+// { dg-error "30:two or more data types in declaration of 'e4'" "2 or more" { target *-*-* } 14 }
diff --git a/gcc/testsuite/g++.dg/parse/error2.C b/gcc/testsuite/g++.dg/parse/error2.C
index 7b08df4..713957a 100644
--- a/gcc/testsuite/g++.dg/parse/error2.C
+++ b/gcc/testsuite/g++.dg/parse/error2.C
@@ -8,8 +8,8 @@ int func(double);
 template <int>
 struct Foo {};
 
-Foo<func(g)> f; // { dg-error "5:'int func.double.' cannot appear in a constant-expression" "" { target *-*-* } 11 }
-// { dg-error "10:'g' cannot appear in a constant-expression" "" { target *-*-* } 11 }
-// { dg-error "11:a function call cannot appear in a constant-expression" "" { target *-*-* } 11 }
-// { dg-error "12:template argument 1 is invalid" "" { target *-*-* } 11 }
-// { dg-error "15:invalid type in declaration before ';' token" "" { target *-*-* } 11 }
+Foo<func(g)> f; // { dg-error "5:'int func.double.' cannot appear in a constant-expression" "func double" { target *-*-* } 11 }
+// { dg-error "10:'g' cannot appear in a constant-expression" "g" { target *-*-* } 11 }
+// { dg-error "11:a function call cannot appear in a constant-expression" "call" { target *-*-* } 11 }
+// { dg-error "12:template argument 1 is invalid" "invalid template argument" { target *-*-* } 11 }
+// { dg-error "15:invalid type in declaration before ';' token" "invalid type" { target *-*-* } 11 }
diff --git a/gcc/testsuite/g++.dg/parse/error3.C b/gcc/testsuite/g++.dg/parse/error3.C
index 7e8cf8d..5873993 100644
--- a/gcc/testsuite/g++.dg/parse/error3.C
+++ b/gcc/testsuite/g++.dg/parse/error3.C
@@ -5,5 +5,5 @@ static void InstantiateConstraint(const float&, unsigned,
                                   void(*AddFunction)(const TYPE&,bool&,
                                                      char*, char*,
                                                      unsigned*));
-// { dg-error "64: ISO C\\+\\+ forbids declaration of 'parameter' with no type" "" { target *-*-* }  { 5 } }
-// { dg-error "60: 'TYPE' does not name a type" "" { target *-*-* } { 5 } }
+// { dg-error "64: ISO C\\+\\+ forbids declaration of 'parameter' with no type" "forbids" { target *-*-* }  { 5 } }
+// { dg-error "60: 'TYPE' does not name a type" "does not" { target *-*-* } { 5 } }
diff --git a/gcc/testsuite/g++.dg/parse/error36.C b/gcc/testsuite/g++.dg/parse/error36.C
index 8fcaa2f..a99ad29 100644
--- a/gcc/testsuite/g++.dg/parse/error36.C
+++ b/gcc/testsuite/g++.dg/parse/error36.C
@@ -11,22 +11,22 @@ template <class T>
 void f(T t)
 {
   typedef A<T>::foo type;	// { dg-error "typename" }
-  A<T>::bar b;			// { dg-error "typename" }
-} // { dg-error "expected ';'" "" { target *-*-* } 14 }
+  A<T>::bar b;			// { dg-error "typename" "typename" }
+} // { dg-error "expected ';'" "expected" { target *-*-* } 14 }
 
 // PR c++/36353
 template <class T> struct B
 {
   void f()
   {
-    A<T>::baz z;		// { dg-error "typename" }
-  } // { dg-error "expected ';'" "" { target *-*-* } 22 }
+    A<T>::baz z;		// { dg-error "typename" "typename" }
+  } // { dg-error "expected ';'" "expected" { target *-*-* } 22 }
 };
 
 // PR c++/40738
 template <class T>
-void g(const A<T>::type &t);	// { dg-error "typename" }
-// { dg-error "no type" "" { target *-*-* } 28 }
+void g(const A<T>::type &t);	// { dg-error "typename" "typename" }
+// { dg-error "no type" "no type" { target *-*-* } 28 }
 
 // PR c++/18451
 template <class T> A<T>::B A<T>::b; // { dg-error "typename" }
diff --git a/gcc/testsuite/g++.dg/parse/error8.C b/gcc/testsuite/g++.dg/parse/error8.C
index 6d3bf5a..61e42e0 100644
--- a/gcc/testsuite/g++.dg/parse/error8.C
+++ b/gcc/testsuite/g++.dg/parse/error8.C
@@ -4,6 +4,6 @@
 struct A { friend typename struct B; };
 
 
-// { dg-error "28:expected nested-name-specifier before 'struct'" "" { target *-*-* } 4 }
-// { dg-error "35:multiple types in one declaration" "" { target *-*-* } 4 }
-// { dg-error "12:friend declaration does not name a class or function" "" { target *-*-* } 4 }
+// { dg-error "28:expected nested-name-specifier before 'struct'" "expected" { target *-*-* } 4 }
+// { dg-error "35:multiple types in one declaration" "multiple" { target *-*-* } 4 }
+// { dg-error "12:friend declaration does not name a class or function" "friend decl" { target *-*-* } 4 }
diff --git a/gcc/testsuite/g++.dg/parse/error9.C b/gcc/testsuite/g++.dg/parse/error9.C
index b16c84e..3426c69 100644
--- a/gcc/testsuite/g++.dg/parse/error9.C
+++ b/gcc/testsuite/g++.dg/parse/error9.C
@@ -5,5 +5,5 @@ enum { FOO = 1, BAR = 2 };
 int a[] = { FOO: 1, BAR: 2 };
 
 // the following 2 column locations are still not accurate enough
-// { dg-error "28:name 'FOO' used in a GNU-style designated initializer for an array" "" { target *-*-* } 5 }
-// { dg-error "28:name 'BAR' used in a GNU-style designated initializer for an array" "" { target *-*-* } 5 }
+// { dg-error "28:name 'FOO' used in a GNU-style designated initializer for an array" "FOO" { target *-*-* } 5 }
+// { dg-error "28:name 'BAR' used in a GNU-style designated initializer for an array" "BAR" { target *-*-* } 5 }
diff --git a/gcc/testsuite/g++.dg/parse/parser-pr28152-2.C b/gcc/testsuite/g++.dg/parse/parser-pr28152-2.C
index bcccb94..a5bbb92 100644
--- a/gcc/testsuite/g++.dg/parse/parser-pr28152-2.C
+++ b/gcc/testsuite/g++.dg/parse/parser-pr28152-2.C
@@ -6,8 +6,8 @@ main (void)
 {
   __complex__ float z;
 
-  z = __complex__ (1.90000007326203904e+19, 0.0);   // { dg-error "expected primary-expression before '__complex__'" } 
-  // { dg-error "expected .;. before .__complex__." "" { target *-*-* } 9 } 
-  z = __complex__ (1.0e+0, 0.0) / z;    // { dg-error "expected primary-expression before '__complex__'" } 
-  // { dg-error "expected .;. before '__complex__'" "" { target *-*-* } 11 } 
-  // { dg-error "at end of input" "" { target *-*-* } 11 } 
+  z = __complex__ (1.90000007326203904e+19, 0.0);   // { dg-error "expected primary-expression before '__complex__'" "primary-expression" } 
+  // { dg-error "expected .;. before .__complex__." "semicolon" { target *-*-* } 9 } 
+  z = __complex__ (1.0e+0, 0.0) / z;    // { dg-error "expected primary-expression before '__complex__'" "primaty-expression" } 
+  // { dg-error "expected .;. before '__complex__'" "semicolon" { target *-*-* } 11 } 
+  // { dg-error "at end of input" "end" { target *-*-* } 11 } 
diff --git a/gcc/testsuite/g++.dg/parse/parser-pr28152.C b/gcc/testsuite/g++.dg/parse/parser-pr28152.C
index 5b3a25e..4a7c77e 100644
--- a/gcc/testsuite/g++.dg/parse/parser-pr28152.C
+++ b/gcc/testsuite/g++.dg/parse/parser-pr28152.C
@@ -6,8 +6,8 @@ main (void)
 {
   _Complex float z;
 
-  z = _Complex (1.90000007326203904e+19, 0.0);   // { dg-error "expected primary-expression before '_Complex'" } 
-  // { dg-error "expected .;. before ._Complex." "" { target *-*-* } 9 } 
-  z = _Complex (1.0e+0, 0.0) / z;    // { dg-error "expected primary-expression before '_Complex'" } 
-  // { dg-error "expected .;. before '_Complex'" "" { target *-*-* } 11 } 
-  // { dg-error "at end of input" "" { target *-*-* } 11 } 
+  z = _Complex (1.90000007326203904e+19, 0.0);   // { dg-error "expected primary-expression before '_Complex'" "primary-expression" } 
+  // { dg-error "expected .;. before ._Complex." "semicolon" { target *-*-* } 9 } 
+  z = _Complex (1.0e+0, 0.0) / z;    // { dg-error "expected primary-expression before '_Complex'" "primary-expression" } 
+  // { dg-error "expected .;. before '_Complex'" "semicolon" { target *-*-* } 11 } 
+  // { dg-error "at end of input" "end" { target *-*-* } 11 } 
diff --git a/gcc/testsuite/g++.dg/parse/template25.C b/gcc/testsuite/g++.dg/parse/template25.C
index 8ffcd12..0da3887 100644
--- a/gcc/testsuite/g++.dg/parse/template25.C
+++ b/gcc/testsuite/g++.dg/parse/template25.C
@@ -9,6 +9,6 @@ void f(void)
 
 void g(void)
 {
-  template f<int>(); /* { dg-error "expected primary-expression" } */
-  /* { dg-error "expected ';'" "" { target *-*-* } 12 } */
+  template f<int>(); /* { dg-error "expected primary-expression" "primary-expression" } */
+  /* { dg-error "expected ';'" "semicolon" { target *-*-* } 12 } */
 }
diff --git a/gcc/testsuite/g++.dg/parse/typename11.C b/gcc/testsuite/g++.dg/parse/typename11.C
index a79e6d8..bbaaec7 100644
--- a/gcc/testsuite/g++.dg/parse/typename11.C
+++ b/gcc/testsuite/g++.dg/parse/typename11.C
@@ -10,7 +10,7 @@ template <int dim> struct Y : X<dim> {
 
 // note: I is nested type in X, not Y!
 template <int dim>
-Y<dim>::I::I () {}		// { dg-error "dependent typedef" }
-// { dg-error "no type|dependent type" "" { target *-*-* } 13 }
+Y<dim>::I::I () {}		// { dg-error "dependent typedef" "typedef" }
+// { dg-error "no type|dependent type" "no type" { target *-*-* } 13 }
 
 template struct Y<1>;
diff --git a/gcc/testsuite/g++.dg/tc1/dr147.C b/gcc/testsuite/g++.dg/tc1/dr147.C
index 6799b7d..0fb97e8 100644
--- a/gcc/testsuite/g++.dg/tc1/dr147.C
+++ b/gcc/testsuite/g++.dg/tc1/dr147.C
@@ -20,8 +20,8 @@ void A::f()
 
 void f()
 {
-  A::A a; // { dg-error "constructor" }
-} // { dg-error "" "" { target *-*-* } 23 } error cascade
+  A::A a; // { dg-error "constructor" "constructor" }
+} // { dg-error "" "error cascade" { target *-*-* } 23 } error cascade
 }
 
 namespace N2 {
diff --git a/gcc/testsuite/g++.dg/template/deduce3.C b/gcc/testsuite/g++.dg/template/deduce3.C
index c5d6e00..72c7e20 100644
--- a/gcc/testsuite/g++.dg/template/deduce3.C
+++ b/gcc/testsuite/g++.dg/template/deduce3.C
@@ -1,11 +1,11 @@
 template <typename T>
-void f(int, T (*)() = 0);	// { dg-message "note" }
+void f(int, T (*)() = 0);	// { dg-message "note" "note" }
 
 void g() {
   typedef int A[2];
   f<A>(0); // { dg-error "" }
-  // { dg-error "returning an array" "candidate explanation" { target *-*-* } 2 }
+  // { dg-error "returning an array" "returning an array" { target *-*-* } 2 }
   typedef void F();
   f<F>(0); // { dg-error "" }
-  // { dg-error "returning a function" "candidate explanation" { target *-*-* } 2 }
+  // { dg-error "returning a function" "returning a function" { target *-*-* } 2 }
 }
diff --git a/gcc/testsuite/g++.dg/template/koenig9.C b/gcc/testsuite/g++.dg/template/koenig9.C
index ae74a47..f2cf9ed 100644
--- a/gcc/testsuite/g++.dg/template/koenig9.C
+++ b/gcc/testsuite/g++.dg/template/koenig9.C
@@ -16,8 +16,8 @@ struct A
 
 template <class T> struct B: A<T>
 {
-  void f() { h(T()); }		// { dg-error "argument-dependent" }
-  static void g() { h(T()); }	// { dg-error "argument-dependent" }
+  void f() { h(T()); }		// { dg-error "argument-dependent" "arg-dep" }
+  static void g() { h(T()); }	// { dg-error "argument-dependent" "arg-dep" }
 };
 
 int main()
@@ -27,7 +27,7 @@ int main()
   b.g();
 }
 
-// { dg-message "dependent base .A.int" "" { target *-*-* } 19 }
-// { dg-message "this->h" "" { target *-*-* } 19 }
-// { dg-message "dependent base .A.int" "" { target *-*-* } 20 }
-// { dg-message "B::h" "" { target *-*-* } 20 }
+// { dg-message "dependent base .A.int" "base" { target *-*-* } 19 }
+// { dg-message "this->h" "this->h" { target *-*-* } 19 }
+// { dg-message "dependent base .A.int" "base" { target *-*-* } 20 }
+// { dg-message "B::h" "B::h" { target *-*-* } 20 }
diff --git a/gcc/testsuite/g++.dg/template/pr23510.C b/gcc/testsuite/g++.dg/template/pr23510.C
index 86310d3..7163e30 100644
--- a/gcc/testsuite/g++.dg/template/pr23510.C
+++ b/gcc/testsuite/g++.dg/template/pr23510.C
@@ -3,9 +3,9 @@
 template<unsigned int nFactor>
 struct Factorial
 {
-  enum { nValue = nFactor * Factorial<nFactor - 1>::nValue }; // { dg-error "depth exceeds maximum" } 
-  // { dg-message "recursively required" "" { target *-*-* } 6 }
-  // { dg-error "incomplete type" "" { target *-*-* } 6 } 
+  enum { nValue = nFactor * Factorial<nFactor - 1>::nValue }; // { dg-error "depth exceeds maximum" "exceeds" } 
+  // { dg-message "recursively required" "recurse" { target *-*-* } 6 }
+  // { dg-error "incomplete type" "incomplete" { target *-*-* } 6 } 
 } // { dg-error "expected ';' after" }
 
   template<>
diff --git a/gcc/testsuite/g++.dg/warn/pr12242.C b/gcc/testsuite/g++.dg/warn/pr12242.C
index e858c54..a2f81f8 100644
--- a/gcc/testsuite/g++.dg/warn/pr12242.C
+++ b/gcc/testsuite/g++.dg/warn/pr12242.C
@@ -10,8 +10,8 @@ void example ()
   X x;
   Y y;
   
-  x = 10;  // { dg-warning "invalid conversion from .int. to .X." }
-           // { dg-warning "unspecified" "" { target *-*-* } 13 }
+  x = 10;  // { dg-warning "invalid conversion from .int. to .X." "invalid" }
+           // { dg-warning "unspecified" "unspecified" { target *-*-* } 13 }
   x = 1;   // { dg-warning "invalid conversion from .int. to .X." }
   x = C;   // { dg-error "cannot convert .Y. to .X. in assignment" }  
   x = D;   // { dg-error "cannot convert .Y. to .X. in assignment" }  
diff --git a/gcc/testsuite/g++.dg/warn/pr30551-2.C b/gcc/testsuite/g++.dg/warn/pr30551-2.C
index 8334746..fe85c4f 100644
--- a/gcc/testsuite/g++.dg/warn/pr30551-2.C
+++ b/gcc/testsuite/g++.dg/warn/pr30551-2.C
@@ -2,5 +2,5 @@
 // { dg-do compile }
 // { dg-options "-pedantic-errors" }
 // { dg-skip-if "-Wmain not enabled with -pedantic on SPU" { spu-*-* } } 
-int main(char a) {} /* { dg-error "first argument of .*main.* should be .int." } */
-/* { dg-error "main.* takes only zero or two arguments" "" { target *-*-* } 5 } */ 
+int main(char a) {} /* { dg-error "first argument of .*main.* should be .int." "int" } */
+/* { dg-error "main.* takes only zero or two arguments" "zero or two" { target *-*-* } 5 } */ 
diff --git a/gcc/testsuite/g++.dg/warn/pr30551.C b/gcc/testsuite/g++.dg/warn/pr30551.C
index 6d7f662..2336713 100644
--- a/gcc/testsuite/g++.dg/warn/pr30551.C
+++ b/gcc/testsuite/g++.dg/warn/pr30551.C
@@ -2,5 +2,5 @@
 // { dg-do compile }
 // { dg-options "" }
 // { dg-skip-if "-Wmain not enabled on SPU" { spu-*-* } } 
-int main(char a) {} /* { dg-warning "first argument of .*main.* should be .int." } */
-/* { dg-warning "main.* takes only zero or two arguments" "" { target *-*-* } 5 } */ 
+int main(char a) {} /* { dg-warning "first argument of .*main.* should be .int." "int" } */
+/* { dg-warning "main.* takes only zero or two arguments" "zero or two" { target *-*-* } 5 } */ 
diff --git a/gcc/testsuite/g++.old-deja/g++.other/typename1.C b/gcc/testsuite/g++.old-deja/g++.other/typename1.C
index 4bf3de3..a5cbad4 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/typename1.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/typename1.C
@@ -13,5 +13,5 @@ public:
 template<class T>
 void f()
 {
-  Vector<T>::iterator i = 0; // { dg-error "typename" } missing typename
-} // { dg-error "expected" "" { target *-*-* } 16 }
+  Vector<T>::iterator i = 0; // { dg-error "typename" "typename" } missing typename
+} // { dg-error "expected" "expected" { target *-*-* } 16 }
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/niklas01a.C b/gcc/testsuite/g++.old-deja/g++.pt/niklas01a.C
index eec11ab..8476514 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/niklas01a.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/niklas01a.C
@@ -2,8 +2,8 @@
 // { dg-options "-fshow-column" }
 
 struct A { // { dg-error "" } forward declaration
-  friend struct B : A {		// { dg-error "invalid use of incomplete type 'struct A" }
+  friend struct B : A {		// { dg-error "invalid use of incomplete type 'struct A" "invalid" }
     int x;
-  };	// { dg-error "class definition may not be declared a friend" ""  { target *-*-* } { 5 } }
+  };	// { dg-error "class definition may not be declared a friend" "may not"  { target *-*-* } { 5 } }
   int y;
 };