diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 39f05ba8e33..23519e156c2 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2006-10-30  Dirk Mueller  <dmueller@suse.de>
+
+	* g++.old-deja/g++.pt/eichin01a.C (main): Fix prototype.
+	* g++.old-deja/g++.pt/eichin01b.C (main): Same.
+	* g++.old-deja/g++.pt/eichin01.C (main): Same.
+	* g++.old-deja/g++.mike/net25.C (main): Same.
+	* g++.dg/lookup/exception1.C (main): Same.
+	* g++.dg/parse/parens2.C (main): Same.
+
 2006-10-30  Roger Sayle  <roger@eyesopen.com>
 
 	* gcc.target/i386/pr27827.c: Explicitly specify -mfpmath=387.
diff --git a/gcc/testsuite/g++.dg/lookup/exception1.C b/gcc/testsuite/g++.dg/lookup/exception1.C
index e7a5ca1744b..d99d1c1f76c 100644
--- a/gcc/testsuite/g++.dg/lookup/exception1.C
+++ b/gcc/testsuite/g++.dg/lookup/exception1.C
@@ -28,6 +28,6 @@ ns::Test::Test( int n ) throw( Exception ) : i( n )
 {
 }
 
-int main(int argc, char* argv) {
+int main(int argc, char* argv[]) {
   ns::Test test;
 }
diff --git a/gcc/testsuite/g++.dg/parse/parens2.C b/gcc/testsuite/g++.dg/parse/parens2.C
index 416af0ee048..636dd8df336 100644
--- a/gcc/testsuite/g++.dg/parse/parens2.C
+++ b/gcc/testsuite/g++.dg/parse/parens2.C
@@ -1,6 +1,6 @@
 /* PR c++/8842. */
 /* { dg-do compile } */
-int main( int argc, char* argv )
+int main( int argc, char* argv[] )
 {
     int i = 5;
     // This always worked:
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/net25.C b/gcc/testsuite/g++.old-deja/g++.mike/net25.C
index 6e7dade3f06..57b66eafad1 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/net25.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/net25.C
@@ -10,7 +10,7 @@ void shake_one()
 
 void (*foo)();
 
-int main(int a)
+int main(int a, char** /*argv*/)
 {
   foo = a ? shake_zero : shake_one;
   return 0;
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/eichin01.C b/gcc/testsuite/g++.old-deja/g++.pt/eichin01.C
index bc3806534a0..435fecd6472 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/eichin01.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/eichin01.C
@@ -20,7 +20,7 @@ template <> long TC<long>::sss = 0;
 
 TC<long> xjj(1,2);
 
-int main(int,char*) {
+int main(int,char**) {
   TC<float> xff(9.9,3.14);
   xjj.sz(123);
   xff.sz(2.71828);
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/eichin01a.C b/gcc/testsuite/g++.old-deja/g++.pt/eichin01a.C
index d1b0c2236da..de9b1ba4a15 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/eichin01a.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/eichin01a.C
@@ -14,7 +14,7 @@ template <> float TC<float>::sss = 0.0;
 
 TC<long> xjj(1,2);
 
-int main(int,char*) {
+int main(int,char**) {
   TC<float> xff(9.9,3.14);
   xjj.sz(123);
   xff.sz(2.71828);
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/eichin01b.C b/gcc/testsuite/g++.old-deja/g++.pt/eichin01b.C
index 8639575bc53..79902de6993 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/eichin01b.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/eichin01b.C
@@ -14,7 +14,7 @@ template <> float TC<float>::sss = 0.0;
 
 TC<long> xjj(1,2);
 
-int main(int,char*) {
+int main(int,char**) {
   TC<float> xff(9.9,3.14);
   xjj.sz(123);
   xff.sz(2.71828);