diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f66e01ec6bf8d0ac1ffb0ec91705cb8930acb181..1d85049d453aaa4ab5c50d25c3781ee1b6afdf7f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2004-03-22  Eric Botcazou  <ebotcazou@libertysurf.fr>
+
+	* gcc.dg/ulstrasp2.c: Do not pass -m64.  Remove redundant lines.
+	* gcc.dg/ultrasp4.c: Likewise.
+	* gcc.dg/ultrasp8.c: Do not pass -m64.  Add sparcv9-*-*.
+
 2004-03-21  Ulrich Weigand  <uweigand@de.ibm.com>
 
 	* gcc.dg/i386-sse-8.c: Reset default options.
diff --git a/gcc/testsuite/gcc.dg/ultrasp2.c b/gcc/testsuite/gcc.dg/ultrasp2.c
index 1b8e5827a293552c0911ee2a365c306c5079dfff..1fd821c34e8adc4760fd8cb1469d9af0d320c176 100644
--- a/gcc/testsuite/gcc.dg/ultrasp2.c
+++ b/gcc/testsuite/gcc.dg/ultrasp2.c
@@ -4,10 +4,7 @@
 
 /* { dg-do compile } */
 /* { dg-options "" } */
-/* { dg-options "-O0 -m64" { target sparc64-*-* } } */
-/* { dg-options "-O0 -m64" { target sparcv9-*-* } } */
-/* { dg-options "" { target sparc-*-solaris2.[0-6] } } */
-/* { dg-options "" { target sparc-*-solaris2.[0-6].* } } */
+/* { dg-options "-O0" { target sparc64-*-* sparcv9-*-* } } */
 
 short foo() {
   short i = (short)(1<<15);
diff --git a/gcc/testsuite/gcc.dg/ultrasp4.c b/gcc/testsuite/gcc.dg/ultrasp4.c
index b421688f004e3096734cc871162e44e9666f03c0..6cd08b23d712582762214cd82d1f613373b6c0b8 100644
--- a/gcc/testsuite/gcc.dg/ultrasp4.c
+++ b/gcc/testsuite/gcc.dg/ultrasp4.c
@@ -1,10 +1,7 @@
 /* Simplified from PR target/5309.  */
 /* { dg-do compile } */
 /* { dg-options "-O2" } */
-/* { dg-options "-O2 -m64 -mcpu=ultrasparc" { target sparc64-*-* } } */
-/* { dg-options "-O2 -m64 -mcpu=ultrasparc" { target sparcv9-*-* } } */
-/* { dg-options "-O2" { target sparc-*-solaris2.[0-6] } } */
-/* { dg-options "-O2" { target sparc-*-solaris2.[0-6].* } } */
+/* { dg-options "-O2 -mcpu=ultrasparc" { target sparc64-*-* sparcv9-*-* } } */
 
 long bar (unsigned int);
 long foo (long x, unsigned int y)
diff --git a/gcc/testsuite/gcc.dg/ultrasp8.c b/gcc/testsuite/gcc.dg/ultrasp8.c
index 068b5cae2de716e3aeb073fde38abe9d6bed4d1b..f9289fae0ea551aa8e5f11fae72ddd9a772e943d 100644
--- a/gcc/testsuite/gcc.dg/ultrasp8.c
+++ b/gcc/testsuite/gcc.dg/ultrasp8.c
@@ -1,7 +1,7 @@
 /* PR target/10067 */
 /* Originator: <dat94ali@ludat.lth.se> */
 /* { dg-do compile { target sparc*-*-* } } */
-/* { dg-options "-O2 -m64 -mtune=supersparc" { target sparc64-*-* } } */
+/* { dg-options "-O2 -mtune=supersparc" { target sparc64-*-* sparcv9-*-* } } */
 
 struct _reent;