* 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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@90810 138bc75d-0d04-0410-961f-82ee72b054a4

5 files changed, 5 insertions, 5 deletions

diff --git a/gcc/testsuite/g++.old-deja/g++.ext/attrib1.C b/gcc/testsuite/g++.old-deja/g++.ext/attrib1.C
index 0d66d72ebc6..bdc3ade8b74 100644
--- 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 abac1b322cf..c60ff823130 100644
--- 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 f47ab074e45..492cd9d7c49 100644
--- 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 153c8810703..49456242b4e 100644
--- 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 651f81d8d80..d35e3b77dfa 100644
--- 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 {};