10 files changed, 35 insertions, 37 deletions
diff --git a/gcc/testsuite/g++.old-deja/g++.law/arm12.C b/gcc/testsuite/g++.old-deja/g++.law/arm12.C
index b098c22d58a..c0332d36733 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/arm12.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/arm12.C
@@ -22,8 +22,8 @@ public:
   Y();
 };
 
-X::X()
-{// { dg-error "" } .*
+X::X() // { dg-error "is private" }
+{
   std::cout << "X::X()" << std::endl;
 }
 
@@ -32,8 +32,8 @@ void X::f()
   std::cout << "X::f()" << std::endl;
 }
 
-Y::Y()
-{// { dg-error "" }  within this
+Y::Y() // { dg-error "within this context" }
+{
   std::cout << "Y::Y()" << std::endl;
 }
 
diff --git a/gcc/testsuite/g++.old-deja/g++.law/ctors5.C b/gcc/testsuite/g++.old-deja/g++.law/ctors5.C
index 7078013fe77..d08805a36aa 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/ctors5.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/ctors5.C
@@ -5,7 +5,7 @@
 // Date: Tue, 1 Sep 92 10:38:44 EDT
 
 class X
-{ // { dg-error "" } candidate
+{ // { dg-error "X::X" } implicit constructor
   private:
     int x;
   public:
@@ -20,14 +20,14 @@ class Y
   public:
     Y();
 }
-X::X( int xi )
-{// { dg-error "" }  return.*
+X::X( int xi ) // { dg-error "return type|X::X" }
+{
     x = xi;
 }
 
 const X X::x0( 0 );
 
-Y::Y()
-{// { dg-error "" }  no mat
+Y::Y() // { dg-error "no match" }
+{
     xx = X::x0;
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.law/cvt20.C b/gcc/testsuite/g++.old-deja/g++.law/cvt20.C
index 9235fb5b0ea..5d699d7f857 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/cvt20.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/cvt20.C
@@ -9,12 +9,12 @@
 
 // Compiles fine with Sun CC 2.1
 
-void f(char *& x)
-{// { dg-error "" } location of error
+void f(char *& x) // { dg-error "passing argument" }
+{
   x++;
 }
 
 int main()
 {
-  f ("foo");// { dg-error "" } init of non-const ref from char*
+  f ("foo"); // { dg-error "invalid initialization" }
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.law/enum8.C b/gcc/testsuite/g++.old-deja/g++.law/enum8.C
deleted file mode 100644
index e18284458eb..00000000000
--- a/gcc/testsuite/g++.old-deja/g++.law/enum8.C
+++ /dev/null
@@ -1,4 +0,0 @@
-// { dg-do assemble  }
-// { dg-options "-fshort-enums" }
-// GROUPS passed enums
-  enum E { A = 0x80000000 };
diff --git a/gcc/testsuite/g++.old-deja/g++.law/init10.C b/gcc/testsuite/g++.old-deja/g++.law/init10.C
index 4298bb99017..4d567fecf7d 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/init10.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/init10.C
@@ -20,7 +20,7 @@ public:
         b();
 };
 
-b::b() : three(this)
-{ // { dg-error "" } bad array initializer
+b::b() : three(this)  // { dg-error "bad array initializer" }
+{
 }
 
diff --git a/gcc/testsuite/g++.old-deja/g++.law/init8.C b/gcc/testsuite/g++.old-deja/g++.law/init8.C
index 0ccf4512ee0..ba8dde2e8be 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/init8.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/init8.C
@@ -8,15 +8,15 @@
 
 
 const int ic = 1;
-void f(int& arg)
-{ // { dg-error "" } argument 1
+void f(int& arg)  // { dg-error "passing argument 1" }
+{
         if (arg) ;
 }
 const int& icr = ic;
 
 int main(void)
 {
-  f(icr);   // g++ does not give error here// { dg-error "" } .*
+  f(icr);   // { dg-error "invalid initialization" }
 
   return 0;
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.law/profile1.C b/gcc/testsuite/g++.old-deja/g++.law/profile1.C
index 24a79b438a6..56c52d1ef9a 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/profile1.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/profile1.C
@@ -1,6 +1,8 @@
-// { dg-do run { xfail m68k-motorola-sysv m88k-motorola-sysv3 mips*-*-* i[3456]86-*-sco3.2v5* } }
+// { dg-do run { xfail i[3456]86-*-sco3.2v5* } }
+// { dg-require-profiling "-pg" }
 // { dg-options "-pg" }
 // { dg-options "-pg -static" { target hppa*-*-hpux* } }
+// { dg-bogus "\[Uu\]nresolved symbol ._mcount" "Profiling unsupported" { xfail *-*-netware* } 0 }
 // GROUPS passed profiling
 #include <stdio.h>
 main()
diff --git a/gcc/testsuite/g++.old-deja/g++.law/visibility17.C b/gcc/testsuite/g++.old-deja/g++.law/visibility17.C
index 0afb04b184e..67ef8927a63 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/visibility17.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/visibility17.C
@@ -31,24 +31,24 @@ private:
   int num_;
 };
 
-Base::Base()
-{ // { dg-error "" } private
+Base::Base() // { dg-error "is private" }
+{
   name_ = std::strcpy(new char[std::strlen(" ") + 1], " ");
 }
 
-Base::Base(char* str)
-{ // { dg-error "" } private
+Base::Base(char* str) // { dg-error "is private" }
+{
   if(str != NULL)
     name_ = std::strcpy(new char[std::strlen(str) + 1], str);
 }
 
-Derived::Derived(int n, char* str) : Base(str)
-{// { dg-error "" } .*
+Derived::Derived(int n, char* str) : Base(str) // { dg-error "within this context" }
+{
   num_ = n;
 }
 
-Derived::Derived(int n) : Base()
-{// { dg-error "" } .*
+Derived::Derived(int n) : Base() // { dg-error "within this context" }
+{
   num_ = n;
 }
 
diff --git a/gcc/testsuite/g++.old-deja/g++.law/visibility28.C b/gcc/testsuite/g++.old-deja/g++.law/visibility28.C
index b1458e5955a..a7141ae5ea7 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/visibility28.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/visibility28.C
@@ -11,7 +11,7 @@ public:
 class D : public B {
 public:
         virtual ~D() { printf( "D::~D\n"); }
-  void operator = ( int i) { this->~B(); }// { dg-error "" } D has no ~B part to it
+  void operator = ( int i) { this->~B(); }
 };
 
 int
diff --git a/gcc/testsuite/g++.old-deja/g++.law/visibility7.C b/gcc/testsuite/g++.old-deja/g++.law/visibility7.C
index f271fbc768b..ed37f5f8d2b 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/visibility7.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/visibility7.C
@@ -15,10 +15,10 @@ class A {
     {}
   virtual ~A()
     {}
-  virtual void Number(int c)
-    { number = c; } // { dg-error "" } private
-  virtual int Number()
-    { return number; } // { dg-error "" } private
+  virtual void Number(int c) // { dg-error "inaccessible" }
+    { number = c; }
+  virtual int Number() // { dg-error "inaccessible" }
+    { return number; }
 };
 
 class B : private A {
@@ -53,9 +53,9 @@ class C {
   // and they should not be able to do so
   //
   virtual void setBValue(int i) 
-    { if (bobject) bobject->Number(i); }// { dg-error "" } .*
+    { if (bobject) bobject->Number(i); } // { dg-error "this context|accessible base" }
   virtual int getBValue()
-    { if (bobject) { return bobject->Number(); } return 0; }// { dg-error "" } .*
+    { if (bobject) { return bobject->Number(); } return 0; } // { dg-error "this context|accessible base" }
 };