gcc-dg.exp (dg-skip-if): New function.

	* lib/gcc-dg.exp (dg-skip-if): New function.
	(dg-forbid-option): Remove.
	* g++.dg/abi/bitfield3.C: Use dg-skip-if i?86 -m64.
	* g++.dg/abi/bitfield8.C: Likewise.
	* g++.dg/abi/dtor1.C: Likewise.
	* g++.dg/abi/empty10.C: Likewise.
	* g++.dg/abi/empty7.C: Likewise.
	* g++.dg/abi/empty9.C: Likewise.
	* g++.dg/abi/layout3.C: Likewise.
	* g++.dg/abi/layout4.C: Likewise.
	* g++.dg/abi/thunk1.C: Likewise.
	* g++.dg/abi/thunk2.C: Likewise.
	* g++.dg/abi/vbase11.C: Likewise.
	* g++.dg/abi/vthunk2.C: Likewise.
	* g++.dg/abi/vthunk3.C: Likewise.
	* g++.dg/ext/attrib8.C: Likewise.
	* g++.dg/opt/longbranch2.C: Likewise.
	* g++.dg/opt/reg-stack4.C: Likewise.
	* g++.old-deja/g++.ext/attrib1.C: Likewise.
	* g++.old-deja/g++.ext/attrib2.C: Likewise.
	* g++.old-deja/g++.ext/attrib3.C: Likewise.
	* g++.old-deja/g++.other/store-expr1.C: Likewise.
	* g++.old-deja/g++.other/store-expr2.C: Likewise.
	* gcc.dg/20000609-1.c: Likewise.
	* gcc.dg/20000720-1.c: Likewise.
	* gcc.dg/20011107-1.c: Likewise.
	* gcc.dg/20011119-1.c: Likewise.
	* gcc.dg/20020108-1.c: Likewise.
	* gcc.dg/20020122-2.c: Likewise.
	* gcc.dg/20020122-3.c: Likewise.
	* gcc.dg/20020201-3.c: Likewise.
	* gcc.dg/20020206-1.c: Likewise.
	* gcc.dg/20020218-1.c: Likewise.
	* gcc.dg/20020310-1.c: Likewise.
	* gcc.dg/20020411-1.c: Likewise.
	* gcc.dg/20020418-2.c: Likewise.
	* gcc.dg/20020426-1.c: Likewise.
	* gcc.dg/20020426-2.c: Likewise.
	* gcc.dg/20020517-1.c: Likewise.
	* gcc.dg/20020523-1.c: Likewise.
	* gcc.dg/20020523-2.c: Likewise.
	* gcc.dg/20020729-1.c: Likewise.
	* gcc.dg/20030204-1.c: Likewise.
	* gcc.dg/20030826-2.c: Likewise.
	* gcc.dg/20030926-1.c: Likewise.
	* gcc.dg/20031202-1.c: Likewise.
	* gcc.dg/980312-1.c: Likewise.
	* gcc.dg/980313-1.c: Likewise.
	* gcc.dg/990117-1.c: Likewise.
	* gcc.dg/990424-1.c: Likewise.
	* gcc.dg/990524-1.c: Likewise.
	* gcc.dg/991230-1.c: Likewise.
	* gcc.dg/i386-387-1.c: Likewise.
	* gcc.dg/i386-387-2.c: Likewise.
	* gcc.dg/i386-387-3.c: Likewise.
	* gcc.dg/i386-387-4.c: Likewise.
	* gcc.dg/i386-387-5.c: Likewise.
	* gcc.dg/i386-387-6.c: Likewise.
	* gcc.dg/i386-asm-1.c: Likewise.
	* gcc.dg/i386-bitfield1.c: Likewise.
	* gcc.dg/i386-bitfield2.c: Likewise.
	* gcc.dg/i386-loop-1.c: Likewise.
	* gcc.dg/i386-loop-2.c: Likewise.
	* gcc.dg/i386-loop-3.c: Likewise.
	* gcc.dg/i386-pentium4-not-mull.c: Likewise.
	* gcc.dg/i386-pic-1.c: Likewise.
	* gcc.dg/i386-regparm.c: Likewise.
	* gcc.dg/i386-signbit-1.c: Likewise.
	* gcc.dg/i386-signbit-2.c: Likewise.
	* gcc.dg/i386-signbit-3.c: Likewise.
	* gcc.dg/i386-sse-5.c: Likewise.
	* gcc.dg/i386-sse-8.c: Likewise.
	* gcc.dg/i386-unroll-1.c: Likewise.
	* gcc.dg/tls/opt-1.c: Likewise.
	* gcc.dg/tls/opt-2.c: Likewise.
	* gcc.dg/unroll-1.c: Likewise.
	* gcc.misc-tests/i386-pf-3dnow-1.c: Likewise.
	* gcc.misc-tests/i386-pf-athlon-1.c: Likewise.
	* gcc.misc-tests/i386-pf-none-1.c: Likewise.
	* gcc.misc-tests/i386-pf-sse-1.c: Likewise.

From-SVN: r90810

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8093d75806f99872a93cc1a23b840d1efea3541b..56231e466b5ff232dce86c2020110cd4ea7987c7 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,86 @@
+2004-11-17  Janis Johnson  <janis187@us.ibm.com>
+
+       * lib/gcc-dg.exp (dg-skip-if): New function.
+       (dg-forbid-option): Remove.
+       * g++.dg/abi/bitfield3.C: Use dg-skip-if i?86 -m64.
+       * g++.dg/abi/bitfield8.C: Likewise.
+       * g++.dg/abi/dtor1.C: Likewise.
+       * g++.dg/abi/empty10.C: Likewise.
+       * g++.dg/abi/empty7.C: Likewise.
+       * g++.dg/abi/empty9.C: Likewise.
+       * g++.dg/abi/layout3.C: Likewise.
+       * g++.dg/abi/layout4.C: Likewise.
+       * g++.dg/abi/thunk1.C: Likewise.
+       * g++.dg/abi/thunk2.C: Likewise.
+       * g++.dg/abi/vbase11.C: Likewise.
+       * g++.dg/abi/vthunk2.C: Likewise.
+       * g++.dg/abi/vthunk3.C: Likewise.
+       * g++.dg/ext/attrib8.C: Likewise.
+       * g++.dg/opt/longbranch2.C: Likewise.
+       * g++.dg/opt/reg-stack4.C: Likewise.
+       * g++.old-deja/g++.ext/attrib1.C: Likewise.
+       * g++.old-deja/g++.ext/attrib2.C: Likewise.
+       * g++.old-deja/g++.ext/attrib3.C: Likewise.
+       * g++.old-deja/g++.other/store-expr1.C: Likewise.
+       * g++.old-deja/g++.other/store-expr2.C: Likewise.
+       * gcc.dg/20000609-1.c: Likewise.
+       * gcc.dg/20000720-1.c: Likewise.
+       * gcc.dg/20011107-1.c: Likewise.
+       * gcc.dg/20011119-1.c: Likewise.
+       * gcc.dg/20020108-1.c: Likewise.
+       * gcc.dg/20020122-2.c: Likewise.
+       * gcc.dg/20020122-3.c: Likewise.
+       * gcc.dg/20020201-3.c: Likewise.
+       * gcc.dg/20020206-1.c: Likewise.
+       * gcc.dg/20020218-1.c: Likewise.
+       * gcc.dg/20020310-1.c: Likewise.
+       * gcc.dg/20020411-1.c: Likewise.
+       * gcc.dg/20020418-2.c: Likewise.
+       * gcc.dg/20020426-1.c: Likewise.
+       * gcc.dg/20020426-2.c: Likewise.
+       * gcc.dg/20020517-1.c: Likewise.
+       * gcc.dg/20020523-1.c: Likewise.
+       * gcc.dg/20020523-2.c: Likewise.
+       * gcc.dg/20020729-1.c: Likewise.
+       * gcc.dg/20030204-1.c: Likewise.
+       * gcc.dg/20030826-2.c: Likewise.
+       * gcc.dg/20030926-1.c: Likewise.
+       * gcc.dg/20031202-1.c: Likewise.
+       * gcc.dg/980312-1.c: Likewise.
+       * gcc.dg/980313-1.c: Likewise.
+       * gcc.dg/990117-1.c: Likewise.
+       * gcc.dg/990424-1.c: Likewise.
+       * gcc.dg/990524-1.c: Likewise.
+       * gcc.dg/991230-1.c: Likewise.
+       * gcc.dg/i386-387-1.c: Likewise.
+       * gcc.dg/i386-387-2.c: Likewise.
+       * gcc.dg/i386-387-3.c: Likewise.
+       * gcc.dg/i386-387-4.c: Likewise.
+       * gcc.dg/i386-387-5.c: Likewise.
+       * gcc.dg/i386-387-6.c: Likewise.
+       * gcc.dg/i386-asm-1.c: Likewise.
+       * gcc.dg/i386-bitfield1.c: Likewise.
+       * gcc.dg/i386-bitfield2.c: Likewise.
+       * gcc.dg/i386-loop-1.c: Likewise.
+       * gcc.dg/i386-loop-2.c: Likewise.
+       * gcc.dg/i386-loop-3.c: Likewise.
+       * gcc.dg/i386-pentium4-not-mull.c: Likewise.
+       * gcc.dg/i386-pic-1.c: Likewise.
+       * gcc.dg/i386-regparm.c: Likewise.
+       * gcc.dg/i386-signbit-1.c: Likewise.
+       * gcc.dg/i386-signbit-2.c: Likewise.
+       * gcc.dg/i386-signbit-3.c: Likewise.
+       * gcc.dg/i386-sse-5.c: Likewise.
+       * gcc.dg/i386-sse-8.c: Likewise.
+       * gcc.dg/i386-unroll-1.c: Likewise.
+       * gcc.dg/tls/opt-1.c: Likewise.
+       * gcc.dg/tls/opt-2.c: Likewise.
+       * gcc.dg/unroll-1.c: Likewise.
+       * gcc.misc-tests/i386-pf-3dnow-1.c: Likewise.
+       * gcc.misc-tests/i386-pf-athlon-1.c: Likewise.
+       * gcc.misc-tests/i386-pf-none-1.c: Likewise.
+       * gcc.misc-tests/i386-pf-sse-1.c: Likewise.
+
 2004-11-16  Giovanni Bajo  <giovannibajo@gcc.gnu.org>
 
        * g++.dg/template/incomplete1.C: New test.

diff --git a/gcc/testsuite/g++.dg/abi/bitfield3.C b/gcc/testsuite/g++.dg/abi/bitfield3.C
index 5ff310bc7380d03c973df57c2f38adfbaa0b6129..864abc33b8db54e4822d64e48398cb1487df14a3 100644 (file)
--- a/gcc/testsuite/g++.dg/abi/bitfield3.C
+++ b/gcc/testsuite/g++.dg/abi/bitfield3.C
@@ -4,7 +4,7 @@
 // Cygwin and mingw32 default to MASK_ALIGN_DOUBLE. Override to ensure
 // 4-byte alignment.
 // { dg-options "-mno-align-double" { target i?86-*-cygwin* i?86-*-mingw* } }
-// { dg-forbid-option "-m64" }
+// { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } }
 
 struct A
 {

diff --git a/gcc/testsuite/g++.dg/abi/bitfield8.C b/gcc/testsuite/g++.dg/abi/bitfield8.C
index 64ec0f735cbfba135d2a208265dbfe7131b99941..6130ae45739b7d1747c7fc72c906210e9686b0e7 100644 (file)
--- a/gcc/testsuite/g++.dg/abi/bitfield8.C
+++ b/gcc/testsuite/g++.dg/abi/bitfield8.C
@@ -1,6 +1,6 @@
 // { dg-do run { target i?86-*-* } }
 // { dg-options "-fabi-version=0" }
-// { dg-forbid-option "-m64" }
+// { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } }
 
 struct A { 
   virtual void f() {}

diff --git a/gcc/testsuite/g++.dg/abi/dtor1.C b/gcc/testsuite/g++.dg/abi/dtor1.C
index 429b39e098d83d4a0f37c17b6c534b4002087508..9ec44ae752016a601f1b5e883277720832290159 100644 (file)
--- a/gcc/testsuite/g++.dg/abi/dtor1.C
+++ b/gcc/testsuite/g++.dg/abi/dtor1.C
@@ -1,5 +1,5 @@
 // { dg-do compile { target i?86-*-* } }
-// { dg-forbid-option "-m64" }
+// { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } }
 // { dg-options "-fabi-version=0" }
 
 struct A {

diff --git a/gcc/testsuite/g++.dg/abi/empty10.C b/gcc/testsuite/g++.dg/abi/empty10.C
index af2ba9c7e82a8c330bb06f563a361d03a58b94c6..9147e9692f5d32c94bd59ccfb21b950a35aca13a 100644 (file)
--- a/gcc/testsuite/g++.dg/abi/empty10.C
+++ b/gcc/testsuite/g++.dg/abi/empty10.C
@@ -1,5 +1,5 @@
 // { dg-do run { target i?86-*-* } }
-// { dg-forbid-option "-m64" }
+// { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } }
 // { dg-options "-fabi-version=0 -w" }
 
 struct E {};

diff --git a/gcc/testsuite/g++.dg/abi/empty7.C b/gcc/testsuite/g++.dg/abi/empty7.C
index 7cc6510046e8f3a54da7968e307485bf95bdeda1..5ff75e65d97408dcbaddb9dda58e9dfd58b8abe8 100644 (file)
--- a/gcc/testsuite/g++.dg/abi/empty7.C
+++ b/gcc/testsuite/g++.dg/abi/empty7.C
@@ -1,5 +1,5 @@
 // { dg-do run { target i?86-*-* } }
-// { dg-forbid-option "-m64" }
+// { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } }
 // { dg-options "-fabi-version=0" }
 
 struct S1 {};

diff --git a/gcc/testsuite/g++.dg/abi/empty9.C b/gcc/testsuite/g++.dg/abi/empty9.C
index 10ebedfdc3bfc9bf58855a54c8e1cd5450e32629..3c4b71f100fbaf0eedcec00f995c51bdf604d636 100644 (file)
--- a/gcc/testsuite/g++.dg/abi/empty9.C
+++ b/gcc/testsuite/g++.dg/abi/empty9.C
@@ -1,5 +1,5 @@
 // { dg-do run { target i?86-*-* } }
-// { dg-forbid-option "-m64" }
+// { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } }
 // { dg-options "-w -fabi-version=0" }
 
 struct E1 {};

diff --git a/gcc/testsuite/g++.dg/abi/layout3.C b/gcc/testsuite/g++.dg/abi/layout3.C
index a2e94f693a55cdaec1b551a35cadf94323e9231e..121310862db6d59a730a8123750f2107068e2480 100644 (file)
--- a/gcc/testsuite/g++.dg/abi/layout3.C
+++ b/gcc/testsuite/g++.dg/abi/layout3.C
@@ -1,5 +1,5 @@
 // { dg-do run { target i?86-*-* } }
-// { dg-forbid-option "-m64" }
+// { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } }
 // { dg-options "-fabi-version=0 -w" }
 
 struct S {

diff --git a/gcc/testsuite/g++.dg/abi/layout4.C b/gcc/testsuite/g++.dg/abi/layout4.C
index 105c74b95c7fe21bee9ea3627ad62c4fc3aabc3c..13d3648d6f5d7be183e68c9fdb7aef25d4c9bdce 100644 (file)
--- a/gcc/testsuite/g++.dg/abi/layout4.C
+++ b/gcc/testsuite/g++.dg/abi/layout4.C
@@ -1,5 +1,5 @@
 // { dg-do run { target i?86-*-* } }
-// { dg-forbid-option "-m64" }
+// { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } }
 // { dg-options "-fabi-version=1" }
 
 struct C4

diff --git a/gcc/testsuite/g++.dg/abi/thunk1.C b/gcc/testsuite/g++.dg/abi/thunk1.C
index 0ba7ce761020490460a97b4f313c8b719af84d13..5508882359f4d79f75cc1417e4d31665c1687095 100644 (file)
--- a/gcc/testsuite/g++.dg/abi/thunk1.C
+++ b/gcc/testsuite/g++.dg/abi/thunk1.C
@@ -1,5 +1,5 @@
 // { dg-do compile { target i?86-*-* } }
-// { dg-forbid-option "-m64" }
+// { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } }
 
 struct A {
   virtual void f ();

diff --git a/gcc/testsuite/g++.dg/abi/thunk2.C b/gcc/testsuite/g++.dg/abi/thunk2.C
index e6774194e95444bb1c4df759ddbc9132da08cfde..c1f88682df93ca4afffccbc245e5b33447107aff 100644 (file)
--- a/gcc/testsuite/g++.dg/abi/thunk2.C
+++ b/gcc/testsuite/g++.dg/abi/thunk2.C
@@ -1,5 +1,5 @@
 // { dg-do compile { target i?86-*-* } }
-// { dg-forbid-option "-m64" }
+// { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } }
 // { dg-options -w }
 
 struct A {

diff --git a/gcc/testsuite/g++.dg/abi/vbase11.C b/gcc/testsuite/g++.dg/abi/vbase11.C
index 974f56216a8b74dba2a1febab4d2361392f0eb0b..1dcc75647ca2f0dc57581ee8fa2b5373a705cbc1 100644 (file)
--- a/gcc/testsuite/g++.dg/abi/vbase11.C
+++ b/gcc/testsuite/g++.dg/abi/vbase11.C
@@ -1,5 +1,5 @@
 // { dg-do run { target i?86-*-* } }
-// { dg-forbid-option "-m64" }
+// { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } }
 // { dg-options "-fabi-version=0" }
 
 struct A { virtual void f(); char c1; };

diff --git a/gcc/testsuite/g++.dg/abi/vthunk2.C b/gcc/testsuite/g++.dg/abi/vthunk2.C
index 314f5980f7a6b1ea42cf6084bfebae7131aa7d82..698c691cc0a700c54fa333b77d12c17fda861587 100644 (file)
--- a/gcc/testsuite/g++.dg/abi/vthunk2.C
+++ b/gcc/testsuite/g++.dg/abi/vthunk2.C
@@ -1,5 +1,5 @@
 // { dg-do compile { target i?86-*-* } }
-// { dg-forbid-option "-m64" }
+// { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } }
 
 struct c0 {
   virtual void f ();

diff --git a/gcc/testsuite/g++.dg/abi/vthunk3.C b/gcc/testsuite/g++.dg/abi/vthunk3.C
index bc677df1c3d6844d6f1060c30c85045de44f253b..969cd2da84c15817873f7e32d7b3ececd948e352 100644 (file)
--- a/gcc/testsuite/g++.dg/abi/vthunk3.C
+++ b/gcc/testsuite/g++.dg/abi/vthunk3.C
@@ -1,5 +1,5 @@
 // { dg-do compile { target i?86-*-* } }
-// { dg-forbid-option "-m64" }
+// { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } }
 // { dg-options "-fabi-version=0" }
 
 struct A {

diff --git a/gcc/testsuite/g++.dg/ext/attrib8.C b/gcc/testsuite/g++.dg/ext/attrib8.C
index 0b162e32e93c26cb72789547cb9a0e4589c41685..df2d48fecf4642931038ab5ff40fe795243142af 100644 (file)
--- a/gcc/testsuite/g++.dg/ext/attrib8.C
+++ b/gcc/testsuite/g++.dg/ext/attrib8.C
@@ -1,6 +1,6 @@
 // PR 8656
 // { dg-do compile { target i?86-*-* } }
-// { dg-forbid-option "-m64" }
+// { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } }
 
 extern int * (__attribute__((stdcall)) *fooPtr)( void);
 int * __attribute__((stdcall)) myFn01( void) { return 0; }

diff --git a/gcc/testsuite/g++.dg/opt/longbranch2.C b/gcc/testsuite/g++.dg/opt/longbranch2.C
index 2ada1980cf960e1cd01a53a4432fb975350e723f..88594b04ef7d5617eaebeec5bf31d26c8fb7869a 100644 (file)
--- a/gcc/testsuite/g++.dg/opt/longbranch2.C
+++ b/gcc/testsuite/g++.dg/opt/longbranch2.C
@@ -3,7 +3,7 @@
 
 // { dg-do compile }
 // { dg-options "-O3 -funroll-loops -mtune=k6 -fomit-frame-pointer" { target i?86-*-*  } }
-// { dg-forbid-option "-m64" { target i?86-*-* } }
+// { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } }
 
 // This used to fail to assemble because of an out-of-range 'loop' instructions.
 

diff --git a/gcc/testsuite/g++.dg/opt/reg-stack4.C b/gcc/testsuite/g++.dg/opt/reg-stack4.C
index 5db14159bd1ff53ea3c6add6035bd48857976356..9ea77c232303c3478be2623fba32d720df769c83 100644 (file)
--- a/gcc/testsuite/g++.dg/opt/reg-stack4.C
+++ b/gcc/testsuite/g++.dg/opt/reg-stack4.C
@@ -6,7 +6,7 @@
 
 // { dg-do compile }
 // { dg-options "-mtune=i586 -O2" { target i?86-*-* } }
-// { dg-forbid-option "-m64" { target i?86-*-* } }
+// { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } }
 
 struct array {
   double data;

diff --git a/gcc/testsuite/g++.old-deja/g++.ext/attrib1.C b/gcc/testsuite/g++.old-deja/g++.ext/attrib1.C
index 0d66d72ebc6a897cab13fa95e7cf444cdc4115fd..bdc3ade8b745712a7dcf62a3e6d5d3878c8d6963 100644 (file)
--- a/gcc/testsuite/g++.old-deja/g++.ext/attrib1.C
+++ b/gcc/testsuite/g++.old-deja/g++.ext/attrib1.C
@@ -1,5 +1,5 @@
 // { dg-do assemble { target i?86-*-* } }
-// { dg-forbid-option "-m64" }
+// { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } }
 // Test for using prefix attributes in a parameter decl.
 // Contributed by Jason Merrill <jason@cygnus.com>
 

diff --git a/gcc/testsuite/g++.old-deja/g++.ext/attrib2.C b/gcc/testsuite/g++.old-deja/g++.ext/attrib2.C
index abac1b322cff22567bb320367ebd3caf2ae3b8e4..c60ff8231303a720c341ba1a30c7d43759863145 100644 (file)
--- a/gcc/testsuite/g++.old-deja/g++.ext/attrib2.C
+++ b/gcc/testsuite/g++.old-deja/g++.ext/attrib2.C
@@ -1,5 +1,5 @@
 // { dg-do run { target i?86-*-* } }
-// { dg-forbid-option "-m64" }
+// { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } }
 // Test that stdcall doesn't prevent us from using op delete.
 // Contributed by Jason Merrill <jason@cygnus.com>
 

diff --git a/gcc/testsuite/g++.old-deja/g++.ext/attrib3.C b/gcc/testsuite/g++.old-deja/g++.ext/attrib3.C
index f47ab074e453ffe5f7b3a323428c3d84f301aaa1..492cd9d7c491015fe51ad8d95d48157343009928 100644 (file)
--- a/gcc/testsuite/g++.old-deja/g++.ext/attrib3.C
+++ b/gcc/testsuite/g++.old-deja/g++.ext/attrib3.C
@@ -1,5 +1,5 @@
 // { dg-do run { target i?86-*-* } }
-// { dg-forbid-option "-m64" }
+// { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } }
 // Test for proper handling of attributes in template instantiation.
 // Contributed by Jason Merrill <jason@cygnus.com>
 

diff --git a/gcc/testsuite/g++.old-deja/g++.other/store-expr1.C b/gcc/testsuite/g++.old-deja/g++.other/store-expr1.C
index 153c88107032a2ab842cb40faff7dc5d74479f36..49456242b4edbffb6656ab15509329577d7772e7 100644 (file)
--- a/gcc/testsuite/g++.old-deja/g++.other/store-expr1.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/store-expr1.C
@@ -1,5 +1,5 @@
 // { dg-do run { target i?86-*-* } }
-// { dg-forbid-option "-m64" }
+// { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } }
 // { dg-options "-mtune=i686 -O2 -fpic" }
 // { dg-bogus "\[Uu\]nresolved symbol .(_GLOBAL_OFFSET_TABLE_|\[_.A-Za-z\]\[_.0-9A-Za-z\]*@(PLT|GOT|GOTOFF))" "PIC unsupported" { xfail *-*-netware* } 0 }
 class G {};

diff --git a/gcc/testsuite/g++.old-deja/g++.other/store-expr2.C b/gcc/testsuite/g++.old-deja/g++.other/store-expr2.C
index 651f81d8d802659de993f8f44b8fc2e08bcad30a..d35e3b77dfa4a38ad554a1a70e3ab53827dee606 100644 (file)
--- a/gcc/testsuite/g++.old-deja/g++.other/store-expr2.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/store-expr2.C
@@ -1,5 +1,5 @@
 // { dg-do run { target i?86-*-* } }
-// { dg-forbid-option "-m64" }
+// { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } }
 // { dg-options "-mtune=i686 -O2" }
 class G {};
 

diff --git a/gcc/testsuite/gcc.dg/20000609-1.c b/gcc/testsuite/gcc.dg/20000609-1.c
index 2f0f783cfabea85972f85726acffbf32f50a1413..dfa64983ef2f73db65e2a62f4a5ca67c65a46bd3 100644 (file)
--- a/gcc/testsuite/gcc.dg/20000609-1.c
+++ b/gcc/testsuite/gcc.dg/20000609-1.c
@@ -1,6 +1,6 @@
 /* { dg-do run { target i?86-*-* } } */
 /* { dg-options "-O1 -ffast-math -march=i686" } */
-/* { dg-forbid-option "-m64" } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 
 /* Sanity check for fp_jcc_* with TARGET_CMOVE.  */
 

diff --git a/gcc/testsuite/gcc.dg/20000720-1.c b/gcc/testsuite/gcc.dg/20000720-1.c
index dc3fb25b9d8cec1075ee70b0cee00e85754a8db2..89b570d750adc87a3ff7ddbdbc903383f56b5dd0 100644 (file)
--- a/gcc/testsuite/gcc.dg/20000720-1.c
+++ b/gcc/testsuite/gcc.dg/20000720-1.c
@@ -1,5 +1,5 @@
 /* { dg-do compile { target i?86-*-* } } */
-/* { dg-forbid-option "-m64" } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 /* { dg-options "-mpreferred-stack-boundary=2 -march=i586 -O2 -fomit-frame-pointer" } */
 
 extern void *foo(void *a, const void *b, unsigned c);

diff --git a/gcc/testsuite/gcc.dg/20011107-1.c b/gcc/testsuite/gcc.dg/20011107-1.c
index b61de6cb514f07d7012a831434bd51af896d4d85..a53f4f1912e10ce2bb1fa6c161ba3ef4e6916b59 100644 (file)
--- a/gcc/testsuite/gcc.dg/20011107-1.c
+++ b/gcc/testsuite/gcc.dg/20011107-1.c
@@ -1,5 +1,5 @@
 /* { dg-do compile { target i?86-*-* } } */
-/* { dg-forbid-option "-m64" } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 /* { dg-options "-O2 -mtune=k6" } */
 
 void

diff --git a/gcc/testsuite/gcc.dg/20011119-1.c b/gcc/testsuite/gcc.dg/20011119-1.c
index 67525b9aaa70d3890cd5acd46b9e88ac56f8885c..83a9b1cd3f36593bde5ff351451f71bf9df944e9 100644 (file)
--- a/gcc/testsuite/gcc.dg/20011119-1.c
+++ b/gcc/testsuite/gcc.dg/20011119-1.c
@@ -1,6 +1,6 @@
 /* Test for reload failing to eliminate from argp to sp.  */
 /* { dg-do run { target i?86-*-* } } */
-/* { dg-forbid-option "-m64" } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 /* { dg-options "-O2 -fomit-frame-pointer" } */
 
 static int ustrsize (const char *s);

diff --git a/gcc/testsuite/gcc.dg/20020108-1.c b/gcc/testsuite/gcc.dg/20020108-1.c
index 6cabb5027834c9f261fd64d135fec2f5e1d13704..03b97d1fec655276999a3a236650fdc53f8050e1 100644 (file)
--- a/gcc/testsuite/gcc.dg/20020108-1.c
+++ b/gcc/testsuite/gcc.dg/20020108-1.c
@@ -6,7 +6,7 @@
 /* { dg-do compile } */
 /* { dg-options "-O2" } */
 /* { dg-options "-O2 -mtune=i686" { target i?86-*-* } } */
-/* { dg-forbid-option "-m64" { target i?86-*-* } } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 
 void
 foo (unsigned short *cp)

diff --git a/gcc/testsuite/gcc.dg/20020122-2.c b/gcc/testsuite/gcc.dg/20020122-2.c
index d6062b58b34a5b17c32660c974cc8bbbe67a3a9e..de92bd82880c1da80f786aeae0659622b47093e2 100644 (file)
--- a/gcc/testsuite/gcc.dg/20020122-2.c
+++ b/gcc/testsuite/gcc.dg/20020122-2.c
@@ -4,7 +4,7 @@
 /* { dg-do compile } */
 /* { dg-options "-O2 -fprefetch-loop-arrays -w" } */
 /* { dg-options "-O2 -fprefetch-loop-arrays -march=athlon" { target i?86-*-* } } */
-/* { dg-forbid-option "-m64" { target i?86-*-* } } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 
 extern int access( char* );
 extern int a();

diff --git a/gcc/testsuite/gcc.dg/20020122-3.c b/gcc/testsuite/gcc.dg/20020122-3.c
index 77b70353f11be8449b3b74dfc831adaf5c504f63..4aafc4777c95f870e672278430df91d03a82936e 100644 (file)
--- a/gcc/testsuite/gcc.dg/20020122-3.c
+++ b/gcc/testsuite/gcc.dg/20020122-3.c
@@ -5,7 +5,7 @@
 /* { dg-do compile } */
 /* { dg-options "-Os -fprefetch-loop-arrays -w" } */
 /* { dg-options "-Os -fprefetch-loop-arrays -mtune=pentium3 -w" { target i?86-*-* } } */
-/* { dg-forbid-option "-m64" { target i?86-*-* } } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 
 int foo (int *p, int n)
 {

diff --git a/gcc/testsuite/gcc.dg/20020201-3.c b/gcc/testsuite/gcc.dg/20020201-3.c
index 1d93475b0a2c0e2841c07fabb5510542947261b1..66a48022b16e81d3e8a53493033588e95ba6da26 100644 (file)
--- a/gcc/testsuite/gcc.dg/20020201-3.c
+++ b/gcc/testsuite/gcc.dg/20020201-3.c
@@ -1,7 +1,7 @@
 /* This testcase ICEd because a SFmode variable was given a MMX register
    for which there is no movsf exists.  */
 /* { dg-do compile { target i?86-*-* } } */
-/* { dg-forbid-option "-m64" } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 /* { dg-options "-O2 -march=i686 -mmmx -fno-strict-aliasing" } */
 
 struct A { unsigned int a, b; };

diff --git a/gcc/testsuite/gcc.dg/20020206-1.c b/gcc/testsuite/gcc.dg/20020206-1.c
index 643c4394d6516ca3f0d3d95f6b8a1634e894ec5f..1bdb25de166b02e9b0298be6da35b41f3546d4c5 100644 (file)
--- a/gcc/testsuite/gcc.dg/20020206-1.c
+++ b/gcc/testsuite/gcc.dg/20020206-1.c
@@ -5,7 +5,7 @@
 /* { dg-do run } */
 /* { dg-options "-O2 -fprefetch-loop-arrays -w" } */
 /* { dg-options "-O2 -fprefetch-loop-arrays -mtune=pentium3 -w" { target i?86-*-* } } */
-/* { dg-forbid-option "-m64" { target i?86-*-* } } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 
 struct reload
 {

diff --git a/gcc/testsuite/gcc.dg/20020218-1.c b/gcc/testsuite/gcc.dg/20020218-1.c
index eff60de18d98786237b224bc2cccb28fccc1ed83..240c3d7e2ab3ff6340607106130fb49ef80be6e0 100644 (file)
--- a/gcc/testsuite/gcc.dg/20020218-1.c
+++ b/gcc/testsuite/gcc.dg/20020218-1.c
@@ -1,6 +1,6 @@
 /* Verify that X86-64 only SSE registers aren't restored on IA-32.  */
 /* { dg-do compile { target i?86-*-* } } */
-/* { dg-forbid-option "-m64" } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 /* { dg-options "-O2 -msse" } */
 /* { dg-final { scan-assembler-not "xmm8" } } */
 

diff --git a/gcc/testsuite/gcc.dg/20020310-1.c b/gcc/testsuite/gcc.dg/20020310-1.c
index fd3c24ddf285b3efc97dedb473e3285773abea86..6067e190622568b522e27620331f582f935f5dab 100644 (file)
--- a/gcc/testsuite/gcc.dg/20020310-1.c
+++ b/gcc/testsuite/gcc.dg/20020310-1.c
@@ -3,7 +3,7 @@
 /* { dg-do run } */
 /* { dg-options "-O2" } */
 /* { dg-options "-O2 -mtune=i586" { target i?86-*-* } } */
-/* { dg-forbid-option "-m64" { target i?86-*-* } } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 
 struct A
 {

diff --git a/gcc/testsuite/gcc.dg/20020411-1.c b/gcc/testsuite/gcc.dg/20020411-1.c
index d78608d111d860e0c8de16c85920b86f5309b12e..0413ed9b56bb57c1bbf3a1fa256645d16d127155 100644 (file)
--- a/gcc/testsuite/gcc.dg/20020411-1.c
+++ b/gcc/testsuite/gcc.dg/20020411-1.c
@@ -4,7 +4,7 @@
 /* { dg-do compile } */
 /* { dg-options "-O2" } */
 /* { dg-options "-O2 -march=i686" { target i?86-*-* } } */
-/* { dg-forbid-option "-m64" { target i?86-*-* } } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 
 #if __INT_MAX__ > 32767
 

diff --git a/gcc/testsuite/gcc.dg/20020418-2.c b/gcc/testsuite/gcc.dg/20020418-2.c
index e3066c95b4721e44e55581a30c6da2b868b124db..8a15b2644f53794e9e1cf220ad03818f1d37a2e9 100644 (file)
--- a/gcc/testsuite/gcc.dg/20020418-2.c
+++ b/gcc/testsuite/gcc.dg/20020418-2.c
@@ -2,7 +2,7 @@
 /* { dg-do compile } */
 /* { dg-options "-O2 -funroll-all-loops" } */
 /* { dg-options "-O2 -funroll-all-loops -march=pentium3" { target i?86-*-* } } */
-/* { dg-forbid-option "-m64" { target i?86-*-* } } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 
 void bar (float);
 

diff --git a/gcc/testsuite/gcc.dg/20020426-1.c b/gcc/testsuite/gcc.dg/20020426-1.c
index 225b3199bcad14d6d6b6e53dd213ea35e896bd5c..67b09b3f80d3dca17d87379a1d2d600d108da225 100644 (file)
--- a/gcc/testsuite/gcc.dg/20020426-1.c
+++ b/gcc/testsuite/gcc.dg/20020426-1.c
@@ -1,6 +1,6 @@
 /* { dg-do compile { target i?86-*-* } } */
 /* { dg-options "-msoft-float -mfp-ret-in-387" } */
-/* { dg-forbid-option "-m64" } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 
 void f() {
   __builtin_apply(0, 0, 0);

diff --git a/gcc/testsuite/gcc.dg/20020426-2.c b/gcc/testsuite/gcc.dg/20020426-2.c
index 85f04f871f3241f9eb55a218666cfd4278001dd4..19bf991b3466588d9f0ab44617935131edf9eeab 100644 (file)
--- a/gcc/testsuite/gcc.dg/20020426-2.c
+++ b/gcc/testsuite/gcc.dg/20020426-2.c
@@ -3,7 +3,7 @@
 /* { dg-do run } */
 /* { dg-options "-O2" } */
 /* { dg-options "-O2 -frename-registers -fomit-frame-pointer -fPIC -mtune=i686" { target i?86-*-* } } */
-/* { dg-forbid-option "-m64" { target i?86-*-* } } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 /* { dg-bogus "\[Uu\]nresolved symbol .(_GLOBAL_OFFSET_TABLE_|\[_.A-Za-z\]\[_.0-9A-Za-z\]*@(PLT|GOT|GOTOFF))" "PIC unsupported" { xfail *-*-netware* } 0 } */
 
 extern void exit (int);

diff --git a/gcc/testsuite/gcc.dg/20020517-1.c b/gcc/testsuite/gcc.dg/20020517-1.c
index bc6cb8305e0347d94cf4b1359884861301818751..72b252900d4076fa47d800efbfd864730da75c78 100644 (file)
--- a/gcc/testsuite/gcc.dg/20020517-1.c
+++ b/gcc/testsuite/gcc.dg/20020517-1.c
@@ -3,7 +3,7 @@
 /* { dg-do run } */
 /* { dg-options "-O2" } */
 /* { dg-options "-O2 -mtune=i686" { target i?86-*-* } } */
-/* { dg-forbid-option "-m64" { target i?86-*-* } } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 
 #include <limits.h>
 

diff --git a/gcc/testsuite/gcc.dg/20020523-1.c b/gcc/testsuite/gcc.dg/20020523-1.c
index de0555f37d2947481e9098eab80780a2eefa15dd..d29f20ae2e6dbb6246a30a06c0fed5ada8968a2b 100644 (file)
--- a/gcc/testsuite/gcc.dg/20020523-1.c
+++ b/gcc/testsuite/gcc.dg/20020523-1.c
@@ -2,7 +2,7 @@
    This testcase was miscompiled because sse_mov?fcc_const0*
    patterns were missing earlyclobber.  */
 /* { dg-do run { target i386-*-* } } */
-/* { dg-forbid-option "-m64" } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 /* { dg-options "-march=pentium3 -msse -ffast-math -O2" } */
 
 extern void abort (void);

diff --git a/gcc/testsuite/gcc.dg/20020523-2.c b/gcc/testsuite/gcc.dg/20020523-2.c
index dc9a12657e6af718ab8db2edbe5d662350dd8e38..086f1d469e66117ab451012e93078a235024e105 100644 (file)
--- a/gcc/testsuite/gcc.dg/20020523-2.c
+++ b/gcc/testsuite/gcc.dg/20020523-2.c
@@ -2,7 +2,7 @@
    This testcase was miscompiled because sse_mov?fcc_const0*
    patterns were missing earlyclobber.  */
 /* { dg-do run { target i386-*-* } } */
-/* { dg-forbid-option "-m64" } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 /* { dg-options "-march=pentium3 -msse -ffast-math -O2" } */
 
 #include "i386-cpuid.h"

diff --git a/gcc/testsuite/gcc.dg/20020729-1.c b/gcc/testsuite/gcc.dg/20020729-1.c
index 028464541dfa5f8628fa2427eb6e3aa0a942e313..929b5c361bd0e7537b9e04f4fa5e1c0d867e21d9 100644 (file)
--- a/gcc/testsuite/gcc.dg/20020729-1.c
+++ b/gcc/testsuite/gcc.dg/20020729-1.c
@@ -1,5 +1,5 @@
 /* { dg-do compile { target i?86-*-* } } */
-/* { dg-forbid-option "-m64" } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 /* { dg-options "-O2 -march=k6" } */
 
 static inline void *

diff --git a/gcc/testsuite/gcc.dg/20030204-1.c b/gcc/testsuite/gcc.dg/20030204-1.c
index ac7c3add32090cab07442e80d9288d827d4d8306..33a9eb229f9cc2ace4be3bb26a00e48b35e05635 100644 (file)
--- a/gcc/testsuite/gcc.dg/20030204-1.c
+++ b/gcc/testsuite/gcc.dg/20030204-1.c
@@ -2,7 +2,7 @@
 /* { dg-do compile } */
 /* { dg-options "-O -ffast-math -funroll-loops" } */
 /* { dg-options "-march=pentium3 -O -ffast-math -funroll-loops" { target i?86-*-* } } */
-/* { dg-forbid-option "-m64" { target i?86-*-* } } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 
 float foo (float *a, int i)
 {

diff --git a/gcc/testsuite/gcc.dg/20030826-2.c b/gcc/testsuite/gcc.dg/20030826-2.c
index f38e32372c000a3a13dda7fe49907ae3e20329f4..e69c5346a26a3db7f8f03aba81f3d75561a4c5c9 100644 (file)
--- a/gcc/testsuite/gcc.dg/20030826-2.c
+++ b/gcc/testsuite/gcc.dg/20030826-2.c
@@ -1,7 +1,7 @@
 /* { dg-do run } */
 /* { dg-options "-O2 -fomit-frame-pointer" } */
 /* { dg-options "-O2 -fomit-frame-pointer -march=i386" { target i?86-*-* } } */
-/* { dg-forbid-option "-m64" { target i?86-*-* } } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 
 extern void abort (void);
 extern void exit (int);

diff --git a/gcc/testsuite/gcc.dg/20030926-1.c b/gcc/testsuite/gcc.dg/20030926-1.c
index 8af98aa56ef5e9f477d8882c2975ec9044416668..09931b378dd9b628d7912cf8131793f039271366 100644 (file)
--- a/gcc/testsuite/gcc.dg/20030926-1.c
+++ b/gcc/testsuite/gcc.dg/20030926-1.c
@@ -2,7 +2,7 @@
 /* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O2 -minline-all-stringops" } */
 /* { dg-options "-O2 -minline-all-stringops -march=pentium4" { target i?86-*-* } } */
-/* { dg-forbid-option "-m64" { target i?86-*-* } } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 
 extern void *memcpy (void *, const void *, __SIZE_TYPE__);
 extern __SIZE_TYPE__ strlen (const char *);

diff --git a/gcc/testsuite/gcc.dg/20031202-1.c b/gcc/testsuite/gcc.dg/20031202-1.c
index 7947770dfd57d70cb9dba9c3dc20d5b43e0a213c..ac443a284250251b563606f46e07451055a761b3 100644 (file)
--- a/gcc/testsuite/gcc.dg/20031202-1.c
+++ b/gcc/testsuite/gcc.dg/20031202-1.c
@@ -1,7 +1,7 @@
 /* { dg-do run } */
 /* { dg-options "-O2" } */
 /* { dg-options "-O2 -mtune=i686" { target i?86-*-* } } */
-/* { dg-forbid-option "-m64" { target i?86-*-* } } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 
 extern void abort (void);
 extern void exit (int);

diff --git a/gcc/testsuite/gcc.dg/980312-1.c b/gcc/testsuite/gcc.dg/980312-1.c
index 69553ef4199cbcdd1f91a2b36657f03d2e377a5f..83f1488745aca8a1f5c852b74780fb3a24661b10 100644 (file)
--- a/gcc/testsuite/gcc.dg/980312-1.c
+++ b/gcc/testsuite/gcc.dg/980312-1.c
@@ -1,5 +1,5 @@
 /* { dg-do link { target i?86-*-* } } */
-/* { dg-forbid-option "-m64" } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 /* { dg-options "-O2 -march=pentiumpro" } */
 
 extern __inline  double

diff --git a/gcc/testsuite/gcc.dg/980313-1.c b/gcc/testsuite/gcc.dg/980313-1.c
index 1e23fee16ed1aa80bcbe432325399332a08856e1..75566222116bc590382639d1468d211b47eb0c83 100644 (file)
--- a/gcc/testsuite/gcc.dg/980313-1.c
+++ b/gcc/testsuite/gcc.dg/980313-1.c
@@ -1,5 +1,5 @@
 /* { dg-do link { target i?86-*-* } } */
-/* { dg-forbid-option "-m64" } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 /* { dg-options "-O2 -march=pentiumpro" } */
 
 extern __inline  double

diff --git a/gcc/testsuite/gcc.dg/990117-1.c b/gcc/testsuite/gcc.dg/990117-1.c
index df7636b8a8c07c2cc7d1b7280536eab8ee879983..6d71787f305cbb86f6d0db94a385d9c58fe3505c 100644 (file)
--- a/gcc/testsuite/gcc.dg/990117-1.c
+++ b/gcc/testsuite/gcc.dg/990117-1.c
@@ -1,5 +1,5 @@
 /* { dg-do compile { target i?86-*-* } } */
-/* { dg-forbid-option "-m64" } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 /* { dg-options "-O2 -march=pentiumpro" } */
 
 extern __inline  double

diff --git a/gcc/testsuite/gcc.dg/990424-1.c b/gcc/testsuite/gcc.dg/990424-1.c
index 9a3b630554e6367c07bc05602cc16b820591e762..d479754a9ef16ac6da9e3730bea9f27e971f21f8 100644 (file)
--- a/gcc/testsuite/gcc.dg/990424-1.c
+++ b/gcc/testsuite/gcc.dg/990424-1.c
@@ -2,7 +2,7 @@
    with stdcall functions.  */
 
 /* { dg-do run { target i?86-*-* } } */
-/* { dg-forbid-option "-m64" } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 /* { dg-options -mpreferred-stack-boundary=4 } */
 
 void __attribute__((stdcall)) foo(int a, int b, int c);

diff --git a/gcc/testsuite/gcc.dg/990524-1.c b/gcc/testsuite/gcc.dg/990524-1.c
index bded9f412a95a7a488963ba86387544aac9dcc4d..203c1dd452df2b7652ce87609709e0514e3de446 100644 (file)
--- a/gcc/testsuite/gcc.dg/990524-1.c
+++ b/gcc/testsuite/gcc.dg/990524-1.c
@@ -1,5 +1,5 @@
 /* { dg-do compile { target i?86-*-* } } */
-/* { dg-forbid-option "-m64" } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 /* { dg-options "-O2 -march=pentiumpro" } */
 
 typedef struct t_anim_info {

diff --git a/gcc/testsuite/gcc.dg/991230-1.c b/gcc/testsuite/gcc.dg/991230-1.c
index 3bc1b0693ead6af875da91c0c7959062a3fcfe10..1cb66f5c379fba2fcb1d48f334dd4363ab22a95e 100644 (file)
--- a/gcc/testsuite/gcc.dg/991230-1.c
+++ b/gcc/testsuite/gcc.dg/991230-1.c
@@ -1,5 +1,5 @@
 /* { dg-do run { target i?86-*-* } } */
-/* { dg-forbid-option "-m64" } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 /* { dg-options "-O -ffast-math -mtune=i486" } */
 
 /* Test that floating point greater-than tests are compiled correctly with

diff --git a/gcc/testsuite/gcc.dg/i386-387-1.c b/gcc/testsuite/gcc.dg/i386-387-1.c
index 058618853159501f521d7635ff05f7519edaa836..7be1ba34aaa85d4131c9dd93131bd269b0b9b4d7 100644 (file)
--- a/gcc/testsuite/gcc.dg/i386-387-1.c
+++ b/gcc/testsuite/gcc.dg/i386-387-1.c
@@ -1,6 +1,6 @@
 /* Verify that -mno-fancy-math-387 works.  */
 /* { dg-do compile { target "i?86-*-*" } } */
-/* { dg-forbid-option "-m64" } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 /* { dg-options "-O -ffast-math -mfpmath=387 -mno-fancy-math-387 -march=i386" } */
 /* { dg-final { scan-assembler "call\t_?sin" } } */
 /* { dg-final { scan-assembler "call\t_?cos" } } */

diff --git a/gcc/testsuite/gcc.dg/i386-387-2.c b/gcc/testsuite/gcc.dg/i386-387-2.c
index 9642b225e3ebfc5d7812e6dc9e847e4aa9aec09b..ebbe619df36ea2b72abe42e5247091bcf4f4ba1e 100644 (file)
--- a/gcc/testsuite/gcc.dg/i386-387-2.c
+++ b/gcc/testsuite/gcc.dg/i386-387-2.c
@@ -1,6 +1,6 @@
 /* Verify that -march overrides -mno-fancy-math-387.  */
 /* { dg-do compile { target "i?86-*-*" } } */
-/* { dg-forbid-option "-m64" } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 /* { dg-options "-O -ffast-math -mfpmath=387 -march=i686 -mno-fancy-math-387" } */
 /* { dg-final { scan-assembler "fsin" } } */
 /* { dg-final { scan-assembler "fcos" } } */

diff --git a/gcc/testsuite/gcc.dg/i386-387-3.c b/gcc/testsuite/gcc.dg/i386-387-3.c
index 92f95d6fd63cd4e01f0c61ec46e5ba01d2c68156..b68928a1adf8748ccec42924296113fcb93589d8 100644 (file)
--- a/gcc/testsuite/gcc.dg/i386-387-3.c
+++ b/gcc/testsuite/gcc.dg/i386-387-3.c
@@ -1,6 +1,6 @@
 /* Verify that 387 mathematical constants are recognized.  */
 /* { dg-do compile { target "i?86-*-*" } } */
-/* { dg-forbid-option "-m64" } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 /* { dg-options "-O2 -march=i686" } */
 /* { dg-final { scan-assembler "fldpi" } } */
 

diff --git a/gcc/testsuite/gcc.dg/i386-387-4.c b/gcc/testsuite/gcc.dg/i386-387-4.c
index 65834b0e73d797736017021d88c406742e5ae905..dbe340ca4b6286e8ecc75cb22ba1992996164740 100644 (file)
--- a/gcc/testsuite/gcc.dg/i386-387-4.c
+++ b/gcc/testsuite/gcc.dg/i386-387-4.c
@@ -1,5 +1,5 @@
 /* { dg-do compile { target "i?86-*-*" } } */
-/* { dg-forbid-option "-m64" } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 /* { dg-options "-O2 -march=i686" } */
 /* { dg-final { scan-assembler "fldpi" } } */
 

diff --git a/gcc/testsuite/gcc.dg/i386-387-5.c b/gcc/testsuite/gcc.dg/i386-387-5.c
index d5f29b33d1523ebdb52c1e2daca7f66e8141b5f9..d438b254db926fe4dbe60ba75dc1554b24c32346 100644 (file)
--- a/gcc/testsuite/gcc.dg/i386-387-5.c
+++ b/gcc/testsuite/gcc.dg/i386-387-5.c
@@ -1,6 +1,6 @@
 /* Verify that -mno-fancy-math-387 works.  */
 /* { dg-do compile { target "i?86-*-*" } } */
-/* { dg-forbid-option "-m64" } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 /* { dg-options "-O -ffast-math -mfpmath=387 -mno-fancy-math-387 -march=i386" } */
 /* { dg-final { scan-assembler "call\t_?atan" } } */
 /* { dg-final { scan-assembler "call\t_?log1p" } } */

diff --git a/gcc/testsuite/gcc.dg/i386-387-6.c b/gcc/testsuite/gcc.dg/i386-387-6.c
index 85d2fa4121d6aeaddba5d5dffed88dcb6b4d7f2e..ab6412b7afffe5e76c9d4bc530a1b0fa7e946736 100644 (file)
--- a/gcc/testsuite/gcc.dg/i386-387-6.c
+++ b/gcc/testsuite/gcc.dg/i386-387-6.c
@@ -1,6 +1,6 @@
 /* Verify that -march overrides -mno-fancy-math-387.  */
 /* { dg-do compile { target "i?86-*-*" } } */
-/* { dg-forbid-option "-m64" } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 /* { dg-options "-O -ffast-math -mfpmath=387 -march=i686 -mno-fancy-math-387" } */
 /* { dg-final { scan-assembler "fpatan" } } */
 /* { dg-final { scan-assembler "fyl2xp1" } } */

diff --git a/gcc/testsuite/gcc.dg/i386-asm-1.c b/gcc/testsuite/gcc.dg/i386-asm-1.c
index 593869909ef8296d79793f4f8c31b86242be49a1..a23e0a0929828e0f0b91d16819efd93f8c1bd1ca 100644 (file)
--- a/gcc/testsuite/gcc.dg/i386-asm-1.c
+++ b/gcc/testsuite/gcc.dg/i386-asm-1.c
@@ -1,6 +1,6 @@
 /* PR inline-asm/11676 */
 /* { dg-do run { target i?86-*-* } } */
-/* { dg-forbid-option "-m64" } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 /* { dg-options "-O2" } */
 
 extern void abort (void);

diff --git a/gcc/testsuite/gcc.dg/i386-bitfield1.c b/gcc/testsuite/gcc.dg/i386-bitfield1.c
index 1db7cb562bfd861a5da9d264c4b847305816547c..5b53acf8dfdd825b555b988bc6e7f55f4a95d7d7 100644 (file)
--- a/gcc/testsuite/gcc.dg/i386-bitfield1.c
+++ b/gcc/testsuite/gcc.dg/i386-bitfield1.c
@@ -1,6 +1,6 @@
 // Test for bitfield alignment in structs on IA-32
 // { dg-do run { target i?86-*-* } }
-/* { dg-forbid-option "-m64" } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 // { dg-options "-O2" }
 // { dg-options "-mno-align-double -mno-ms-bitfields" { target i?86-*-interix* i?86-*-cygwin* i?86-*-mingw*} }
 

diff --git a/gcc/testsuite/gcc.dg/i386-bitfield2.c b/gcc/testsuite/gcc.dg/i386-bitfield2.c
index 60e1697c055651fb6098c96167d8f095b3dc1a70..f77a4ab409714919a59e878f3598be62f9fc61ec 100644 (file)
--- a/gcc/testsuite/gcc.dg/i386-bitfield2.c
+++ b/gcc/testsuite/gcc.dg/i386-bitfield2.c
@@ -1,6 +1,6 @@
 // Test for bitfield alignment in structs on IA-32
 // { dg-do run { target i?86-*-* } }
-/* { dg-forbid-option "-m64" } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 // { dg-options "-O2" }
 // { dg-options "-mno-align-double -mno-ms-bitfields" { target i?86-*-interix* i?86-*-cygwin* i?86-*-mingw* } }
 

diff --git a/gcc/testsuite/gcc.dg/i386-loop-1.c b/gcc/testsuite/gcc.dg/i386-loop-1.c
index b9e0fe20697c1ee8f5884217bf3e724c6c3ba10f..9aa23ef900f10dddfa7605331f9062c33041ec10 100644 (file)
--- a/gcc/testsuite/gcc.dg/i386-loop-1.c
+++ b/gcc/testsuite/gcc.dg/i386-loop-1.c
@@ -1,6 +1,6 @@
 /* PR optimization/9888 */
 /* { dg-do run { target i?86-*-* } } */
-/* { dg-forbid-option "-m64" } */
+/* { dg-xfail-if "" { *-*-* } { "-m64" } { "" } } */
 /* { dg-options "-mtune=k6 -O3" } */
 
 /* Verify that GCC doesn't emit out of range 'loop' instructions.  */

diff --git a/gcc/testsuite/gcc.dg/i386-loop-2.c b/gcc/testsuite/gcc.dg/i386-loop-2.c
index 3da2b09e966f0c408cb7eba756df16f14fa8a83b..548819a336cba48953ed28bf0c205a02449255e9 100644 (file)
--- a/gcc/testsuite/gcc.dg/i386-loop-2.c
+++ b/gcc/testsuite/gcc.dg/i386-loop-2.c
@@ -1,7 +1,7 @@
 /* PR optimization/9888 */
 /* Originator: Jim Bray <jb@as220.org> */
 /* { dg-do run { target i?86-*-* } } */
-/* { dg-forbid-option "-m64" } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 /* { dg-options "-mtune=k6 -Os" } */
 
 enum reload_type

diff --git a/gcc/testsuite/gcc.dg/i386-loop-3.c b/gcc/testsuite/gcc.dg/i386-loop-3.c
index d574f2f2d2e73ee8bca6f42bd53887bb3e57b1a9..394b4e99246e338768014e7c01f764ab25ace19e 100644 (file)
--- a/gcc/testsuite/gcc.dg/i386-loop-3.c
+++ b/gcc/testsuite/gcc.dg/i386-loop-3.c
@@ -2,7 +2,7 @@
 /* Originator: Tim McGrath <misty-@charter.net> */
 /* Testcase contributed by Eric Botcazou <ebotcazou@libertysurf.fr> */
 /* { dg-do run { target i?86-*-* } } */
-/* { dg-forbid-option "-m64" } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 /* { dg-options "-mtune=k6 -O3 -ffast-math -funroll-loops" } */
 
 extern void *memset (void *, int, __SIZE_TYPE__);

diff --git a/gcc/testsuite/gcc.dg/i386-pentium4-not-mull.c b/gcc/testsuite/gcc.dg/i386-pentium4-not-mull.c
index 24516fdd605f7fc49edb4d1a53ab1042f4a185de..2df07822ded506132d33391b29265c7238c66e9b 100644 (file)
--- a/gcc/testsuite/gcc.dg/i386-pentium4-not-mull.c
+++ b/gcc/testsuite/gcc.dg/i386-pentium4-not-mull.c
@@ -1,6 +1,6 @@
 /* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O2 -march=pentium4" { target i?86-*-* } } */
-/* { dg-forbid-option "-m64" { target i?86-*-* } } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 /* { dg-options "-O2 -march=pentium4 -m32" { target x86_64-*-* } } */
 /* { dg-final { scan-assembler-not "imull" } } */
 

diff --git a/gcc/testsuite/gcc.dg/i386-pic-1.c b/gcc/testsuite/gcc.dg/i386-pic-1.c
index 72c46e92735a44e233753814f5b13a95a61b8270..8fa2caf67f7f5cee90b0e7e06659b86594cb8381 100644 (file)
--- a/gcc/testsuite/gcc.dg/i386-pic-1.c
+++ b/gcc/testsuite/gcc.dg/i386-pic-1.c
@@ -1,6 +1,6 @@
 /* PR target/8340 */
 /* { dg-do compile { target i?86-*-* } } */
-/* { dg-forbid-option "-m64" } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 /* { dg-options "-fPIC" } */
 
 int foo ()

diff --git a/gcc/testsuite/gcc.dg/i386-regparm.c b/gcc/testsuite/gcc.dg/i386-regparm.c
index 8406874dd1883979a346a97275ea049cc9ba8dfe..601688f64893cd7cf77dcbd5ad98dd958152d43a 100644 (file)
--- a/gcc/testsuite/gcc.dg/i386-regparm.c
+++ b/gcc/testsuite/gcc.dg/i386-regparm.c
@@ -1,5 +1,5 @@
 /* { dg-do compile { target i?86-*-* } } */
-/* { dg-forbid-option "-m64" } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 /* { dg-options "-W -Wall" } */
 
 /* Verify that GCC correctly detects non-matching regparm attributes.  */

diff --git a/gcc/testsuite/gcc.dg/i386-signbit-1.c b/gcc/testsuite/gcc.dg/i386-signbit-1.c
index 2c0fe5c78b5c489064f035ff3ba9a45d2cf04f54..57c1f5f2cb3ad1d4a062c3290c7172442f3b7320 100644 (file)
--- a/gcc/testsuite/gcc.dg/i386-signbit-1.c
+++ b/gcc/testsuite/gcc.dg/i386-signbit-1.c
@@ -1,6 +1,6 @@
 /* PR optimization/8746 */
 /* { dg-do run { target i?86-*-* } } */
-/* { dg-forbid-option "-m64" } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 /* { dg-options "-O1 -mtune=i586" } */
 
 extern void abort (void);

diff --git a/gcc/testsuite/gcc.dg/i386-signbit-2.c b/gcc/testsuite/gcc.dg/i386-signbit-2.c
index dbda6c4c95e3ba4e73d17a1dc4f5f497e83a03fd..3e35249dadded645a213bcf5a3b948123cefee93 100644 (file)
--- a/gcc/testsuite/gcc.dg/i386-signbit-2.c
+++ b/gcc/testsuite/gcc.dg/i386-signbit-2.c
@@ -1,6 +1,6 @@
 /* PR optimization/8746 */
 /* { dg-do run { target i?86-*-* } } */
-/* { dg-forbid-option "-m64" } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 /* { dg-options "-O1 -mtune=i586" } */
 
 extern void abort (void);

diff --git a/gcc/testsuite/gcc.dg/i386-signbit-3.c b/gcc/testsuite/gcc.dg/i386-signbit-3.c
index 476e873d57e552b7af5f8b40f9c8b3d3eaaeb51f..882e6421415c62bf70ce9f0614dbb15662c57366 100644 (file)
--- a/gcc/testsuite/gcc.dg/i386-signbit-3.c
+++ b/gcc/testsuite/gcc.dg/i386-signbit-3.c
@@ -1,6 +1,6 @@
 /* PR optimization/8746 */
 /* { dg-do run { target i?86-*-* } } */
-/* { dg-forbid-option "-m64" } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 /* { dg-options "-O1 -mtune=i586" } */
 
 extern void abort (void);

diff --git a/gcc/testsuite/gcc.dg/i386-sse-5.c b/gcc/testsuite/gcc.dg/i386-sse-5.c
index ab2d499c5e70b1081519cb8a42d166c7eab7fcc6..a35e5d60cb63946008751e2c3b17bf478ac96627 100644 (file)
--- a/gcc/testsuite/gcc.dg/i386-sse-5.c
+++ b/gcc/testsuite/gcc.dg/i386-sse-5.c
@@ -1,5 +1,5 @@
 /* { dg-do compile { target i?86-*-* } } */
-/* { dg-forbid-option "-m64" } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 /* { dg-options "-Winline -O2 -march=i386" } */
 typedef double v2df __attribute__ ((vector_size (16)));
 v2df p;

diff --git a/gcc/testsuite/gcc.dg/i386-sse-8.c b/gcc/testsuite/gcc.dg/i386-sse-8.c
index 3197e99a24c0813bd49f23ec11449e6ffab282b1..7ae52fdca7c869f356600d03d48816c368a0ad35 100644 (file)
--- a/gcc/testsuite/gcc.dg/i386-sse-8.c
+++ b/gcc/testsuite/gcc.dg/i386-sse-8.c
@@ -5,7 +5,7 @@
 /* { dg-do compile { xfail xstormy16-*-* } } */
 /* { dg-options "" } */
 /* { dg-options "-march=pentium3" { target i?86-*-* } } */
-/* { dg-forbid-option "-m64" { target i?86-*-* } } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 
 int main() 
 { 

diff --git a/gcc/testsuite/gcc.dg/i386-unroll-1.c b/gcc/testsuite/gcc.dg/i386-unroll-1.c
index 2dff9127721de3cc41d33bda4cdd5df4c75eb887..8ffd2ebe110b693ef57b1e174cd257b18c98b6bd 100644 (file)
--- a/gcc/testsuite/gcc.dg/i386-unroll-1.c
+++ b/gcc/testsuite/gcc.dg/i386-unroll-1.c
@@ -1,6 +1,6 @@
 /* PR optimization/8599 */
 /* { dg-do run { target i?86-*-* } } */
-/* { dg-forbid-option "-m64" } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 /* { dg-options "-mtune=k6 -O2 -funroll-loops" } */
 
 extern void exit (int);

diff --git a/gcc/testsuite/gcc.dg/tls/opt-1.c b/gcc/testsuite/gcc.dg/tls/opt-1.c
index a35b72b09278ecf6adc7bde8e6aaefd53f309903..f817c04e1515d37141f69d7dd31abcc4c298e6bf 100644 (file)
--- a/gcc/testsuite/gcc.dg/tls/opt-1.c
+++ b/gcc/testsuite/gcc.dg/tls/opt-1.c
@@ -1,7 +1,7 @@
 /* { dg-do compile } */
 /* { dg-options "-O2 -fPIC" } */
 /* { dg-options "-O2 -fPIC -mtune=i686" { target i?86-*-* } } */
-/* { dg-forbid-option "-m64" { target i?86-*-* } } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 
 extern __thread int thr;
 

diff --git a/gcc/testsuite/gcc.dg/tls/opt-2.c b/gcc/testsuite/gcc.dg/tls/opt-2.c
index a4064f0b8d8767b5ae37472d3b748de11b677f18..6dc2b0e05aa73348c67691da679255c6b63e7d0e 100644 (file)
--- a/gcc/testsuite/gcc.dg/tls/opt-2.c
+++ b/gcc/testsuite/gcc.dg/tls/opt-2.c
@@ -5,7 +5,7 @@
 /* { dg-do link } */
 /* { dg-options "-O2 -ftls-model=initial-exec" } */
 /* { dg-options "-O2 -ftls-model=initial-exec -march=i686" { target i?86-*-* } } */
-/* { dg-forbid-option "-m64" { target i?86-*-* } } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 
 __thread int thr;
 

diff --git a/gcc/testsuite/gcc.dg/unroll-1.c b/gcc/testsuite/gcc.dg/unroll-1.c
index 7a75d6b281275ae0ce9b5976a81335221f1301ea..2ea694f35216f91e0c14266c0c7016f06bb0f85a 100644 (file)
--- a/gcc/testsuite/gcc.dg/unroll-1.c
+++ b/gcc/testsuite/gcc.dg/unroll-1.c
@@ -2,7 +2,7 @@
 /* { dg-do run } */
 /* { dg-options "-O2 -funroll-loops" } */
 /* { dg-options "-mtune=k6 -O2 -funroll-loops" { target i?86-*-* } } */
-/* { dg-forbid-option "-m64" { target i?86-*-* } } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 
 extern void abort (void);
 

diff --git a/gcc/testsuite/gcc.misc-tests/i386-pf-3dnow-1.c b/gcc/testsuite/gcc.misc-tests/i386-pf-3dnow-1.c
index a21e9ccf112b4c971daae6c45af2ef2ba53e2a6e..e4961cf6c51a49018cfead68fbe2588d3e6741b9 100644 (file)
--- a/gcc/testsuite/gcc.misc-tests/i386-pf-3dnow-1.c
+++ b/gcc/testsuite/gcc.misc-tests/i386-pf-3dnow-1.c
@@ -2,7 +2,7 @@
    variants that use 3DNow! prefetch instructions.  */
 
 /* { dg-do compile { target i?86-*-* } } */
-/* { dg-forbid-option "-m64" } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 
 extern void exit (int);
 

diff --git a/gcc/testsuite/gcc.misc-tests/i386-pf-athlon-1.c b/gcc/testsuite/gcc.misc-tests/i386-pf-athlon-1.c
index 33acfbb9bd8ab0c15f7eaf4b70060f69c0124f13..08d046bf1c85f28cd760d50aa2ca7e233ca85945 100644 (file)
--- a/gcc/testsuite/gcc.misc-tests/i386-pf-athlon-1.c
+++ b/gcc/testsuite/gcc.misc-tests/i386-pf-athlon-1.c
@@ -3,7 +3,7 @@
    locality hints.  */
 
 /* { dg-do compile { target i?86-*-* } } */
-/* { dg-forbid-option "-m64" } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 
 extern void exit (int);
 

diff --git a/gcc/testsuite/gcc.misc-tests/i386-pf-none-1.c b/gcc/testsuite/gcc.misc-tests/i386-pf-none-1.c
index 02d0efe726ff1cd1a23e6b76e1e8159c21d16706..155e0f4ac0212ad586f230b817ea84ab2a3db5e5 100644 (file)
--- a/gcc/testsuite/gcc.misc-tests/i386-pf-none-1.c
+++ b/gcc/testsuite/gcc.misc-tests/i386-pf-none-1.c
@@ -2,7 +2,7 @@
    that do not support those instructions.  */
 
 /* { dg-do compile { target i?86-*-* } } */
-/* { dg-forbid-option "-m64" } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 
 extern void exit (int);
 

diff --git a/gcc/testsuite/gcc.misc-tests/i386-pf-sse-1.c b/gcc/testsuite/gcc.misc-tests/i386-pf-sse-1.c
index e5fc0910c24cc4405501d5cc71397755970a576c..7d1ed99ecbc60082dd74c0da52e36c70f7c90968 100644 (file)
--- a/gcc/testsuite/gcc.misc-tests/i386-pf-sse-1.c
+++ b/gcc/testsuite/gcc.misc-tests/i386-pf-sse-1.c
@@ -2,7 +2,7 @@
    variants that use SSE prefetch instructions.  */
 
 /* { dg-do compile { target i?86-*-* } } */
-/* { dg-forbid-option "-m64" } */
+/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 
 extern void exit (int);
 

diff --git a/gcc/testsuite/lib/gcc-dg.exp b/gcc/testsuite/lib/gcc-dg.exp
index feb1461b5f285f00e65d23af66cc3550ff55a43e..1244462b2d4ba11450772a4edf8306dcb157bd6e 100644 (file)
--- a/gcc/testsuite/lib/gcc-dg.exp
+++ b/gcc/testsuite/lib/gcc-dg.exp
@@ -446,34 +446,18 @@ proc dg-require-effective-target { args } {
     }
 }
 
-# ARGS is a list.  The 0th element is the line number at which the
-# dg-forbid-option directive appeared in the source file.  The 1st
-# element is a regular expression.  If the regular expression matches
-# the command-line options implied by the current multilib, then the
-# test will be treated as unsupported.  The 2nd element of the list,
-# if present, is a target selector conditionalizing this directive;
-# if the target selector does not match the current target, this
-# dg-forbid-option directive is ignored.
-
-proc dg-forbid-option { args } {
-    set target_name [target_info name]
-    set pattern [lindex $args 1]
-
-    if {[llength $args] > 2} {
-       set selector [lindex $args 2]
-       if { [dg-process-target $selector] == "N" } {
-           return
-       }
-    }
-       
-    # Check to see if the option occurs in the multilib options
-    # for this target.
-    if {[board_info $target_name exists multilib_flags]} {
-       set multilib_flags [board_info $target_name multilib_flags]
-       if { [regexp -- ${pattern} $multilib_flags] } {
-           upvar dg-do-what dg-do-what
-           set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"]
-       }
+# Skip the test (report it as UNSUPPORTED) if the target list and
+# included flags are matched and the excluded flags are not matched.
+#
+# The first argument is the line number of the dg-skip-if directive
+# within the test file.   Remaining arguments are as for xfail lists:
+# message { targets } { include } { exclude }
+
+proc dg-skip-if { args } {
+    set args [lreplace $args 0 0]
+    if [check_conditional_xfail $args] {
+       upvar dg-do-what dg-do-what
+       skip_test_and_clear_xfail
     }
 }