diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 94bde48263502fdbefe544548c32fe3acd60ffbc..2282f0f37087e8aa320ba3fc85c2a20823421bdf 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2008-08-15  Manuel Lopez-Ibanez  <manu@gcc.gnu.org>
+
+	* gcc.dg/pr30551-6.c: Skip for SPU.
+	* gcc.dg/pr30551-3.c: Likewise.
+	* gcc.dg/pr30551.c: Likewise.
+	* g++.dg/warn/pr30551-2.C: Likewise.
+	* g++.dg/warn/pr30551.C: Likewise.
+	
 2008-08-14  Janus Weil  <janus@gcc.gnu.org>
 
 	PR fortran/36705
diff --git a/gcc/testsuite/g++.dg/warn/pr30551-2.C b/gcc/testsuite/g++.dg/warn/pr30551-2.C
index 7a4b136579d8adc85f3879ea854dbdf0572ce8c4..911449d7a0f712c40c2a02e2bd00bbbbdc72cde9 100644
--- a/gcc/testsuite/g++.dg/warn/pr30551-2.C
+++ b/gcc/testsuite/g++.dg/warn/pr30551-2.C
@@ -1,6 +1,6 @@
 // PR 30551 -Wmain is enabled by -pedantic/-pedantic-errors.
 // { dg-do compile }
 // { dg-options "-pedantic-errors" }
-
+// { dg-skip-if "-Wmain not enabled with -pedantic on SPU" { spu-*-* } } 
 int main(char a) {} /* { dg-error "error: first argument of .*main.* should be .int." } */
 /* { dg-error "error: .*main.* takes only zero or two arguments" "" { target *-*-* } 5 } */ 
diff --git a/gcc/testsuite/g++.dg/warn/pr30551.C b/gcc/testsuite/g++.dg/warn/pr30551.C
index ed9248744db6fc70b8d17d094c9cc232e80c9adb..e9144d5984f58d37b7897af101e82cc6a5171751 100644
--- a/gcc/testsuite/g++.dg/warn/pr30551.C
+++ b/gcc/testsuite/g++.dg/warn/pr30551.C
@@ -1,6 +1,6 @@
 // PR 30551 -Wmain is enabled by default.
 // { dg-do compile }
 // { dg-options "" }
-
+// { dg-skip-if "-Wmain not enabled on SPU" { spu-*-* } } 
 int main(char a) {} /* { dg-warning "warning: first argument of .*main.* should be .int." } */
 /* { dg-warning "warning: .*main.* takes only zero or two arguments" "" { target *-*-* } 5 } */ 
diff --git a/gcc/testsuite/gcc.dg/pr30551-3.c b/gcc/testsuite/gcc.dg/pr30551-3.c
index 120d45b8393bbba12c2ecdee873c2e314e18cc74..bc33187e50b677075cbda7fde0da8faeb95c9396 100644
--- a/gcc/testsuite/gcc.dg/pr30551-3.c
+++ b/gcc/testsuite/gcc.dg/pr30551-3.c
@@ -1,7 +1,7 @@
 /* PR 30551 -Wmain is enabled by -pedantic-errors. */
 /* { dg-do compile } */
 /* { dg-options "-pedantic-errors" } */
-
+/* { dg-skip-if "-Wmain not enabled with -pedantic on SPU" { spu-*-* } } */
 void main(char a) {} /* { dg-error "first argument of .main. should be .int." } */
 /* { dg-error ".main. takes only zero or two arguments" "" { target *-*-* } 5 } */ 
 /* { dg-error "return type of .main. is not .int." "" { target *-*-* } 5 } */ 
diff --git a/gcc/testsuite/gcc.dg/pr30551-6.c b/gcc/testsuite/gcc.dg/pr30551-6.c
index 9c33cd143ddab98f410020bad41c2f74e3ddb66c..48824e3a9d08923a6ef5659bffb2f17017376ec0 100644
--- a/gcc/testsuite/gcc.dg/pr30551-6.c
+++ b/gcc/testsuite/gcc.dg/pr30551-6.c
@@ -1,7 +1,7 @@
 /* PR 30551 -Wmain is enabled by -pedantic. */
 /* { dg-do compile } */
 /* { dg-options "-pedantic" } */
-
+/* { dg-skip-if "-Wmain not enabled with -pedantic on SPU" { spu-*-* } } */
 void main(char a) {} /* { dg-warning "first argument of .main. should be .int." } */
 /* { dg-warning ".main. takes only zero or two arguments" "" { target *-*-* } 5 } */ 
 /* { dg-warning "return type of .main. is not .int." "" { target *-*-* } 5 } */ 
diff --git a/gcc/testsuite/gcc.dg/pr30551.c b/gcc/testsuite/gcc.dg/pr30551.c
index d6fdd8fab46e7568ecf8525bf6e1829ed1a6dd53..218a50ad9c62b7985e495ee2ed5b0f9f09af3909 100644
--- a/gcc/testsuite/gcc.dg/pr30551.c
+++ b/gcc/testsuite/gcc.dg/pr30551.c
@@ -1,7 +1,7 @@
 /* PR 30551 -Wmain is enabled by -Wall.  */
 /* { dg-do compile } */
 /* { dg-options "-Wall" } */
-
+/* { dg-skip-if "-Wmain not enabled with -Wall on SPU" { spu-*-* } } */
 void main(char a) {} /* { dg-warning "first argument of .main. should be .int." } */
 /* { dg-warning ".main. takes only zero or two arguments" "" { target *-*-* } 5 } */ 
 /* { dg-warning "return type of .main. is not .int." "" { target *-*-* } 5 } */