This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: Testsuite patch for Solaris 10


On Mon, Nov 15, 2004 at 05:20:26PM -0800, Mark Mitchell wrote:
> Joseph S. Myers wrote:
> 
> >On Mon, 15 Nov 2004, Janis Johnson wrote:
> >
> >> { dg-skip-if message { targets } { include } { exclude } }
> >>
> >>The following would skip a test on an i?86 target when -m64 is one of
> >>the command-line options.  The dg-do target list could specify all
> >>targets on which to run the test.
> >>
> >> { dg-skip-if "" { i?86 } { "*" } { "-m64" } }
> >>
> >>This has the advantage of looking like dg-xfail-if.
> >
> >It also has the advantage of being such that the same dg-skip-if 
> >specification would naturally be used both for the x86-only tests which 
> >have plain dg-forbid-option and for the tests with special options on x86 
> >that condition dg-forbid-option on being a x86 target.  It looks good to 
> >me as a dg-forbid-option replacement.
> > 
> >
> I agree.

Mark and Joseph, how's this?  Tested on powerpc64-unknown-linux-gnu
with -m32 and -m64 just to make sure nothing weird happened, and with
contrived tests using dg-skip-if.  Eventually I hope to document all
of the dg- directives used in GCC tests.

2004-11-16  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.

Index: gcc/testsuite/lib/gcc-dg.exp
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/lib/gcc-dg.exp,v
retrieving revision 1.43
diff -u -p -r1.43 gcc-dg.exp
--- gcc/testsuite/lib/gcc-dg.exp	15 Nov 2004 19:03:02 -0000	1.43
+++ gcc/testsuite/lib/gcc-dg.exp	17 Nov 2004 00:57:08 -0000
@@ -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.
+# 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-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"]
-	}
+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
     }
 }
 
Index: gcc/testsuite/g++.dg/abi/bitfield3.C
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/g++.dg/abi/bitfield3.C,v
retrieving revision 1.5
diff -u -p -r1.5 bitfield3.C
--- gcc/testsuite/g++.dg/abi/bitfield3.C	12 Nov 2004 22:22:10 -0000	1.5
+++ gcc/testsuite/g++.dg/abi/bitfield3.C	16 Nov 2004 21:02:50 -0000
@@ -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
 {
Index: gcc/testsuite/g++.dg/abi/bitfield8.C
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/g++.dg/abi/bitfield8.C,v
retrieving revision 1.2
diff -u -p -r1.2 bitfield8.C
--- gcc/testsuite/g++.dg/abi/bitfield8.C	12 Nov 2004 22:22:10 -0000	1.2
+++ gcc/testsuite/g++.dg/abi/bitfield8.C	16 Nov 2004 21:02:56 -0000
@@ -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() {}
Index: gcc/testsuite/g++.dg/abi/dtor1.C
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/g++.dg/abi/dtor1.C,v
retrieving revision 1.2
diff -u -p -r1.2 dtor1.C
--- gcc/testsuite/g++.dg/abi/dtor1.C	12 Nov 2004 22:22:10 -0000	1.2
+++ gcc/testsuite/g++.dg/abi/dtor1.C	16 Nov 2004 21:03:01 -0000
@@ -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 {
Index: gcc/testsuite/g++.dg/abi/empty10.C
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/g++.dg/abi/empty10.C,v
retrieving revision 1.3
diff -u -p -r1.3 empty10.C
--- gcc/testsuite/g++.dg/abi/empty10.C	12 Nov 2004 22:22:10 -0000	1.3
+++ gcc/testsuite/g++.dg/abi/empty10.C	16 Nov 2004 21:03:06 -0000
@@ -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 {};
Index: gcc/testsuite/g++.dg/abi/empty7.C
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/g++.dg/abi/empty7.C,v
retrieving revision 1.2
diff -u -p -r1.2 empty7.C
--- gcc/testsuite/g++.dg/abi/empty7.C	12 Nov 2004 22:22:10 -0000	1.2
+++ gcc/testsuite/g++.dg/abi/empty7.C	16 Nov 2004 21:03:11 -0000
@@ -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 {};
Index: gcc/testsuite/g++.dg/abi/empty9.C
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/g++.dg/abi/empty9.C,v
retrieving revision 1.2
diff -u -p -r1.2 empty9.C
--- gcc/testsuite/g++.dg/abi/empty9.C	12 Nov 2004 22:22:10 -0000	1.2
+++ gcc/testsuite/g++.dg/abi/empty9.C	16 Nov 2004 21:03:16 -0000
@@ -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 {};
Index: gcc/testsuite/g++.dg/abi/layout3.C
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/g++.dg/abi/layout3.C,v
retrieving revision 1.2
diff -u -p -r1.2 layout3.C
--- gcc/testsuite/g++.dg/abi/layout3.C	12 Nov 2004 22:22:10 -0000	1.2
+++ gcc/testsuite/g++.dg/abi/layout3.C	16 Nov 2004 21:03:21 -0000
@@ -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 {
Index: gcc/testsuite/g++.dg/abi/layout4.C
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/g++.dg/abi/layout4.C,v
retrieving revision 1.2
diff -u -p -r1.2 layout4.C
--- gcc/testsuite/g++.dg/abi/layout4.C	12 Nov 2004 22:22:10 -0000	1.2
+++ gcc/testsuite/g++.dg/abi/layout4.C	16 Nov 2004 21:03:26 -0000
@@ -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
Index: gcc/testsuite/g++.dg/abi/thunk1.C
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/g++.dg/abi/thunk1.C,v
retrieving revision 1.2
diff -u -p -r1.2 thunk1.C
--- gcc/testsuite/g++.dg/abi/thunk1.C	12 Nov 2004 22:22:10 -0000	1.2
+++ gcc/testsuite/g++.dg/abi/thunk1.C	16 Nov 2004 21:03:32 -0000
@@ -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 ();
Index: gcc/testsuite/g++.dg/abi/thunk2.C
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/g++.dg/abi/thunk2.C,v
retrieving revision 1.2
diff -u -p -r1.2 thunk2.C
--- gcc/testsuite/g++.dg/abi/thunk2.C	12 Nov 2004 22:22:10 -0000	1.2
+++ gcc/testsuite/g++.dg/abi/thunk2.C	16 Nov 2004 21:03:37 -0000
@@ -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 {
Index: gcc/testsuite/g++.dg/abi/vbase11.C
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/g++.dg/abi/vbase11.C,v
retrieving revision 1.2
diff -u -p -r1.2 vbase11.C
--- gcc/testsuite/g++.dg/abi/vbase11.C	12 Nov 2004 22:22:10 -0000	1.2
+++ gcc/testsuite/g++.dg/abi/vbase11.C	16 Nov 2004 21:03:43 -0000
@@ -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; };
Index: gcc/testsuite/g++.dg/abi/vthunk2.C
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/g++.dg/abi/vthunk2.C,v
retrieving revision 1.2
diff -u -p -r1.2 vthunk2.C
--- gcc/testsuite/g++.dg/abi/vthunk2.C	12 Nov 2004 22:22:10 -0000	1.2
+++ gcc/testsuite/g++.dg/abi/vthunk2.C	16 Nov 2004 21:03:47 -0000
@@ -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 ();
Index: gcc/testsuite/g++.dg/abi/vthunk3.C
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/g++.dg/abi/vthunk3.C,v
retrieving revision 1.3
diff -u -p -r1.3 vthunk3.C
--- gcc/testsuite/g++.dg/abi/vthunk3.C	12 Nov 2004 22:22:11 -0000	1.3
+++ gcc/testsuite/g++.dg/abi/vthunk3.C	16 Nov 2004 21:03:53 -0000
@@ -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 {
Index: gcc/testsuite/g++.dg/ext/attrib8.C
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/g++.dg/ext/attrib8.C,v
retrieving revision 1.4
diff -u -p -r1.4 attrib8.C
--- gcc/testsuite/g++.dg/ext/attrib8.C	12 Nov 2004 22:22:11 -0000	1.4
+++ gcc/testsuite/g++.dg/ext/attrib8.C	16 Nov 2004 21:03:58 -0000
@@ -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; }
Index: gcc/testsuite/g++.dg/opt/longbranch2.C
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/g++.dg/opt/longbranch2.C,v
retrieving revision 1.2
diff -u -p -r1.2 longbranch2.C
--- gcc/testsuite/g++.dg/opt/longbranch2.C	12 Nov 2004 22:22:11 -0000	1.2
+++ gcc/testsuite/g++.dg/opt/longbranch2.C	16 Nov 2004 19:19:46 -0000
@@ -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.
 
Index: gcc/testsuite/g++.dg/opt/reg-stack4.C
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/g++.dg/opt/reg-stack4.C,v
retrieving revision 1.2
diff -u -p -r1.2 reg-stack4.C
--- gcc/testsuite/g++.dg/opt/reg-stack4.C	12 Nov 2004 22:22:12 -0000	1.2
+++ gcc/testsuite/g++.dg/opt/reg-stack4.C	16 Nov 2004 19:20:05 -0000
@@ -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;
Index: gcc/testsuite/g++.old-deja/g++.ext/attrib1.C
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/g++.old-deja/g++.ext/attrib1.C,v
retrieving revision 1.4
diff -u -p -r1.4 attrib1.C
--- gcc/testsuite/g++.old-deja/g++.ext/attrib1.C	12 Nov 2004 22:22:12 -0000	1.4
+++ gcc/testsuite/g++.old-deja/g++.ext/attrib1.C	16 Nov 2004 21:04:04 -0000
@@ -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>
 
Index: gcc/testsuite/g++.old-deja/g++.ext/attrib2.C
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/g++.old-deja/g++.ext/attrib2.C,v
retrieving revision 1.4
diff -u -p -r1.4 attrib2.C
--- gcc/testsuite/g++.old-deja/g++.ext/attrib2.C	12 Nov 2004 22:22:12 -0000	1.4
+++ gcc/testsuite/g++.old-deja/g++.ext/attrib2.C	16 Nov 2004 21:04:10 -0000
@@ -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>
 
Index: gcc/testsuite/g++.old-deja/g++.ext/attrib3.C
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/g++.old-deja/g++.ext/attrib3.C,v
retrieving revision 1.4
diff -u -p -r1.4 attrib3.C
--- gcc/testsuite/g++.old-deja/g++.ext/attrib3.C	12 Nov 2004 22:22:12 -0000	1.4
+++ gcc/testsuite/g++.old-deja/g++.ext/attrib3.C	16 Nov 2004 21:04:15 -0000
@@ -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>
 
Index: gcc/testsuite/g++.old-deja/g++.other/store-expr1.C
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/g++.old-deja/g++.other/store-expr1.C,v
retrieving revision 1.5
diff -u -p -r1.5 store-expr1.C
--- gcc/testsuite/g++.old-deja/g++.other/store-expr1.C	12 Nov 2004 22:22:13 -0000	1.5
+++ gcc/testsuite/g++.old-deja/g++.other/store-expr1.C	16 Nov 2004 21:04:20 -0000
@@ -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 {};
Index: gcc/testsuite/g++.old-deja/g++.other/store-expr2.C
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/g++.old-deja/g++.other/store-expr2.C,v
retrieving revision 1.4
diff -u -p -r1.4 store-expr2.C
--- gcc/testsuite/g++.old-deja/g++.other/store-expr2.C	12 Nov 2004 22:22:13 -0000	1.4
+++ gcc/testsuite/g++.old-deja/g++.other/store-expr2.C	16 Nov 2004 21:04:24 -0000
@@ -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 {};
 
Index: gcc/testsuite/gcc.dg/20000609-1.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.dg/20000609-1.c,v
retrieving revision 1.2
diff -u -p -r1.2 20000609-1.c
--- gcc/testsuite/gcc.dg/20000609-1.c	12 Nov 2004 22:22:14 -0000	1.2
+++ gcc/testsuite/gcc.dg/20000609-1.c	16 Nov 2004 20:59:09 -0000
@@ -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.  */
 
Index: gcc/testsuite/gcc.dg/20000720-1.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.dg/20000720-1.c,v
retrieving revision 1.2
diff -u -p -r1.2 20000720-1.c
--- gcc/testsuite/gcc.dg/20000720-1.c	12 Nov 2004 22:22:14 -0000	1.2
+++ gcc/testsuite/gcc.dg/20000720-1.c	16 Nov 2004 20:59:16 -0000
@@ -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);
Index: gcc/testsuite/gcc.dg/20011107-1.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.dg/20011107-1.c,v
retrieving revision 1.3
diff -u -p -r1.3 20011107-1.c
--- gcc/testsuite/gcc.dg/20011107-1.c	12 Nov 2004 22:22:14 -0000	1.3
+++ gcc/testsuite/gcc.dg/20011107-1.c	16 Nov 2004 20:59:22 -0000
@@ -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
Index: gcc/testsuite/gcc.dg/20011119-1.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.dg/20011119-1.c,v
retrieving revision 1.3
diff -u -p -r1.3 20011119-1.c
--- gcc/testsuite/gcc.dg/20011119-1.c	12 Nov 2004 22:22:14 -0000	1.3
+++ gcc/testsuite/gcc.dg/20011119-1.c	16 Nov 2004 20:59:31 -0000
@@ -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);
Index: gcc/testsuite/gcc.dg/20020108-1.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.dg/20020108-1.c,v
retrieving revision 1.3
diff -u -p -r1.3 20020108-1.c
--- gcc/testsuite/gcc.dg/20020108-1.c	12 Nov 2004 22:22:14 -0000	1.3
+++ gcc/testsuite/gcc.dg/20020108-1.c	16 Nov 2004 19:28:08 -0000
@@ -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)
Index: gcc/testsuite/gcc.dg/20020122-2.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.dg/20020122-2.c,v
retrieving revision 1.2
diff -u -p -r1.2 20020122-2.c
--- gcc/testsuite/gcc.dg/20020122-2.c	12 Nov 2004 22:22:14 -0000	1.2
+++ gcc/testsuite/gcc.dg/20020122-2.c	16 Nov 2004 19:28:26 -0000
@@ -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();
Index: gcc/testsuite/gcc.dg/20020122-3.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.dg/20020122-3.c,v
retrieving revision 1.3
diff -u -p -r1.3 20020122-3.c
--- gcc/testsuite/gcc.dg/20020122-3.c	12 Nov 2004 22:22:14 -0000	1.3
+++ gcc/testsuite/gcc.dg/20020122-3.c	16 Nov 2004 19:28:38 -0000
@@ -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)
 {
Index: gcc/testsuite/gcc.dg/20020201-3.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.dg/20020201-3.c,v
retrieving revision 1.2
diff -u -p -r1.2 20020201-3.c
--- gcc/testsuite/gcc.dg/20020201-3.c	12 Nov 2004 22:22:14 -0000	1.2
+++ gcc/testsuite/gcc.dg/20020201-3.c	16 Nov 2004 20:59:37 -0000
@@ -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; };
Index: gcc/testsuite/gcc.dg/20020206-1.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.dg/20020206-1.c,v
retrieving revision 1.3
diff -u -p -r1.3 20020206-1.c
--- gcc/testsuite/gcc.dg/20020206-1.c	12 Nov 2004 22:22:14 -0000	1.3
+++ gcc/testsuite/gcc.dg/20020206-1.c	16 Nov 2004 19:29:39 -0000
@@ -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
 {
Index: gcc/testsuite/gcc.dg/20020218-1.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.dg/20020218-1.c,v
retrieving revision 1.2
diff -u -p -r1.2 20020218-1.c
--- gcc/testsuite/gcc.dg/20020218-1.c	12 Nov 2004 22:22:14 -0000	1.2
+++ gcc/testsuite/gcc.dg/20020218-1.c	16 Nov 2004 20:59:44 -0000
@@ -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" } } */
 
Index: gcc/testsuite/gcc.dg/20020310-1.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.dg/20020310-1.c,v
retrieving revision 1.4
diff -u -p -r1.4 20020310-1.c
--- gcc/testsuite/gcc.dg/20020310-1.c	12 Nov 2004 22:22:14 -0000	1.4
+++ gcc/testsuite/gcc.dg/20020310-1.c	16 Nov 2004 19:30:11 -0000
@@ -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
 {
Index: gcc/testsuite/gcc.dg/20020411-1.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.dg/20020411-1.c,v
retrieving revision 1.4
diff -u -p -r1.4 20020411-1.c
--- gcc/testsuite/gcc.dg/20020411-1.c	12 Nov 2004 22:22:14 -0000	1.4
+++ gcc/testsuite/gcc.dg/20020411-1.c	16 Nov 2004 19:30:30 -0000
@@ -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
 
Index: gcc/testsuite/gcc.dg/20020418-2.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.dg/20020418-2.c,v
retrieving revision 1.3
diff -u -p -r1.3 20020418-2.c
--- gcc/testsuite/gcc.dg/20020418-2.c	12 Nov 2004 22:22:14 -0000	1.3
+++ gcc/testsuite/gcc.dg/20020418-2.c	16 Nov 2004 19:30:54 -0000
@@ -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);
 
Index: gcc/testsuite/gcc.dg/20020426-1.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.dg/20020426-1.c,v
retrieving revision 1.3
diff -u -p -r1.3 20020426-1.c
--- gcc/testsuite/gcc.dg/20020426-1.c	12 Nov 2004 22:22:14 -0000	1.3
+++ gcc/testsuite/gcc.dg/20020426-1.c	16 Nov 2004 20:59:50 -0000
@@ -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);
Index: gcc/testsuite/gcc.dg/20020426-2.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.dg/20020426-2.c,v
retrieving revision 1.8
diff -u -p -r1.8 20020426-2.c
--- gcc/testsuite/gcc.dg/20020426-2.c	12 Nov 2004 22:22:14 -0000	1.8
+++ gcc/testsuite/gcc.dg/20020426-2.c	16 Nov 2004 19:31:41 -0000
@@ -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);
Index: gcc/testsuite/gcc.dg/20020517-1.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.dg/20020517-1.c,v
retrieving revision 1.3
diff -u -p -r1.3 20020517-1.c
--- gcc/testsuite/gcc.dg/20020517-1.c	12 Nov 2004 22:22:14 -0000	1.3
+++ gcc/testsuite/gcc.dg/20020517-1.c	16 Nov 2004 19:31:58 -0000
@@ -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>
 
Index: gcc/testsuite/gcc.dg/20020523-1.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.dg/20020523-1.c,v
retrieving revision 1.3
diff -u -p -r1.3 20020523-1.c
--- gcc/testsuite/gcc.dg/20020523-1.c	12 Nov 2004 22:22:14 -0000	1.3
+++ gcc/testsuite/gcc.dg/20020523-1.c	16 Nov 2004 20:59:56 -0000
@@ -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);
Index: gcc/testsuite/gcc.dg/20020523-2.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.dg/20020523-2.c,v
retrieving revision 1.3
diff -u -p -r1.3 20020523-2.c
--- gcc/testsuite/gcc.dg/20020523-2.c	12 Nov 2004 22:22:14 -0000	1.3
+++ gcc/testsuite/gcc.dg/20020523-2.c	16 Nov 2004 21:00:02 -0000
@@ -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"
Index: gcc/testsuite/gcc.dg/20020729-1.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.dg/20020729-1.c,v
retrieving revision 1.3
diff -u -p -r1.3 20020729-1.c
--- gcc/testsuite/gcc.dg/20020729-1.c	12 Nov 2004 22:22:14 -0000	1.3
+++ gcc/testsuite/gcc.dg/20020729-1.c	16 Nov 2004 21:00:09 -0000
@@ -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 *
Index: gcc/testsuite/gcc.dg/20030204-1.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.dg/20030204-1.c,v
retrieving revision 1.2
diff -u -p -r1.2 20030204-1.c
--- gcc/testsuite/gcc.dg/20030204-1.c	12 Nov 2004 22:22:14 -0000	1.2
+++ gcc/testsuite/gcc.dg/20030204-1.c	16 Nov 2004 19:33:04 -0000
@@ -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)
 {
Index: gcc/testsuite/gcc.dg/20030826-2.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.dg/20030826-2.c,v
retrieving revision 1.2
diff -u -p -r1.2 20030826-2.c
--- gcc/testsuite/gcc.dg/20030826-2.c	12 Nov 2004 22:22:14 -0000	1.2
+++ gcc/testsuite/gcc.dg/20030826-2.c	16 Nov 2004 19:33:21 -0000
@@ -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);
Index: gcc/testsuite/gcc.dg/20030926-1.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.dg/20030926-1.c,v
retrieving revision 1.4
diff -u -p -r1.4 20030926-1.c
--- gcc/testsuite/gcc.dg/20030926-1.c	12 Nov 2004 22:22:14 -0000	1.4
+++ gcc/testsuite/gcc.dg/20030926-1.c	16 Nov 2004 18:57:28 -0000
@@ -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 *);
Index: gcc/testsuite/gcc.dg/20031202-1.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.dg/20031202-1.c,v
retrieving revision 1.3
diff -u -p -r1.3 20031202-1.c
--- gcc/testsuite/gcc.dg/20031202-1.c	12 Nov 2004 22:22:14 -0000	1.3
+++ gcc/testsuite/gcc.dg/20031202-1.c	16 Nov 2004 18:58:10 -0000
@@ -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);
Index: gcc/testsuite/gcc.dg/980312-1.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.dg/980312-1.c,v
retrieving revision 1.5
diff -u -p -r1.5 980312-1.c
--- gcc/testsuite/gcc.dg/980312-1.c	12 Nov 2004 22:22:14 -0000	1.5
+++ gcc/testsuite/gcc.dg/980312-1.c	16 Nov 2004 21:00:14 -0000
@@ -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
Index: gcc/testsuite/gcc.dg/980313-1.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.dg/980313-1.c,v
retrieving revision 1.4
diff -u -p -r1.4 980313-1.c
--- gcc/testsuite/gcc.dg/980313-1.c	12 Nov 2004 22:22:15 -0000	1.4
+++ gcc/testsuite/gcc.dg/980313-1.c	16 Nov 2004 21:00:19 -0000
@@ -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
Index: gcc/testsuite/gcc.dg/990117-1.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.dg/990117-1.c,v
retrieving revision 1.4
diff -u -p -r1.4 990117-1.c
--- gcc/testsuite/gcc.dg/990117-1.c	12 Nov 2004 22:22:15 -0000	1.4
+++ gcc/testsuite/gcc.dg/990117-1.c	16 Nov 2004 21:00:24 -0000
@@ -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
Index: gcc/testsuite/gcc.dg/990424-1.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.dg/990424-1.c,v
retrieving revision 1.4
diff -u -p -r1.4 990424-1.c
--- gcc/testsuite/gcc.dg/990424-1.c	12 Nov 2004 22:22:15 -0000	1.4
+++ gcc/testsuite/gcc.dg/990424-1.c	16 Nov 2004 21:00:30 -0000
@@ -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);
Index: gcc/testsuite/gcc.dg/990524-1.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.dg/990524-1.c,v
retrieving revision 1.4
diff -u -p -r1.4 990524-1.c
--- gcc/testsuite/gcc.dg/990524-1.c	12 Nov 2004 22:22:15 -0000	1.4
+++ gcc/testsuite/gcc.dg/990524-1.c	16 Nov 2004 21:00:36 -0000
@@ -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 {
Index: gcc/testsuite/gcc.dg/991230-1.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.dg/991230-1.c,v
retrieving revision 1.4
diff -u -p -r1.4 991230-1.c
--- gcc/testsuite/gcc.dg/991230-1.c	12 Nov 2004 22:22:15 -0000	1.4
+++ gcc/testsuite/gcc.dg/991230-1.c	16 Nov 2004 21:00:41 -0000
@@ -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
Index: gcc/testsuite/gcc.dg/i386-387-1.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.dg/i386-387-1.c,v
retrieving revision 1.10
diff -u -p -r1.10 i386-387-1.c
--- gcc/testsuite/gcc.dg/i386-387-1.c	12 Nov 2004 22:22:15 -0000	1.10
+++ gcc/testsuite/gcc.dg/i386-387-1.c	16 Nov 2004 21:00:48 -0000
@@ -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" } } */
Index: gcc/testsuite/gcc.dg/i386-387-2.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.dg/i386-387-2.c,v
retrieving revision 1.8
diff -u -p -r1.8 i386-387-2.c
--- gcc/testsuite/gcc.dg/i386-387-2.c	12 Nov 2004 22:22:15 -0000	1.8
+++ gcc/testsuite/gcc.dg/i386-387-2.c	16 Nov 2004 21:00:53 -0000
@@ -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" } } */
Index: gcc/testsuite/gcc.dg/i386-387-3.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.dg/i386-387-3.c,v
retrieving revision 1.2
diff -u -p -r1.2 i386-387-3.c
--- gcc/testsuite/gcc.dg/i386-387-3.c	12 Nov 2004 22:22:15 -0000	1.2
+++ gcc/testsuite/gcc.dg/i386-387-3.c	16 Nov 2004 21:00:59 -0000
@@ -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" } } */
 
Index: gcc/testsuite/gcc.dg/i386-387-4.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.dg/i386-387-4.c,v
retrieving revision 1.2
diff -u -p -r1.2 i386-387-4.c
--- gcc/testsuite/gcc.dg/i386-387-4.c	12 Nov 2004 22:22:15 -0000	1.2
+++ gcc/testsuite/gcc.dg/i386-387-4.c	16 Nov 2004 21:01:04 -0000
@@ -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" } } */
 
Index: gcc/testsuite/gcc.dg/i386-387-5.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.dg/i386-387-5.c,v
retrieving revision 1.4
diff -u -p -r1.4 i386-387-5.c
--- gcc/testsuite/gcc.dg/i386-387-5.c	12 Nov 2004 22:22:15 -0000	1.4
+++ gcc/testsuite/gcc.dg/i386-387-5.c	16 Nov 2004 21:01:09 -0000
@@ -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" } } */
Index: gcc/testsuite/gcc.dg/i386-387-6.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.dg/i386-387-6.c,v
retrieving revision 1.3
diff -u -p -r1.3 i386-387-6.c
--- gcc/testsuite/gcc.dg/i386-387-6.c	12 Nov 2004 22:22:15 -0000	1.3
+++ gcc/testsuite/gcc.dg/i386-387-6.c	16 Nov 2004 21:01:15 -0000
@@ -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" } } */
Index: gcc/testsuite/gcc.dg/i386-asm-1.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.dg/i386-asm-1.c,v
retrieving revision 1.4
diff -u -p -r1.4 i386-asm-1.c
--- gcc/testsuite/gcc.dg/i386-asm-1.c	12 Nov 2004 22:22:15 -0000	1.4
+++ gcc/testsuite/gcc.dg/i386-asm-1.c	16 Nov 2004 21:01:20 -0000
@@ -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);
Index: gcc/testsuite/gcc.dg/i386-bitfield1.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.dg/i386-bitfield1.c,v
retrieving revision 1.5
diff -u -p -r1.5 i386-bitfield1.c
--- gcc/testsuite/gcc.dg/i386-bitfield1.c	12 Nov 2004 22:22:15 -0000	1.5
+++ gcc/testsuite/gcc.dg/i386-bitfield1.c	16 Nov 2004 21:01:26 -0000
@@ -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*} }
 
Index: gcc/testsuite/gcc.dg/i386-bitfield2.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.dg/i386-bitfield2.c,v
retrieving revision 1.3
diff -u -p -r1.3 i386-bitfield2.c
--- gcc/testsuite/gcc.dg/i386-bitfield2.c	12 Nov 2004 22:22:15 -0000	1.3
+++ gcc/testsuite/gcc.dg/i386-bitfield2.c	16 Nov 2004 21:01:31 -0000
@@ -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* } }
 
Index: gcc/testsuite/gcc.dg/i386-loop-1.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.dg/i386-loop-1.c,v
retrieving revision 1.2
diff -u -p -r1.2 i386-loop-1.c
--- gcc/testsuite/gcc.dg/i386-loop-1.c	12 Nov 2004 22:22:15 -0000	1.2
+++ gcc/testsuite/gcc.dg/i386-loop-1.c	16 Nov 2004 19:07:11 -0000
@@ -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.  */
Index: gcc/testsuite/gcc.dg/i386-loop-2.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.dg/i386-loop-2.c,v
retrieving revision 1.2
diff -u -p -r1.2 i386-loop-2.c
--- gcc/testsuite/gcc.dg/i386-loop-2.c	12 Nov 2004 22:22:15 -0000	1.2
+++ gcc/testsuite/gcc.dg/i386-loop-2.c	16 Nov 2004 21:01:37 -0000
@@ -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
Index: gcc/testsuite/gcc.dg/i386-loop-3.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.dg/i386-loop-3.c,v
retrieving revision 1.3
diff -u -p -r1.3 i386-loop-3.c
--- gcc/testsuite/gcc.dg/i386-loop-3.c	12 Nov 2004 22:22:15 -0000	1.3
+++ gcc/testsuite/gcc.dg/i386-loop-3.c	16 Nov 2004 21:01:42 -0000
@@ -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__);
Index: gcc/testsuite/gcc.dg/i386-pentium4-not-mull.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.dg/i386-pentium4-not-mull.c,v
retrieving revision 1.3
diff -u -p -r1.3 i386-pentium4-not-mull.c
--- gcc/testsuite/gcc.dg/i386-pentium4-not-mull.c	12 Nov 2004 22:22:15 -0000	1.3
+++ gcc/testsuite/gcc.dg/i386-pentium4-not-mull.c	16 Nov 2004 19:08:11 -0000
@@ -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" } } */
 
Index: gcc/testsuite/gcc.dg/i386-pic-1.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.dg/i386-pic-1.c,v
retrieving revision 1.2
diff -u -p -r1.2 i386-pic-1.c
--- gcc/testsuite/gcc.dg/i386-pic-1.c	12 Nov 2004 22:22:15 -0000	1.2
+++ gcc/testsuite/gcc.dg/i386-pic-1.c	16 Nov 2004 21:01:47 -0000
@@ -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 ()
Index: gcc/testsuite/gcc.dg/i386-regparm.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.dg/i386-regparm.c,v
retrieving revision 1.3
diff -u -p -r1.3 i386-regparm.c
--- gcc/testsuite/gcc.dg/i386-regparm.c	12 Nov 2004 22:22:15 -0000	1.3
+++ gcc/testsuite/gcc.dg/i386-regparm.c	16 Nov 2004 21:01:53 -0000
@@ -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.  */
Index: gcc/testsuite/gcc.dg/i386-signbit-1.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.dg/i386-signbit-1.c,v
retrieving revision 1.3
diff -u -p -r1.3 i386-signbit-1.c
--- gcc/testsuite/gcc.dg/i386-signbit-1.c	12 Nov 2004 22:22:15 -0000	1.3
+++ gcc/testsuite/gcc.dg/i386-signbit-1.c	16 Nov 2004 21:01:58 -0000
@@ -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);
Index: gcc/testsuite/gcc.dg/i386-signbit-2.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.dg/i386-signbit-2.c,v
retrieving revision 1.2
diff -u -p -r1.2 i386-signbit-2.c
--- gcc/testsuite/gcc.dg/i386-signbit-2.c	12 Nov 2004 22:22:15 -0000	1.2
+++ gcc/testsuite/gcc.dg/i386-signbit-2.c	16 Nov 2004 21:02:03 -0000
@@ -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);
Index: gcc/testsuite/gcc.dg/i386-signbit-3.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.dg/i386-signbit-3.c,v
retrieving revision 1.2
diff -u -p -r1.2 i386-signbit-3.c
--- gcc/testsuite/gcc.dg/i386-signbit-3.c	12 Nov 2004 22:22:15 -0000	1.2
+++ gcc/testsuite/gcc.dg/i386-signbit-3.c	16 Nov 2004 21:02:09 -0000
@@ -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);
Index: gcc/testsuite/gcc.dg/i386-sse-5.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.dg/i386-sse-5.c,v
retrieving revision 1.3
diff -u -p -r1.3 i386-sse-5.c
--- gcc/testsuite/gcc.dg/i386-sse-5.c	12 Nov 2004 22:22:15 -0000	1.3
+++ gcc/testsuite/gcc.dg/i386-sse-5.c	16 Nov 2004 21:02:14 -0000
@@ -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;
Index: gcc/testsuite/gcc.dg/i386-sse-8.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.dg/i386-sse-8.c,v
retrieving revision 1.6
diff -u -p -r1.6 i386-sse-8.c
--- gcc/testsuite/gcc.dg/i386-sse-8.c	15 Nov 2004 13:33:37 -0000	1.6
+++ gcc/testsuite/gcc.dg/i386-sse-8.c	16 Nov 2004 19:10:50 -0000
@@ -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() 
 { 
Index: gcc/testsuite/gcc.dg/i386-unroll-1.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.dg/i386-unroll-1.c,v
retrieving revision 1.3
diff -u -p -r1.3 i386-unroll-1.c
--- gcc/testsuite/gcc.dg/i386-unroll-1.c	12 Nov 2004 22:22:15 -0000	1.3
+++ gcc/testsuite/gcc.dg/i386-unroll-1.c	16 Nov 2004 21:02:20 -0000
@@ -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);
Index: gcc/testsuite/gcc.dg/unroll-1.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.dg/unroll-1.c,v
retrieving revision 1.3
diff -u -p -r1.3 unroll-1.c
--- gcc/testsuite/gcc.dg/unroll-1.c	12 Nov 2004 22:22:15 -0000	1.3
+++ gcc/testsuite/gcc.dg/unroll-1.c	16 Nov 2004 19:11:42 -0000
@@ -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);
 
Index: gcc/testsuite/gcc.dg/tls/opt-1.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.dg/tls/opt-1.c,v
retrieving revision 1.3
diff -u -p -r1.3 opt-1.c
--- gcc/testsuite/gcc.dg/tls/opt-1.c	12 Nov 2004 22:22:15 -0000	1.3
+++ gcc/testsuite/gcc.dg/tls/opt-1.c	16 Nov 2004 19:12:01 -0000
@@ -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;
 
Index: gcc/testsuite/gcc.dg/tls/opt-2.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.dg/tls/opt-2.c,v
retrieving revision 1.2
diff -u -p -r1.2 opt-2.c
--- gcc/testsuite/gcc.dg/tls/opt-2.c	12 Nov 2004 22:22:16 -0000	1.2
+++ gcc/testsuite/gcc.dg/tls/opt-2.c	16 Nov 2004 19:12:21 -0000
@@ -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;
 
Index: gcc/testsuite/gcc.misc-tests/i386-pf-3dnow-1.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.misc-tests/i386-pf-3dnow-1.c,v
retrieving revision 1.3
diff -u -p -r1.3 i386-pf-3dnow-1.c
--- gcc/testsuite/gcc.misc-tests/i386-pf-3dnow-1.c	12 Nov 2004 22:22:16 -0000	1.3
+++ gcc/testsuite/gcc.misc-tests/i386-pf-3dnow-1.c	16 Nov 2004 21:02:26 -0000
@@ -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);
 
Index: gcc/testsuite/gcc.misc-tests/i386-pf-athlon-1.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.misc-tests/i386-pf-athlon-1.c,v
retrieving revision 1.3
diff -u -p -r1.3 i386-pf-athlon-1.c
--- gcc/testsuite/gcc.misc-tests/i386-pf-athlon-1.c	12 Nov 2004 22:22:16 -0000	1.3
+++ gcc/testsuite/gcc.misc-tests/i386-pf-athlon-1.c	16 Nov 2004 21:02:32 -0000
@@ -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);
 
Index: gcc/testsuite/gcc.misc-tests/i386-pf-none-1.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.misc-tests/i386-pf-none-1.c,v
retrieving revision 1.3
diff -u -p -r1.3 i386-pf-none-1.c
--- gcc/testsuite/gcc.misc-tests/i386-pf-none-1.c	12 Nov 2004 22:22:16 -0000	1.3
+++ gcc/testsuite/gcc.misc-tests/i386-pf-none-1.c	16 Nov 2004 21:02:38 -0000
@@ -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);
 
Index: gcc/testsuite/gcc.misc-tests/i386-pf-sse-1.c
===================================================================
RCS file: /opt/gcc-cvs/gcc/gcc/testsuite/gcc.misc-tests/i386-pf-sse-1.c,v
retrieving revision 1.3
diff -u -p -r1.3 i386-pf-sse-1.c
--- gcc/testsuite/gcc.misc-tests/i386-pf-sse-1.c	12 Nov 2004 22:22:16 -0000	1.3
+++ gcc/testsuite/gcc.misc-tests/i386-pf-sse-1.c	16 Nov 2004 21:02:44 -0000
@@ -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);
 


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]