diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c6a053315da..4da105cbb99 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2000-07-06  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* g++.old-deja/g++.mike/thunk2.C: Add return 0.
+	* g++.old-deja/g++.mike/thunk3.C: Likewise.
+	* g++.old-deja/g++.other/rtti3.C: Likewise.
+	* g++.old-deja/g++.other/rttid3.C: Likewise.
+
 2000-06-30  David Billinghurst  <David Billinghurst@riotinto.com.au>
 
 	*  g77.f-torture/compile/20000630-1.x: Fix typo
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/thunk2.C b/gcc/testsuite/g++.old-deja/g++.mike/thunk2.C
index 9bc4558d9f7..36b9659fa41 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/thunk2.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/thunk2.C
@@ -14,6 +14,7 @@ public:
   virtual int foo() {
     if (++state != 2)
       fail = 1;
+    return 0;
   }
   virtual ~A() {
     if (++state != 3)
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/thunk3.C b/gcc/testsuite/g++.old-deja/g++.mike/thunk3.C
index 9a52c9d6916..3e97aacd6ba 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/thunk3.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/thunk3.C
@@ -12,6 +12,7 @@ public:
   virtual int foo() {
     if (++state != 2)
       fail = 1;
+    return 0;
   }
   virtual ~A() {
     if (++state != 3)
diff --git a/gcc/testsuite/g++.old-deja/g++.other/rtti3.C b/gcc/testsuite/g++.old-deja/g++.other/rtti3.C
index fdb1f9e090d..70f227bfbce 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/rtti3.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/rtti3.C
@@ -12,7 +12,7 @@ extern "C" {
 class X {
  public:
   int xi;
-  virtual int f() {};
+  virtual int f() {return 0;};
 };
 
 class Y : public X {
@@ -32,13 +32,13 @@ Z *zp = &z;
 class A {
  public:
   int Ai;
-  virtual int a() {};
+  virtual int a() {return 0;};
 };
 
 class B {
  public:
   int Bi;
-  virtual int g() {};
+  virtual int g() {return 0;};
 };
 
 class D : public A, public B {
diff --git a/gcc/testsuite/g++.old-deja/g++.other/rttid3.C b/gcc/testsuite/g++.old-deja/g++.other/rttid3.C
index 69b7fc5c38a..80162aa4596 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/rttid3.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/rttid3.C
@@ -13,7 +13,7 @@ extern "C" {
 class X {
  public:
   int xi;
-  virtual int f() {};
+  virtual int f() {return 0;};
 };
 
 class Y : public X {
@@ -33,13 +33,13 @@ Z *zp = &z;
 class A {
  public:
   int Ai;
-  virtual int a() {};
+  virtual int a() {return 0;};
 };
 
 class B {
  public:
   int Bi;
-  virtual int g() {};
+  virtual int g() {return 0;};
 };
 
 class D : public A, public B {