[testsuite patch]: Add target x86_64 and/or merge with i?86 cases
Kaveh R. Ghazi
ghazi@caipclassic.rutgers.edu
Fri Dec 9 02:52:00 GMT 2005
This patch is similar to my last one but now I start to modify how the
testsuite runs. We either add x86_64 if it was missing or we merge:
blah blah { target i?86-*-* } // Note no ilp32 here!!!
blah blah { target { x86_64-*-* && ilp32 } }
into this:
blah blah { target { { i?86-*-* x86_64-*-* } && ilp32 } }
I.e. we're restricting the i?86 case to ilp32 under the assumption
that if x86_64 needed that, then i?86 won't work with -m64. Also
I added one "target fpic".
Tested via mainline "make check" on i686-unknown-linux-gnu.
Okay for mainline/4.1/4.0?
Thanks,
--Kaveh
2005-12-07 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* g++.dg/eh/simd-1.C, g++.dg/eh/simd-2.C, g++.dg/opt/inline9.C,
gcc.dg/20020418-1.c, gcc.dg/20031102-1.c, gcc.dg/ia64-sync-1.c,
gcc.dg/ia64-sync-2.c, gcc.dg/ia64-sync-3.c, gcc.dg/ia64-sync-4.c,
gcc.dg/ifcvt-fabs-1.c, gcc.dg/loop-3.c, gcc.dg/nested-calls-1.c,
gcc.dg/pr20017.c, gcc.dg/smod-1.c, gcc.dg/sync-2.c,
gcc.dg/tls/opt-3.c, gcc.dg/torture/badshift.c: Add x86_64 cases
and/or merge with i?86 cases.
* gcc.dg/tls/opt-3.c: Require effective target fpic.
diff -rup orig/egcc-SVN20051206/gcc/testsuite/g++.dg/eh/simd-1.C egcc-SVN20051206/gcc/testsuite/g++.dg/eh/simd-1.C
--- orig/egcc-SVN20051206/gcc/testsuite/g++.dg/eh/simd-1.C 2005-11-03 10:38:54.000000000 -0500
+++ egcc-SVN20051206/gcc/testsuite/g++.dg/eh/simd-1.C 2005-12-07 08:37:42.000000000 -0500
@@ -1,8 +1,7 @@
// Test EH when V2SI SIMD registers are involved.
// Contributed by Aldy Hernandez (aldy@quesejoda.com).
// { dg-options "-O" }
-// { dg-options "-O -w" { target i?86-*-* } }
-// { dg-options "-O -w" { target { x86_64-*-* && ilp32 } } }
+// { dg-options "-O -w" { target { { i?86-*-* x86_64-*-* } && ilp32 } } }
// { dg-do run }
typedef int __attribute__((vector_size (8))) vecint;
diff -rup orig/egcc-SVN20051206/gcc/testsuite/g++.dg/eh/simd-2.C egcc-SVN20051206/gcc/testsuite/g++.dg/eh/simd-2.C
--- orig/egcc-SVN20051206/gcc/testsuite/g++.dg/eh/simd-2.C 2005-11-15 20:00:54.000000000 -0500
+++ egcc-SVN20051206/gcc/testsuite/g++.dg/eh/simd-2.C 2005-12-07 08:37:42.000000000 -0500
@@ -1,8 +1,7 @@
// Test EH when V4SI SIMD registers are involved.
// Contributed by Aldy Hernandez (aldy@quesejoda.com).
// { dg-options "-O" }
-// { dg-options "-O -w" { target i?86-*-* } }
-// { dg-options "-O -w" { target { x86_64-*-* && ilp32 } } }
+// { dg-options "-O -w" { target { { i?86-*-* x86_64-*-* } && ilp32 } } }
// { dg-options "-O -w -maltivec" { target powerpc*-*-linux* } }
// { dg-xfail-if "" { "powerpc-*-eabispe*" "powerpc-ibm-aix*" } { "*" } { "" } }
// { dg-do run }
diff -rup orig/egcc-SVN20051206/gcc/testsuite/g++.dg/opt/inline9.C egcc-SVN20051206/gcc/testsuite/g++.dg/opt/inline9.C
--- orig/egcc-SVN20051206/gcc/testsuite/g++.dg/opt/inline9.C 2005-11-03 10:38:55.000000000 -0500
+++ egcc-SVN20051206/gcc/testsuite/g++.dg/opt/inline9.C 2005-12-07 08:37:42.000000000 -0500
@@ -3,7 +3,7 @@
// Testcase by Alan Modra <amodra@bigpond.net.au>
// { dg-do run }
// { dg-options "-O" }
-// { dg-options "-O -mtune=i686" { target i?86-*-* } }
+// { dg-options "-O -mtune=i686" { target { { i?86-*-* x86_64-*-* } && ilp32 } } }
struct thread_info
{
diff -rup orig/egcc-SVN20051206/gcc/testsuite/gcc.dg/20020418-1.c egcc-SVN20051206/gcc/testsuite/gcc.dg/20020418-1.c
--- orig/egcc-SVN20051206/gcc/testsuite/gcc.dg/20020418-1.c 2005-11-03 10:38:18.000000000 -0500
+++ egcc-SVN20051206/gcc/testsuite/gcc.dg/20020418-1.c 2005-12-07 08:37:42.000000000 -0500
@@ -1,7 +1,7 @@
/* PR optimization/5887 */
/* { dg-do compile } */
/* { dg-options "-O2" } */
-/* { dg-options "-O2 -msse -ffast-math" { target i?86-*-* } } */
+/* { dg-options "-O2 -msse -ffast-math" { target i?86-*-* x86_64-*-* } } */
void bar (float *a, float *b);
diff -rup orig/egcc-SVN20051206/gcc/testsuite/gcc.dg/20031102-1.c egcc-SVN20051206/gcc/testsuite/gcc.dg/20031102-1.c
--- orig/egcc-SVN20051206/gcc/testsuite/gcc.dg/20031102-1.c 2005-11-03 10:38:19.000000000 -0500
+++ egcc-SVN20051206/gcc/testsuite/gcc.dg/20031102-1.c 2005-12-07 08:37:42.000000000 -0500
@@ -3,7 +3,7 @@
/* { dg-do run } */
/* { dg-options "-O2" } */
-/* { dg-options "-O2 -march=i686" { target i686-*-* } } */
+/* { dg-options "-O2 -march=i686" { target { { i686-*-* x86_64-*-* } && ilp32 } } } */
/* Verify that reload_cse_move2add doesn't add unexpected CLOBBERs. */
diff -rup orig/egcc-SVN20051206/gcc/testsuite/gcc.dg/ia64-sync-1.c egcc-SVN20051206/gcc/testsuite/gcc.dg/ia64-sync-1.c
--- orig/egcc-SVN20051206/gcc/testsuite/gcc.dg/ia64-sync-1.c 2005-11-03 10:38:19.000000000 -0500
+++ egcc-SVN20051206/gcc/testsuite/gcc.dg/ia64-sync-1.c 2005-12-07 08:37:42.000000000 -0500
@@ -1,8 +1,7 @@
/* { dg-do run } */
/* { dg-require-effective-target sync_int_long } */
/* { dg-options } */
-/* { dg-options "-march=i486" { target i?86-*-* } } */
-/* { dg-options "-march=i486" { target { x86_64-*-* && ilp32 } } } */
+/* { dg-options "-march=i486" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
/* Test basic functionality of the intrinsics. The operations should
not be optimized away if no one checks the return values. */
diff -rup orig/egcc-SVN20051206/gcc/testsuite/gcc.dg/ia64-sync-2.c egcc-SVN20051206/gcc/testsuite/gcc.dg/ia64-sync-2.c
--- orig/egcc-SVN20051206/gcc/testsuite/gcc.dg/ia64-sync-2.c 2005-11-03 10:38:18.000000000 -0500
+++ egcc-SVN20051206/gcc/testsuite/gcc.dg/ia64-sync-2.c 2005-12-07 08:37:42.000000000 -0500
@@ -1,8 +1,7 @@
/* { dg-do run } */
/* { dg-require-effective-target sync_int_long } */
/* { dg-options } */
-/* { dg-options "-march=i486" { target i?86-*-* } } */
-/* { dg-options "-march=i486" { target { x86_64-*-* && ilp32 } } } */
+/* { dg-options "-march=i486" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
/* Test basic functionality of the intrinsics. */
diff -rup orig/egcc-SVN20051206/gcc/testsuite/gcc.dg/ia64-sync-3.c egcc-SVN20051206/gcc/testsuite/gcc.dg/ia64-sync-3.c
--- orig/egcc-SVN20051206/gcc/testsuite/gcc.dg/ia64-sync-3.c 2005-11-03 10:38:19.000000000 -0500
+++ egcc-SVN20051206/gcc/testsuite/gcc.dg/ia64-sync-3.c 2005-12-07 08:37:42.000000000 -0500
@@ -1,8 +1,7 @@
/* { dg-do run } */
/* { dg-require-effective-target sync_int_long } */
/* { dg-options } */
-/* { dg-options "-march=i486" { target i?86-*-* } } */
-/* { dg-options "-march=i486" { target { x86_64-*-* && ilp32 } } } */
+/* { dg-options "-march=i486" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
/* Test basic functionality of the intrinsics. */
diff -rup orig/egcc-SVN20051206/gcc/testsuite/gcc.dg/ia64-sync-4.c egcc-SVN20051206/gcc/testsuite/gcc.dg/ia64-sync-4.c
--- orig/egcc-SVN20051206/gcc/testsuite/gcc.dg/ia64-sync-4.c 2005-11-03 10:38:18.000000000 -0500
+++ egcc-SVN20051206/gcc/testsuite/gcc.dg/ia64-sync-4.c 2005-12-07 08:37:42.000000000 -0500
@@ -1,8 +1,7 @@
/* { dg-do compile } */
/* { dg-require-effective-target sync_int_long } */
/* { dg-options "-O2 -finline-functions" } */
-/* { dg-options "-march=i486" { target i?86-*-* } } */
-/* { dg-options "-march=i486" { target { x86_64-*-* && ilp32 } } } */
+/* { dg-options "-march=i486" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
/* Test inlining __sync_bool_compare_and_swap. */
diff -rup orig/egcc-SVN20051206/gcc/testsuite/gcc.dg/ifcvt-fabs-1.c egcc-SVN20051206/gcc/testsuite/gcc.dg/ifcvt-fabs-1.c
--- orig/egcc-SVN20051206/gcc/testsuite/gcc.dg/ifcvt-fabs-1.c 2005-11-09 20:00:36.000000000 -0500
+++ egcc-SVN20051206/gcc/testsuite/gcc.dg/ifcvt-fabs-1.c 2005-12-07 08:37:42.000000000 -0500
@@ -1,6 +1,6 @@
/* { dg-do run } */
/* { dg-options "-O" } */
-/* { dg-options "-O -march=i686" { target i686-*-* } } */
+/* { dg-options "-O -march=i686" { target { { i686-*-* x86_64-*-* } && ilp32 } } } */
extern void abort(void);
diff -rup orig/egcc-SVN20051206/gcc/testsuite/gcc.dg/loop-3.c egcc-SVN20051206/gcc/testsuite/gcc.dg/loop-3.c
--- orig/egcc-SVN20051206/gcc/testsuite/gcc.dg/loop-3.c 2005-11-03 10:38:18.000000000 -0500
+++ egcc-SVN20051206/gcc/testsuite/gcc.dg/loop-3.c 2005-12-07 08:37:42.000000000 -0500
@@ -3,7 +3,7 @@
/* { dg-do compile } */
/* { dg-options "-O3" } */
-/* { dg-options "-O3 -mtune=i386" { target { i?86-*-* && ilp32 } } } */
+/* { dg-options "-O3 -mtune=i386" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
#if defined(STACK_SIZE) && (STACK_SIZE < 65536)
# define BYTEMEM_SIZE 10000L
diff -rup orig/egcc-SVN20051206/gcc/testsuite/gcc.dg/nested-calls-1.c egcc-SVN20051206/gcc/testsuite/gcc.dg/nested-calls-1.c
--- orig/egcc-SVN20051206/gcc/testsuite/gcc.dg/nested-calls-1.c 2005-11-13 20:00:35.000000000 -0500
+++ egcc-SVN20051206/gcc/testsuite/gcc.dg/nested-calls-1.c 2005-12-07 08:37:42.000000000 -0500
@@ -3,7 +3,7 @@
/* { dg-do run } */
/* { dg-options "-std=c99 -O -fno-inline" } */
-/* { dg-options "-std=c99 -O -fno-inline -mtune=i686" { target { i?86-*-* && ilp32 } } } */
+/* { dg-options "-std=c99 -O -fno-inline -mtune=i686" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
#include <limits.h>
diff -rup orig/egcc-SVN20051206/gcc/testsuite/gcc.dg/pr20017.c egcc-SVN20051206/gcc/testsuite/gcc.dg/pr20017.c
--- orig/egcc-SVN20051206/gcc/testsuite/gcc.dg/pr20017.c 2005-11-03 10:38:19.000000000 -0500
+++ egcc-SVN20051206/gcc/testsuite/gcc.dg/pr20017.c 2005-12-07 08:37:42.000000000 -0500
@@ -6,7 +6,7 @@
/* { dg-do compile } */
/* { dg-options "-O1" } */
-/* { dg-options "-O1 -march=i386" { target { i?86-*-* && ilp32 } } } */
+/* { dg-options "-O1 -march=i386" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
int
foo (int *buf, int *p)
diff -rup orig/egcc-SVN20051206/gcc/testsuite/gcc.dg/smod-1.c egcc-SVN20051206/gcc/testsuite/gcc.dg/smod-1.c
--- orig/egcc-SVN20051206/gcc/testsuite/gcc.dg/smod-1.c 2005-11-03 10:38:18.000000000 -0500
+++ egcc-SVN20051206/gcc/testsuite/gcc.dg/smod-1.c 2005-12-07 08:37:42.000000000 -0500
@@ -3,7 +3,7 @@
/* { dg-do run } */
/* { dg-options "-std=c99" } */
-/* { dg-options "-std=c99 -mtune=i486" { target { i?86-*-* && ilp32 } } } */
+/* { dg-options "-std=c99 -mtune=i486" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
#include <limits.h>
diff -rup orig/egcc-SVN20051206/gcc/testsuite/gcc.dg/sync-2.c egcc-SVN20051206/gcc/testsuite/gcc.dg/sync-2.c
--- orig/egcc-SVN20051206/gcc/testsuite/gcc.dg/sync-2.c 2005-11-03 10:38:19.000000000 -0500
+++ egcc-SVN20051206/gcc/testsuite/gcc.dg/sync-2.c 2005-12-07 08:37:42.000000000 -0500
@@ -1,7 +1,6 @@
/* { dg-do run } */
/* { dg-require-effective-target sync_char_short } */
-/* { dg-options "-march=i486" { target i?86-*-* } } */
-/* { dg-options "-march=i486" { target { x86_64-*-* && ilp32 } } } */
+/* { dg-options "-march=i486" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
/* Test functionality of the intrinsics for 'short' and 'char'. */
diff -rup orig/egcc-SVN20051206/gcc/testsuite/gcc.dg/tls/opt-3.c egcc-SVN20051206/gcc/testsuite/gcc.dg/tls/opt-3.c
--- orig/egcc-SVN20051206/gcc/testsuite/gcc.dg/tls/opt-3.c 2005-12-01 20:00:53.000000000 -0500
+++ egcc-SVN20051206/gcc/testsuite/gcc.dg/tls/opt-3.c 2005-12-07 08:37:42.000000000 -0500
@@ -1,7 +1,8 @@
/* { dg-do compile } */
/* { dg-options "-O2 -fpic" } */
-/* { dg-options "-O2 -fpic -mregparm=3" { target i?86-*-* } } */
+/* { dg-options "-O2 -fpic -mregparm=3" { target i?86-*-* x86_64-*-* } } */
/* { dg-require-effective-target tls } */
+/* { dg-require-effective-target fpic } */
extern __thread int i, j, k;
extern void bar(int *, int *, int *);
diff -rup orig/egcc-SVN20051206/gcc/testsuite/gcc.dg/torture/badshift.c egcc-SVN20051206/gcc/testsuite/gcc.dg/torture/badshift.c
--- orig/egcc-SVN20051206/gcc/testsuite/gcc.dg/torture/badshift.c 2005-11-03 10:37:57.000000000 -0500
+++ egcc-SVN20051206/gcc/testsuite/gcc.dg/torture/badshift.c 2005-12-07 08:37:42.000000000 -0500
@@ -2,7 +2,7 @@
/* { dg-do run } */
/* { dg-options "" } */
-/* { dg-options "-march=i386" { target { i?86-*-* && ilp32 } } } */
+/* { dg-options "-march=i386" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
/* We used to optimize the DImode shift-by-32 to zero because in combine
we turned:
More information about the Gcc-patches
mailing list