5 files changed, 13 insertions, 12 deletions
diff --git a/gcc/testsuite/g++.old-deja/g++.other/anon4.C b/gcc/testsuite/g++.old-deja/g++.other/anon4.C
index 2a01be3d0aa..b6cb3006d71 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/anon4.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/anon4.C
@@ -10,7 +10,7 @@
 struct A
 {
   union
-  {  // { dg-error "" } anon union cannot have member fns
-    void bad();
+  {
+    void bad(); // { dg-error "can only have non-static data" }
   };
 };
diff --git a/gcc/testsuite/g++.old-deja/g++.other/crash25.C b/gcc/testsuite/g++.old-deja/g++.other/crash25.C
index 5b313db1a8d..0611286fdc3 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/crash25.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/crash25.C
@@ -9,7 +9,8 @@ public:
   virtual ~X();
 }
 
-X::x()	// { dg-error "6:no 'X X::x\\(\\)' member function declared in class 'X'" }
+X::x()	// { dg-error "1:no declaration matches" }
+// { dg-message "1:no functions named" "note" { target *-*-* } .-1 }
 {
 }
 
diff --git a/gcc/testsuite/g++.old-deja/g++.other/dtor4.C b/gcc/testsuite/g++.old-deja/g++.other/dtor4.C
index a4db38ba707..b7ae3706864 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/dtor4.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/dtor4.C
@@ -1,10 +1,10 @@
 // { dg-do assemble  }
 
-struct S1 {
-  ~S1(); // { dg-error "" } candidate
+struct S1 { // { dg-message "defined here" }
+  ~S1(); // { dg-message "candidate" }
 };
 
-S1::~S1() const // { dg-error "" } prototype does not match 
+S1::~S1() const // { dg-error "no declaration matches" }
 {
 }
 
@@ -15,12 +15,12 @@ struct S2 {
 
 
 template <class T>
-struct S3 {
-  ~S3(); // { dg-error "" } candidate
+struct S3 { // { dg-message "defined here" }
+  ~S3(); // { dg-message "candidate" }
 };
 
 template <class T>
-S3<T>::~S3() volatile  // { dg-error "" } prototype does not match 
+S3<T>::~S3() volatile  // { dg-error "no declaration matches" }
 {
 }
 
diff --git a/gcc/testsuite/g++.old-deja/g++.other/redecl2.C b/gcc/testsuite/g++.old-deja/g++.other/redecl2.C
index 0d6ccf669f0..2da0b4f9978 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/redecl2.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/redecl2.C
@@ -1,9 +1,9 @@
 // { dg-do assemble  }
 
 struct S {
-  S(int); // { dg-error "with" }
+  S(int); // { dg-message "previous" }
   S(int); // { dg-error "overloaded" } already declared
 
-  ~S();// { dg-error "with" }
+  ~S();// { dg-message "previous" }
   ~S(); // { dg-error "overloaded" } already declared
 };
diff --git a/gcc/testsuite/g++.old-deja/g++.other/redecl4.C b/gcc/testsuite/g++.old-deja/g++.other/redecl4.C
index e3355dafc41..c2303575dfc 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/redecl4.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/redecl4.C
@@ -1,7 +1,7 @@
 // { dg-do assemble  }
 int main() {
   struct A {
-    void f();			// { dg-error "with" } already declared
+    void f();			// { dg-message "previous" } already declared
     void f();			// { dg-error "overloaded" } already declared
   };
 }