From 786a48dd970b9fb5825bd092278989b0cecacbc7 Mon Sep 17 00:00:00 2001
From: Mark Mitchell <mark@codesourcery.com>
Date: Mon, 16 Jun 2003 19:12:15 +0000
Subject: [PATCH] gcc-dg.exp (dg-xfail-if): Fix thinko.

	* lib/gcc-dg.exp (dg-xfail-if): Fix thinko.
	* gcc.c-torture/compile/simd-5.c: Remove spurious PowerPC-64 XFAIL
	indications.

From-SVN: r68034
---
 gcc/testsuite/ChangeLog                      |  5 +++--
 gcc/testsuite/gcc.c-torture/compile/simd-5.c | 11 +++++------
 gcc/testsuite/lib/gcc-dg.exp                 |  4 +++-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 778351adf9cb..0d714dd57ec0 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,7 +1,8 @@
 2003-06-16  Mark Mitchell  <mark@codesourcery.com>
 
-	* gcc.c-torture/compile/simd-5.c: Correct SPARC XFAIL indications.
-	Remove spurious PowerPC-64 XFAIL indications.
+	* lib/gcc-dg.exp (dg-xfail-if): Fix thinko.
+	* gcc.c-torture/compile/simd-5.c: Remove spurious PowerPC-64 XFAIL
+	indications.
 
 2003-06-16  Roger Sayle  <roger@eyesopen.com>
 
diff --git a/gcc/testsuite/gcc.c-torture/compile/simd-5.c b/gcc/testsuite/gcc.c-torture/compile/simd-5.c
index 15748069c058..6907fa5e66ac 100644
--- a/gcc/testsuite/gcc.c-torture/compile/simd-5.c
+++ b/gcc/testsuite/gcc.c-torture/compile/simd-5.c
@@ -1,10 +1,9 @@
-/* On SPARC64/SPARC-V9 it fails, except with -m32.  On regular SPARC
-   it doesn't fail, except with -m64.  In other words, this test fails
-   on 64-bit SPARC.  Unfortunately, there's no way to encode that
-   information in the dg framework, so the test will XPASS on 32-bit
-   SPARC.  */
 /* h8300 does not have long long */
-/* { dg-excess-errors "PR target/9200" { xfail "sparc*-*-*" "h8300-*-*" } } */
+/* { dg-do assemble { xfail h8300-*-* } } */
+/* On SPARC64/SPARC-V9 it fails, except with -m32. */
+/* { dg-xfail-if "PR target/9200" { "sparc64-*-*" "sparcv9-*-*" } { "*" } { "-m32" } } */
+/* On regular SPARC it doesn't fail, except with -m64. */
+/* { dg-xfail-if "PR target/9200" { "sparc*-*-*" } { "-m64" } { "" } } */
 
 #define vector64 __attribute__((vector_size(8)))
 
diff --git a/gcc/testsuite/lib/gcc-dg.exp b/gcc/testsuite/lib/gcc-dg.exp
index 69cf6fb23798..db616d8567f4 100644
--- a/gcc/testsuite/lib/gcc-dg.exp
+++ b/gcc/testsuite/lib/gcc-dg.exp
@@ -315,7 +315,9 @@ proc dg-require-dll { args } {
 # Like check_conditional_xfail, but callable from a dg test.
 
 proc dg-xfail-if { args } {
-    eval check_conditional_xfail $args
+    set args [lreplace $args 0 0]
+    global compiler_conditional_xfail_data
+    set compiler_conditional_xfail_data $args
 }
 
 
-- 
GitLab