PR testsuite/20772 - further pieces

[Andreas Jaeger <aj at suse dot de>]

This fixes the issues in g++.old-deja and gcc.dg that I noticed where
we were not running the testsuite on Linux/x86-64 with -m32 or tested
something slightly different.

Tested on Linux/x86-64 with and without -m32.

Ok to commit?

Andreas

2005-05-26  Andreas Jaeger  <aj@suse.de>

	PR testsuite/20772
	* g++.old-deja/g++.ext/attrib1.C, g++.old-deja/g++.ext/attrib2.C,
	g++.old-deja/g++.ext/attrib3.C,
	g++.old-deja/g++.other/store-expr1.C,
	g++.old-deja/g++.other/store-expr2.C, gcc.dg/20000609-1.c,
	gcc.dg/20000720-1.c, gcc.dg/20011107-1.c, gcc.dg/20011119-1.c,
	gcc.dg/20020108-1.c, gcc.dg/20020122-2.c, gcc.dg/20020122-3.c,
	gcc.dg/20020201-3.c, gcc.dg/20020206-1.c, gcc.dg/20020218-1.c,
	gcc.dg/20020310-1.c, gcc.dg/20020411-1.c, gcc.dg/20020418-2.c,
	gcc.dg/20020426-1.c, gcc.dg/20020426-2.c, gcc.dg/20020517-1.c,
	gcc.dg/20020523-1.c, gcc.dg/20020523-2.c, gcc.dg/20020729-1.c,
	gcc.dg/20030204-1.c, gcc.dg/20030826-2.c, gcc.dg/20030926-1.c,
	gcc.dg/20031202-1.c, gcc.dg/980312-1.c, gcc.dg/980313-1.c,
	gcc.dg/990424-1.c, gcc.dg/990524-1.c, gcc.dg/991230-1.c,
	gcc.dg/i386-387-1.c, gcc.dg/i386-387-2.c, gcc.dg/i386-387-3.c,
	gcc.dg/i386-387-4.c, gcc.dg/i386-387-6.c, gcc.dg/i386-bitfield1.c,
	gcc.dg/i386-bitfield2.c, gcc.dg/i386-loop-1.c,
	gcc.dg/i386-loop-2.c, gcc.dg/i386-loop-3.c, gcc.dg/i386-pic-1.c,
	gcc.dg/i386-regparm.c, gcc.dg/i386-signbit-1.c,
	gcc.dg/i386-signbit-2.c, gcc.dg/i386-sse-5.c, gcc.dg/i386-sse-8.c,
	gcc.dg/i386-unroll-1.c, gcc.dg/tls/opt-1.c, gcc.dg/tls/opt-2.c,
	gcc.dg/unroll-1.c: Handle 32-bit x86-64 compilation.

Index: 20000609-1.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/20000609-1.c,v
retrieving revision 1.3
diff -u -p -r1.3 20000609-1.c
--- 20000609-1.c	17 Nov 2004 17:21:44 -0000	1.3
+++ 20000609-1.c	26 May 2005 17:44:06 -0000
@@ -1,6 +1,7 @@
-/* { dg-do run { target i?86-*-* } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O1 -ffast-math -march=i686" } */
-/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
+
 
 /* Sanity check for fp_jcc_* with TARGET_CMOVE.  */
 
Index: 20000720-1.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/20000720-1.c,v
retrieving revision 1.3
diff -u -p -r1.3 20000720-1.c
--- 20000720-1.c	17 Nov 2004 17:21:44 -0000	1.3
+++ 20000720-1.c	26 May 2005 17:44:06 -0000
@@ -1,5 +1,5 @@
-/* { dg-do compile { target i?86-*-* } } */
-/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-mpreferred-stack-boundary=2 -march=i586 -O2 -fomit-frame-pointer" } */
 
 extern void *foo(void *a, const void *b, unsigned c);
Index: 20011107-1.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/20011107-1.c,v
retrieving revision 1.4
diff -u -p -r1.4 20011107-1.c
--- 20011107-1.c	17 Nov 2004 17:21:44 -0000	1.4
+++ 20011107-1.c	26 May 2005 17:44:06 -0000
@@ -1,5 +1,5 @@
-/* { dg-do compile { target i?86-*-* } } */
-/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2 -mtune=k6" } */
 
 void
Index: 20011119-1.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/20011119-1.c,v
retrieving revision 1.5
diff -u -p -r1.5 20011119-1.c
--- 20011119-1.c	6 Jan 2005 02:32:56 -0000	1.5
+++ 20011119-1.c	26 May 2005 17:44:06 -0000
@@ -1,6 +1,7 @@
 /* Test for reload failing to eliminate from argp to sp.  */
-/* { dg-do run { target i?86-*-* } } */
-/* { dg-skip-if "" { i?86-*-* } { "-m64" "-fpic" "-fPIC" } { "" } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
+/* { dg-skip-if "" { "" } { "-fpic" "-fPIC" } { "" } } */
 /* { dg-options "-O2 -fomit-frame-pointer" } */
 
 static int ustrsize (const char *s);
Index: 20020108-1.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/20020108-1.c,v
retrieving revision 1.4
diff -u -p -r1.4 20020108-1.c
--- 20020108-1.c	17 Nov 2004 17:21:44 -0000	1.4
+++ 20020108-1.c	26 May 2005 17:44:06 -0000
@@ -5,8 +5,9 @@
    is not valid general_operand in HImode.  */
 /* { dg-do compile } */
 /* { dg-options "-O2" } */
-/* { dg-options "-O2 -mtune=i686" { target i?86-*-* } } */
-/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
+/* { dg-options "-O2 -mtune=i686" { target { i?86-*-* && ilp32 } } } */
+/* { dg-options "-O2 -mtune=i686" { target { x86_64-*-* && ilp32 } } } */
+
 
 void
 foo (unsigned short *cp)
Index: 20020122-2.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/20020122-2.c,v
retrieving revision 1.3
diff -u -p -r1.3 20020122-2.c
--- 20020122-2.c	17 Nov 2004 17:21:44 -0000	1.3
+++ 20020122-2.c	26 May 2005 17:44:06 -0000
@@ -3,8 +3,8 @@
   
 /* { dg-do compile } */
 /* { dg-options "-O2 -fprefetch-loop-arrays -w" } */
-/* { dg-options "-O2 -fprefetch-loop-arrays -march=athlon" { target i?86-*-* } } */
-/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
+/* { dg-options "-Os -fprefetch-loop-arrays -mtune=athlon" { target { i?86-*-* && ilp32 } } } */
+/* { dg-options "-Os -fprefetch-loop-arrays -mtune=athlon" { target { x86_64-*-* && ilp32 } } } */
 
 extern int access( char* );
 extern int a();
Index: 20020122-3.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/20020122-3.c,v
retrieving revision 1.4
diff -u -p -r1.4 20020122-3.c
--- 20020122-3.c	17 Nov 2004 17:21:44 -0000	1.4
+++ 20020122-3.c	26 May 2005 17:44:06 -0000
@@ -4,8 +4,8 @@
 
 /* { dg-do compile } */
 /* { dg-options "-Os -fprefetch-loop-arrays -w" } */
-/* { dg-options "-Os -fprefetch-loop-arrays -mtune=pentium3 -w" { target i?86-*-* } } */
-/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
+/* { dg-options "-Os -fprefetch-loop-arrays -mtune=pentium3 -w" { target { i?86-*-* && ilp32 } } } */
+/* { dg-options "-Os -fprefetch-loop-arrays -mtune=pentium3 -w" { target { x86_64-*-* && ilp32 } } } */
 
 int foo (int *p, int n)
 {
Index: 20020201-3.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/20020201-3.c,v
retrieving revision 1.3
diff -u -p -r1.3 20020201-3.c
--- 20020201-3.c	17 Nov 2004 17:21:44 -0000	1.3
+++ 20020201-3.c	26 May 2005 17:44:06 -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-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2 -march=i686 -mmmx -fno-strict-aliasing" } */
 
 struct A { unsigned int a, b; };
Index: 20020206-1.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/20020206-1.c,v
retrieving revision 1.4
diff -u -p -r1.4 20020206-1.c
--- 20020206-1.c	17 Nov 2004 17:21:44 -0000	1.4
+++ 20020206-1.c	26 May 2005 17:44:06 -0000
@@ -4,8 +4,9 @@
 
 /* { dg-do run } */
 /* { dg-options "-O2 -fprefetch-loop-arrays -w" } */
-/* { dg-options "-O2 -fprefetch-loop-arrays -mtune=pentium3 -w" { target i?86-*-* } } */
-/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
+/* { dg-options "-O2 -fprefetch-loop-arrays -mtune=pentium3 -w" { target { i?86-*-* && ilp32 } } } */
+/* { dg-options "-O2 -fprefetch-loop-arrays -mtune=pentium3 -w" { target { x86_64-*-* && ilp32 } } } */
+
 
 struct reload
 {
Index: 20020218-1.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/20020218-1.c,v
retrieving revision 1.3
diff -u -p -r1.3 20020218-1.c
--- 20020218-1.c	17 Nov 2004 17:21:44 -0000	1.3
+++ 20020218-1.c	26 May 2005 17:44:06 -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-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2 -msse" } */
 /* { dg-final { scan-assembler-not "xmm8" } } */
 
Index: 20020310-1.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/20020310-1.c,v
retrieving revision 1.5
diff -u -p -r1.5 20020310-1.c
--- 20020310-1.c	17 Nov 2004 17:21:44 -0000	1.5
+++ 20020310-1.c	26 May 2005 17:44:06 -0000
@@ -2,8 +2,8 @@
    This testcase was miscompiled because of an rtx sharing bug.  */
 /* { dg-do run } */
 /* { dg-options "-O2" } */
-/* { dg-options "-O2 -mtune=i586" { target i?86-*-* } } */
-/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
+/* { dg-options "-O2 -mtune=i586" { target { i?86-*-* && ilp32 } } } */
+/* { dg-options "-O2 -mtune=i586" { target { x86_64-*-* && ilp32 } } } */
 
 struct A
 {
Index: 20020411-1.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/20020411-1.c,v
retrieving revision 1.5
diff -u -p -r1.5 20020411-1.c
--- 20020411-1.c	17 Nov 2004 17:21:44 -0000	1.5
+++ 20020411-1.c	26 May 2005 17:44:06 -0000
@@ -3,8 +3,8 @@
    for its mode.  */
 /* { dg-do compile } */
 /* { dg-options "-O2" } */
-/* { dg-options "-O2 -march=i686" { target i?86-*-* } } */
-/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
+/* { dg-options "-O2 -march=i686" { target { i?86-*-* && ilp32 } } } */
+/* { dg-options "-O2 -march=i686" { target { x86_64-*-* && ilp32 } } } */
 
 #if __INT_MAX__ > 32767
 
Index: 20020418-2.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/20020418-2.c,v
retrieving revision 1.4
diff -u -p -r1.4 20020418-2.c
--- 20020418-2.c	17 Nov 2004 17:21:44 -0000	1.4
+++ 20020418-2.c	26 May 2005 17:44:06 -0000
@@ -1,8 +1,8 @@
 /* PR optimization/6010 */
 /* { dg-do compile } */
 /* { dg-options "-O2 -funroll-all-loops" } */
-/* { dg-options "-O2 -funroll-all-loops -march=pentium3" { target i?86-*-* } } */
-/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
+/* { dg-options "-O2 -funroll-all-loops -march=pentium3" { target { i?86-*-* && ilp32 } } } */
+/* { dg-options "-O2 -funroll-all-loops -march=pentium3" { target { x86_64-*-* && ilp32 } } } */
 
 void bar (float);
 
Index: 20020426-1.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/20020426-1.c,v
retrieving revision 1.4
diff -u -p -r1.4 20020426-1.c
--- 20020426-1.c	17 Nov 2004 17:21:44 -0000	1.4
+++ 20020426-1.c	26 May 2005 17:44:06 -0000
@@ -1,6 +1,6 @@
-/* { dg-do compile { target i?86-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-msoft-float -mfp-ret-in-387" } */
-/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
 
 void f() {
   __builtin_apply(0, 0, 0);
Index: 20020426-2.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/20020426-2.c,v
retrieving revision 1.9
diff -u -p -r1.9 20020426-2.c
--- 20020426-2.c	17 Nov 2004 17:21:44 -0000	1.9
+++ 20020426-2.c	26 May 2005 17:44:06 -0000
@@ -2,8 +2,8 @@
    Distilled from zlib sources.  */
 /* { dg-do run } */
 /* { dg-options "-O2" } */
-/* { dg-options "-O2 -frename-registers -fomit-frame-pointer -fPIC -mtune=i686" { target i?86-*-* } } */
-/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
+/* { dg-options "-O2 -frename-registers -fomit-frame-pointer -fPIC -mtune=i686" { target { i?86-*-* && ilp32 } } } */
+/* { dg-options "-O2 -frename-registers -fomit-frame-pointer -fPIC -mtune=i686" { target { x86_64-*-* && ilp32 } } } */
 /* { 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: 20020517-1.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/20020517-1.c,v
retrieving revision 1.4
diff -u -p -r1.4 20020517-1.c
--- 20020517-1.c	17 Nov 2004 17:21:44 -0000	1.4
+++ 20020517-1.c	26 May 2005 17:44:06 -0000
@@ -2,8 +2,8 @@
    was not sign-extended for QImode.  */
 /* { dg-do run } */
 /* { dg-options "-O2" } */
-/* { dg-options "-O2 -mtune=i686" { target i?86-*-* } } */
-/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
+/* { dg-options "-O2 -mtune=i686" { target { i?86-*-* && ilp32 } } } */
+/* { dg-options "-O2 -mtune=i686" { target { x86_64-*-* && ilp32 } } } */
 
 #include <limits.h>
 
Index: 20020523-1.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/20020523-1.c,v
retrieving revision 1.4
diff -u -p -r1.4 20020523-1.c
--- 20020523-1.c	17 Nov 2004 17:21:44 -0000	1.4
+++ 20020523-1.c	26 May 2005 17:44:06 -0000
@@ -1,8 +1,8 @@
 /* PR target/6753
    This testcase was miscompiled because sse_mov?fcc_const0*
    patterns were missing earlyclobber.  */
-/* { dg-do run { target i386-*-* } } */
-/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-march=pentium3 -msse -ffast-math -O2" } */
 
 extern void abort (void);
Index: 20020523-2.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/20020523-2.c,v
retrieving revision 1.4
diff -u -p -r1.4 20020523-2.c
--- 20020523-2.c	17 Nov 2004 17:21:44 -0000	1.4
+++ 20020523-2.c	26 May 2005 17:44:06 -0000
@@ -1,8 +1,8 @@
 /* PR target/6753
    This testcase was miscompiled because sse_mov?fcc_const0*
    patterns were missing earlyclobber.  */
-/* { dg-do run { target i386-*-* } } */
-/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-march=pentium3 -msse -ffast-math -O2" } */
 
 #include "i386-cpuid.h"
Index: 20020729-1.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/20020729-1.c,v
retrieving revision 1.4
diff -u -p -r1.4 20020729-1.c
--- 20020729-1.c	17 Nov 2004 17:21:44 -0000	1.4
+++ 20020729-1.c	26 May 2005 17:44:06 -0000
@@ -1,5 +1,5 @@
-/* { dg-do compile { target i?86-*-* } } */
-/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2 -march=k6" } */
 
 static inline void *
Index: 20030204-1.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/20030204-1.c,v
retrieving revision 1.3
diff -u -p -r1.3 20030204-1.c
--- 20030204-1.c	17 Nov 2004 17:21:44 -0000	1.3
+++ 20030204-1.c	26 May 2005 17:44:06 -0000
@@ -1,8 +1,9 @@
 /* PR optimization/8555 */
 /* { dg-do compile } */
 /* { dg-options "-O -ffast-math -funroll-loops" } */
-/* { dg-options "-march=pentium3 -O -ffast-math -funroll-loops" { target i?86-*-* } } */
-/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
+/* { dg-options "-march=pentium3 -O -ffast-math -funroll-loops" { target { i?86-*-* && ilp32 } } } */
+/* { dg-options "-march=pentium3 -O -ffast-math -funroll-loops" { target { x86_64-*-* && ilp32 } } } */
+
 
 float foo (float *a, int i)
 {
Index: 20030826-2.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/20030826-2.c,v
retrieving revision 1.3
diff -u -p -r1.3 20030826-2.c
--- 20030826-2.c	17 Nov 2004 17:21:44 -0000	1.3
+++ 20030826-2.c	26 May 2005 17:44:06 -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-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
+/* { dg-options "-O2 -fomit-frame-pointer -march=i386" { target { i?86-*-* && ilp32 } } } */
+/* { dg-options "-O2 -fomit-frame-pointer -march=i386" { target { x86_64-*-* && ilp32 } } } */
 
 extern void abort (void);
 extern void exit (int);
Index: 20030926-1.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/20030926-1.c,v
retrieving revision 1.5
diff -u -p -r1.5 20030926-1.c
--- 20030926-1.c	17 Nov 2004 17:21:44 -0000	1.5
+++ 20030926-1.c	26 May 2005 17:44:06 -0000
@@ -2,7 +2,8 @@
 /* { 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-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
+/* { dg-options "-O2 -minline-all-stringops -march=pentium4" { target { i?86-*-* && ilp32 } } */
+/* { dg-options "-O2 -minline-all-stringops -march=pentium4" { target { x86_64-*-* && ilp32 } } */
 
 extern void *memcpy (void *, const void *, __SIZE_TYPE__);
 extern __SIZE_TYPE__ strlen (const char *);
Index: 20031202-1.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/20031202-1.c,v
retrieving revision 1.4
diff -u -p -r1.4 20031202-1.c
--- 20031202-1.c	17 Nov 2004 17:21:44 -0000	1.4
+++ 20031202-1.c	26 May 2005 17:44:06 -0000
@@ -1,7 +1,7 @@
 /* { dg-do run } */
 /* { dg-options "-O2" } */
-/* { dg-options "-O2 -mtune=i686" { target i?86-*-* } } */
-/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
+/* { dg-options "-O2 -mtune=i686" { target { i?86-*-* && ilp32 } } } */
+/* { dg-options "-O2 -mtune=i686" { target { x86_64-*-* && ilp32 } } } */
 
 extern void abort (void);
 extern void exit (int);
Index: 980312-1.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/980312-1.c,v
retrieving revision 1.6
diff -u -p -r1.6 980312-1.c
--- 980312-1.c	17 Nov 2004 17:21:44 -0000	1.6
+++ 980312-1.c	26 May 2005 17:44:06 -0000
@@ -1,5 +1,5 @@
-/* { dg-do link { target i?86-*-* } } */
-/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
+/* { dg-do link { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2 -march=pentiumpro" } */
 
 extern __inline  double
Index: 980313-1.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/980313-1.c,v
retrieving revision 1.5
diff -u -p -r1.5 980313-1.c
--- 980313-1.c	17 Nov 2004 17:21:44 -0000	1.5
+++ 980313-1.c	26 May 2005 17:44:06 -0000
@@ -1,5 +1,5 @@
-/* { dg-do link { target i?86-*-* } } */
-/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
+/* { dg-do link { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2 -march=pentiumpro" } */
 
 extern __inline  double
Index: 990117-1.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/990117-1.c,v
retrieving revision 1.5
diff -u -p -r1.5 990117-1.c
--- 990117-1.c	17 Nov 2004 17:21:44 -0000	1.5
+++ 990117-1.c	26 May 2005 17:44:06 -0000
@@ -1,5 +1,5 @@
-/* { dg-do compile { target i?86-*-* } } */
-/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2 -march=pentiumpro" } */
 
 extern __inline  double
Index: 990424-1.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/990424-1.c,v
retrieving revision 1.5
diff -u -p -r1.5 990424-1.c
--- 990424-1.c	17 Nov 2004 17:21:44 -0000	1.5
+++ 990424-1.c	26 May 2005 17:44:06 -0000
@@ -1,8 +1,8 @@
 /* Test that stack alignment is preserved with pending_stack_adjust
    with stdcall functions.  */
 
-/* { dg-do run { target i?86-*-* } } */
-/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options -mpreferred-stack-boundary=4 } */
 
 void __attribute__((stdcall)) foo(int a, int b, int c);
Index: 990524-1.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/990524-1.c,v
retrieving revision 1.5
diff -u -p -r1.5 990524-1.c
--- 990524-1.c	17 Nov 2004 17:21:44 -0000	1.5
+++ 990524-1.c	26 May 2005 17:44:06 -0000
@@ -1,5 +1,5 @@
-/* { dg-do compile { target i?86-*-* } } */
-/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2 -march=pentiumpro" } */
 
 typedef struct t_anim_info {
Index: 991230-1.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/991230-1.c,v
retrieving revision 1.5
diff -u -p -r1.5 991230-1.c
--- 991230-1.c	17 Nov 2004 17:21:44 -0000	1.5
+++ 991230-1.c	26 May 2005 17:44:06 -0000
@@ -1,5 +1,5 @@
-/* { dg-do run { target i?86-*-* } } */
-/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O -ffast-math -mtune=i486" } */
 
 /* Test that floating point greater-than tests are compiled correctly with
Index: i386-387-1.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/i386-387-1.c,v
retrieving revision 1.11
diff -u -p -r1.11 i386-387-1.c
--- i386-387-1.c	17 Nov 2004 17:21:44 -0000	1.11
+++ i386-387-1.c	26 May 2005 17:44:07 -0000
@@ -1,6 +1,6 @@
 /* Verify that -mno-fancy-math-387 works.  */
-/* { dg-do compile { target "i?86-*-*" } } */
-/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { 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: i386-387-2.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/i386-387-2.c,v
retrieving revision 1.9
diff -u -p -r1.9 i386-387-2.c
--- i386-387-2.c	17 Nov 2004 17:21:44 -0000	1.9
+++ i386-387-2.c	26 May 2005 17:44:07 -0000
@@ -1,6 +1,6 @@
 /* Verify that -march overrides -mno-fancy-math-387.  */
-/* { dg-do compile { target "i?86-*-*" } } */
-/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O -ffast-math -mfpmath=387 -march=i686 -mno-fancy-math-387" } */
 /* { dg-final { scan-assembler "fsin" } } */
 /* { dg-final { scan-assembler "fcos" } } */
Index: i386-387-3.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/i386-387-3.c,v
retrieving revision 1.3
diff -u -p -r1.3 i386-387-3.c
--- i386-387-3.c	17 Nov 2004 17:21:44 -0000	1.3
+++ i386-387-3.c	26 May 2005 17:44:07 -0000
@@ -1,6 +1,6 @@
 /* Verify that 387 mathematical constants are recognized.  */
-/* { dg-do compile { target "i?86-*-*" } } */
-/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2 -march=i686" } */
 /* { dg-final { scan-assembler "fldpi" } } */
 
Index: i386-387-4.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/i386-387-4.c,v
retrieving revision 1.3
diff -u -p -r1.3 i386-387-4.c
--- i386-387-4.c	17 Nov 2004 17:21:44 -0000	1.3
+++ i386-387-4.c	26 May 2005 17:44:07 -0000
@@ -1,5 +1,5 @@
-/* { dg-do compile { target "i?86-*-*" } } */
-/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2 -march=i686" } */
 /* { dg-final { scan-assembler "fldpi" } } */
 
Index: i386-387-6.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/i386-387-6.c,v
retrieving revision 1.4
diff -u -p -r1.4 i386-387-6.c
--- i386-387-6.c	17 Nov 2004 17:21:44 -0000	1.4
+++ i386-387-6.c	26 May 2005 17:44:07 -0000
@@ -1,6 +1,6 @@
 /* Verify that -march overrides -mno-fancy-math-387.  */
-/* { dg-do compile { target "i?86-*-*" } } */
-/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O -ffast-math -mfpmath=387 -march=i686 -mno-fancy-math-387" } */
 /* { dg-final { scan-assembler "fpatan" } } */
 /* { dg-final { scan-assembler "fyl2xp1" } } */
Index: i386-asm-1.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/i386-asm-1.c,v
retrieving revision 1.5
diff -u -p -r1.5 i386-asm-1.c
--- i386-asm-1.c	17 Nov 2004 17:21:44 -0000	1.5
+++ i386-asm-1.c	26 May 2005 17:44:07 -0000
@@ -1,6 +1,6 @@
 /* PR inline-asm/11676 */
-/* { dg-do run { target i?86-*-* } } */
-/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O2" } */
 
 extern void abort (void);
Index: i386-bitfield1.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/i386-bitfield1.c,v
retrieving revision 1.6
diff -u -p -r1.6 i386-bitfield1.c
--- i386-bitfield1.c	17 Nov 2004 17:21:44 -0000	1.6
+++ i386-bitfield1.c	26 May 2005 17:44:07 -0000
@@ -1,6 +1,6 @@
 // Test for bitfield alignment in structs on IA-32
-// { dg-do run { target i?86-*-* } }
-/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
+// { dg-do run { target i?86-*-* x86_64-*-* } }
+// { dg-require-effective-target ilp32 }
 // { dg-options "-O2" }
 // { dg-options "-mno-align-double -mno-ms-bitfields" { target i?86-*-interix* i?86-*-cygwin* i?86-*-mingw*} }
 
Index: i386-bitfield2.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/i386-bitfield2.c,v
retrieving revision 1.4
diff -u -p -r1.4 i386-bitfield2.c
--- i386-bitfield2.c	17 Nov 2004 17:21:44 -0000	1.4
+++ i386-bitfield2.c	26 May 2005 17:44:07 -0000
@@ -1,6 +1,6 @@
 // Test for bitfield alignment in structs on IA-32
-// { dg-do run { target i?86-*-* } }
-/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
+// { dg-do run { target i?86-*-* x86_64-*-* } }
+// { dg-require-effective-target ilp32 }
 // { dg-options "-O2" }
 // { dg-options "-mno-align-double -mno-ms-bitfields" { target i?86-*-interix* i?86-*-cygwin* i?86-*-mingw* } }
 
Index: i386-loop-1.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/i386-loop-1.c,v
retrieving revision 1.3
diff -u -p -r1.3 i386-loop-1.c
--- i386-loop-1.c	17 Nov 2004 17:21:44 -0000	1.3
+++ i386-loop-1.c	26 May 2005 17:44:07 -0000
@@ -1,6 +1,6 @@
 /* PR optimization/9888 */
-/* { dg-do run { target i?86-*-* } } */
-/* { dg-xfail-if "" { *-*-* } { "-m64" } { "" } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-mtune=k6 -O3" } */
 
 /* Verify that GCC doesn't emit out of range 'loop' instructions.  */
Index: i386-loop-2.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/i386-loop-2.c,v
retrieving revision 1.3
diff -u -p -r1.3 i386-loop-2.c
--- i386-loop-2.c	17 Nov 2004 17:21:44 -0000	1.3
+++ i386-loop-2.c	26 May 2005 17:44:07 -0000
@@ -1,7 +1,7 @@
 /* PR optimization/9888 */
 /* Originator: Jim Bray <jb@as220.org> */
-/* { dg-do run { target i?86-*-* } } */
-/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-mtune=k6 -Os" } */
 
 enum reload_type
Index: i386-loop-3.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/i386-loop-3.c,v
retrieving revision 1.4
diff -u -p -r1.4 i386-loop-3.c
--- i386-loop-3.c	17 Nov 2004 17:21:44 -0000	1.4
+++ i386-loop-3.c	26 May 2005 17:44:07 -0000
@@ -1,8 +1,8 @@
 /* PR target/11044 */
 /* Originator: Tim McGrath <misty-@charter.net> */
 /* Testcase contributed by Eric Botcazou <ebotcazou@libertysurf.fr> */
-/* { dg-do run { target i?86-*-* } } */
-/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-mtune=k6 -O3 -ffast-math -funroll-loops" } */
 
 extern void *memset (void *, int, __SIZE_TYPE__);
Index: i386-pentium4-not-mull.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/i386-pentium4-not-mull.c,v
retrieving revision 1.4
diff -u -p -r1.4 i386-pentium4-not-mull.c
--- i386-pentium4-not-mull.c	17 Nov 2004 17:21:44 -0000	1.4
+++ i386-pentium4-not-mull.c	26 May 2005 17:44:07 -0000
@@ -1,7 +1,6 @@
 /* { dg-do compile { target i?86-*-* x86_64-*-* } } */
-/* { dg-options "-O2 -march=pentium4" { target i?86-*-* } } */
-/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
-/* { dg-options "-O2 -march=pentium4 -m32" { target x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
+/* { dg-options "-O2 -march=pentium4" } */
 /* { dg-final { scan-assembler-not "imull" } } */
 
 /* Should be done not using imull.  */
Index: i386-pic-1.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/i386-pic-1.c,v
retrieving revision 1.3
diff -u -p -r1.3 i386-pic-1.c
--- i386-pic-1.c	17 Nov 2004 17:21:45 -0000	1.3
+++ i386-pic-1.c	26 May 2005 17:44:07 -0000
@@ -1,6 +1,6 @@
 /* PR target/8340 */
-/* { dg-do compile { target i?86-*-* } } */
-/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-fPIC" } */
 
 int foo ()
Index: i386-regparm.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/i386-regparm.c,v
retrieving revision 1.4
diff -u -p -r1.4 i386-regparm.c
--- i386-regparm.c	17 Nov 2004 17:21:45 -0000	1.4
+++ i386-regparm.c	26 May 2005 17:44:07 -0000
@@ -1,5 +1,5 @@
-/* { dg-do compile { target i?86-*-* } } */
-/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-W -Wall" } */
 
 /* Verify that GCC correctly detects non-matching regparm attributes.  */
Index: i386-signbit-1.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/i386-signbit-1.c,v
retrieving revision 1.4
diff -u -p -r1.4 i386-signbit-1.c
--- i386-signbit-1.c	17 Nov 2004 17:21:45 -0000	1.4
+++ i386-signbit-1.c	26 May 2005 17:44:07 -0000
@@ -1,6 +1,6 @@
 /* PR optimization/8746 */
-/* { dg-do run { target i?86-*-* } } */
-/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O1 -mtune=i586" } */
 
 extern void abort (void);
Index: i386-signbit-2.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/i386-signbit-2.c,v
retrieving revision 1.3
diff -u -p -r1.3 i386-signbit-2.c
--- i386-signbit-2.c	17 Nov 2004 17:21:45 -0000	1.3
+++ i386-signbit-2.c	26 May 2005 17:44:07 -0000
@@ -1,6 +1,6 @@
 /* PR optimization/8746 */
-/* { dg-do run { target i?86-*-* } } */
-/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O1 -mtune=i586" } */
 
 extern void abort (void);
Index: i386-signbit-3.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/i386-signbit-3.c,v
retrieving revision 1.3
diff -u -p -r1.3 i386-signbit-3.c
--- i386-signbit-3.c	17 Nov 2004 17:21:45 -0000	1.3
+++ i386-signbit-3.c	26 May 2005 17:44:07 -0000
@@ -1,6 +1,6 @@
 /* PR optimization/8746 */
-/* { dg-do run { target i?86-*-* } } */
-/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O1 -mtune=i586" } */
 
 extern void abort (void);
Index: i386-sse-5.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/i386-sse-5.c,v
retrieving revision 1.4
diff -u -p -r1.4 i386-sse-5.c
--- i386-sse-5.c	17 Nov 2004 17:21:45 -0000	1.4
+++ i386-sse-5.c	26 May 2005 17:44:07 -0000
@@ -1,6 +1,7 @@
-/* { dg-do compile { target i?86-*-* } } */
-/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-Winline -O2 -march=i386" } */
+
 typedef double v2df __attribute__ ((vector_size (16)));
 v2df p;
 q(v2df t)
Index: i386-sse-8.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/i386-sse-8.c,v
retrieving revision 1.7
diff -u -p -r1.7 i386-sse-8.c
--- i386-sse-8.c	17 Nov 2004 17:21:45 -0000	1.7
+++ i386-sse-8.c	26 May 2005 17:44:07 -0000
@@ -4,8 +4,8 @@
 /* The xstormy16 doesn't support V2DI.  */
 /* { dg-do compile { xfail xstormy16-*-* } } */
 /* { dg-options "" } */
-/* { dg-options "-march=pentium3" { target i?86-*-* } } */
-/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
+/* { dg-options "-march=pentium3" { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 
 int main() 
 { 
Index: i386-unroll-1.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/i386-unroll-1.c,v
retrieving revision 1.4
diff -u -p -r1.4 i386-unroll-1.c
--- i386-unroll-1.c	17 Nov 2004 17:21:45 -0000	1.4
+++ i386-unroll-1.c	26 May 2005 17:44:07 -0000
@@ -1,6 +1,6 @@
 /* PR optimization/8599 */
-/* { dg-do run { target i?86-*-* } } */
-/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-mtune=k6 -O2 -funroll-loops" } */
 
 extern void exit (int);
Index: setjmp-2.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/setjmp-2.c,v
retrieving revision 1.1
diff -u -p -r1.1 setjmp-2.c
--- setjmp-2.c	23 Nov 2004 13:08:32 -0000	1.1
+++ setjmp-2.c	26 May 2005 17:44:07 -0000
@@ -1,8 +1,8 @@
 /* PR middle-end/17813 */
 /* Origin: Tom Hughes <tom@compton.nu> */
 /* { dg-do run { target i?86-*-linux* x86_64-*-linux* } } */
-/* { dg-options "-O -fomit-frame-pointer -march=i386" { target i?86-*-linux* } } */
-/* { dg-options "-O -fomit-frame-pointer -m32 -march=i386" { target x86_64-*-linux* } } */
+/* { dg-options "-O -fomit-frame-pointer -march=i386" { target { i?86-*-linux* && ilp32 } } } */
+/* { dg-options "-O -fomit-frame-pointer -march=i386" { target { x86_64-*-linux* && ilp32 } } } */
 
 #include <setjmp.h>
 #include <signal.h>
Index: short-compare-1.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/short-compare-1.c,v
retrieving revision 1.2
diff -u -p -r1.2 short-compare-1.c
--- short-compare-1.c	6 Apr 2005 17:07:07 -0000	1.2
+++ short-compare-1.c	26 May 2005 17:44:07 -0000
@@ -4,7 +4,7 @@
 /* { dg-do run } */
 /* { dg-options "-O" } */
 /* { dg-options "-O -mtune=i686" { target { i?86-*-* && ilp32 } } } */
-/* { dg-options "-O -m32 -mtune=i686" { target x86_64-*-* } } */
+/* { dg-options "-O -mtune=i686" { target { x86_64-*-* && ilp32 } } } */
 
 extern void abort(void);
 
Index: short-compare-2.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/short-compare-2.c,v
retrieving revision 1.2
diff -u -p -r1.2 short-compare-2.c
--- short-compare-2.c	6 Apr 2005 17:07:07 -0000	1.2
+++ short-compare-2.c	26 May 2005 17:44:07 -0000
@@ -5,7 +5,7 @@
 /* { dg-do run } */
 /* { dg-options "-O" } */
 /* { dg-options "-O -mtune=i686" { target { i?86-*-* && ilp32 } } } */
-/* { dg-options "-O -m32 -mtune=i686" { target x86_64-*-* } } */
+/* { dg-options "-O -mtune=i686" { target { x86_64-*-* && ilp32 } } } */
 
 extern void abort();
 
Index: unroll-1.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/unroll-1.c,v
retrieving revision 1.4
diff -u -p -r1.4 unroll-1.c
--- unroll-1.c	17 Nov 2004 17:21:45 -0000	1.4
+++ unroll-1.c	26 May 2005 17:44:07 -0000
@@ -1,8 +1,9 @@
 /* PR optimization/8599 */
 /* { dg-do run } */
 /* { dg-options "-O2 -funroll-loops" } */
-/* { dg-options "-mtune=k6 -O2 -funroll-loops" { target i?86-*-* } } */
-/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
+/* { dg-options "-mtune=k6 -O2 -funroll-loops" { target { i?86-*-* && ilp32 } } */
+/* { dg-options "-mtune=k6 -O2 -funroll-loops" { target { x86_64-*-* && ilp32 } } */
+
 
 extern void abort (void);
 
Index: tls/opt-1.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/tls/opt-1.c,v
retrieving revision 1.4
diff -u -p -r1.4 opt-1.c
--- tls/opt-1.c	17 Nov 2004 17:21:45 -0000	1.4
+++ tls/opt-1.c	26 May 2005 17:44:07 -0000
@@ -1,7 +1,7 @@
 /* { dg-do compile } */
 /* { dg-options "-O2 -fPIC" } */
-/* { dg-options "-O2 -fPIC -mtune=i686" { target i?86-*-* } } */
-/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
+/* { dg-options "-O2 -fPIC -mtune=i686" { target i?86-*-* && ilp32 } } */
+/* { dg-options "-O2 -fPIC -mtune=i686" { target x86_64-*-* && ilp32 } } */
 
 extern __thread int thr;
 
Index: tls/opt-2.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/tls/opt-2.c,v
retrieving revision 1.3
diff -u -p -r1.3 opt-2.c
--- tls/opt-2.c	17 Nov 2004 17:21:45 -0000	1.3
+++ tls/opt-2.c	26 May 2005 17:44:07 -0000
@@ -4,8 +4,8 @@
    on IA-32.  */
 /* { dg-do link } */
 /* { dg-options "-O2 -ftls-model=initial-exec" } */
-/* { dg-options "-O2 -ftls-model=initial-exec -march=i686" { target i?86-*-* } } */
-/* { dg-skip-if "" { i?86-*-* } { "-m64" } { "" } } */
+/* { dg-options "-O2 -ftls-model=initial-exec -march=i686" { target { i?86-*-* && ilp32 } } } */
+/* { dg-options "-O2 -ftls-model=initial-exec -march=i686" { target { x86_64-*-* && ilp32 } } } */
 
 __thread int thr;
 


-- 
 Andreas Jaeger, aj@suse.de, http://www.suse.de/~aj
  SUSE Linux Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
   GPG fingerprint = 93A3 365E CE47 B889 DF7F  FED1 389A 563C C272 A126

Attachment: pgp00000.pgp
Description: PGP signature