diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ffa9d6b1d69..a79cda5bb2f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2004-02-08  Eric Botcazou  <ebotcazou@libertysurf.fr>
+
+	* gcc.c-torture/execute/va-arg-25.x: XFAIL only on SPARC 64-bit.
+
 2004-02-07  Zack Weinberg  <zack@codesourcery.com>
 
 	Bug 13856
diff --git a/gcc/testsuite/gcc.c-torture/execute/va-arg-25.x b/gcc/testsuite/gcc.c-torture/execute/va-arg-25.x
index 1658fbcc8ca..ff301be355a 100644
--- a/gcc/testsuite/gcc.c-torture/execute/va-arg-25.x
+++ b/gcc/testsuite/gcc.c-torture/execute/va-arg-25.x
@@ -1,12 +1,24 @@
-# This doesn't work on sparc*-*-*.
+# This doesn't work on SPARC 64-bit.
 
-set torture_eval_before_compile {
-    global compiler_conditional_xfail_data
-    set compiler_conditional_xfail_data {
-      "PR target/12916" \
-      { "sparc*-*-*" } \
-      { "*" } \
-      { "" }
+if { [istarget "sparc64-*-*"] || [istarget "sparcv9-*-*"] } {
+    set torture_eval_before_compile {
+        global compiler_conditional_xfail_data
+        set compiler_conditional_xfail_data {
+            "PR target/12916" \
+            { "*-*-*" } \
+            { "*" } \
+            { "-m32" }
+        }
+    }
+} elseif { [istarget "sparc-*-*"] } {
+    set torture_eval_before_compile {
+        global compiler_conditional_xfail_data
+        set compiler_conditional_xfail_data {
+             "PR target/12916" \
+            { "*-*-*" } \
+            { "-m64" } \
+            { "" }
+        }
     }
 }