re PR testsuite/20772 (x86 tests should run on both i?86 and x86_64)

	PR testsuite/20772
	* 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.

From-SVN: r108324

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 02ed38b011910d6abf9523c60aa416a18e17c8aa..c0944be98663ed3e372e96e8855edf990e0d2a53 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,16 @@
 2005-12-09  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
+       PR testsuite/20772
+       * 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.
+
        PR testsuite/20772
        * g++.dg/opt/life1.C, g++.old-deja/g++.abi/aggregates.C,
        g++.old-deja/g++.abi/align.C, g++.old-deja/g++.abi/bitfields.C,

diff --git a/gcc/testsuite/g++.dg/eh/simd-1.C b/gcc/testsuite/g++.dg/eh/simd-1.C
index e7c30dbf3bdae0e66e5b81fbe299cdfc6315c615..465b7826da09b516abe97a66914d6c40b720f7c9 100644 (file)
--- a/gcc/testsuite/g++.dg/eh/simd-1.C
+++ b/gcc/testsuite/g++.dg/eh/simd-1.C
@@ -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 --git a/gcc/testsuite/g++.dg/eh/simd-2.C b/gcc/testsuite/g++.dg/eh/simd-2.C
index bac1d765732036e34b77ebc66b35c623a793df8c..813930faebae13afebffdc85f8f61fa7ba639617 100644 (file)
--- a/gcc/testsuite/g++.dg/eh/simd-2.C
+++ b/gcc/testsuite/g++.dg/eh/simd-2.C
@@ -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 --git a/gcc/testsuite/g++.dg/opt/inline9.C b/gcc/testsuite/g++.dg/opt/inline9.C
index 10ccb47dc79f780ebbea1248a8cc9b7fc889cd39..10bc54ccd95ded0650ed5a67a20d5ce225624b5b 100644 (file)
--- a/gcc/testsuite/g++.dg/opt/inline9.C
+++ b/gcc/testsuite/g++.dg/opt/inline9.C
@@ -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 --git a/gcc/testsuite/gcc.dg/20020418-1.c b/gcc/testsuite/gcc.dg/20020418-1.c
index 308bfa3a266aec0e3aa698129fcc6413c1d3c9bb..7314ec000ef2aedf85c33a6d12a343cbd501590c 100644 (file)
--- a/gcc/testsuite/gcc.dg/20020418-1.c
+++ b/gcc/testsuite/gcc.dg/20020418-1.c
@@ -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 --git a/gcc/testsuite/gcc.dg/20031102-1.c b/gcc/testsuite/gcc.dg/20031102-1.c
index 4da4e6a8cc01e1e7374dc194e3e089f7fa411291..5a02a704a26f7c6c9d2c0c829293bce2208023ef 100644 (file)
--- a/gcc/testsuite/gcc.dg/20031102-1.c
+++ b/gcc/testsuite/gcc.dg/20031102-1.c
@@ -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 --git a/gcc/testsuite/gcc.dg/ia64-sync-1.c b/gcc/testsuite/gcc.dg/ia64-sync-1.c
index f58f8cb80c3d92d21c54e715b2b6dbd04462d7d7..af1411c81a88042a4b40df51e2ea4b83d616eeb5 100644 (file)
--- a/gcc/testsuite/gcc.dg/ia64-sync-1.c
+++ b/gcc/testsuite/gcc.dg/ia64-sync-1.c
@@ -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 --git a/gcc/testsuite/gcc.dg/ia64-sync-2.c b/gcc/testsuite/gcc.dg/ia64-sync-2.c
index 000a2678fea5dada6caf42d738fe314ac7f8a1b6..73e793f91c728db14347f7335461711927bdcf5a 100644 (file)
--- a/gcc/testsuite/gcc.dg/ia64-sync-2.c
+++ b/gcc/testsuite/gcc.dg/ia64-sync-2.c
@@ -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 --git a/gcc/testsuite/gcc.dg/ia64-sync-3.c b/gcc/testsuite/gcc.dg/ia64-sync-3.c
index 46f6294aac23fd90c2ccfcebce770669bb4be86a..9e8d40c91687e9ac94d8eaf87fef12ae59238f86 100644 (file)
--- a/gcc/testsuite/gcc.dg/ia64-sync-3.c
+++ b/gcc/testsuite/gcc.dg/ia64-sync-3.c
@@ -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 --git a/gcc/testsuite/gcc.dg/ia64-sync-4.c b/gcc/testsuite/gcc.dg/ia64-sync-4.c
index baeb8527c8739479038b998917f85946007666f2..8cd3940a89c101bdae53f9dbb27bdde2f21b3939 100644 (file)
--- a/gcc/testsuite/gcc.dg/ia64-sync-4.c
+++ b/gcc/testsuite/gcc.dg/ia64-sync-4.c
@@ -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 --git a/gcc/testsuite/gcc.dg/ifcvt-fabs-1.c b/gcc/testsuite/gcc.dg/ifcvt-fabs-1.c
index 6808a8f584391f3d4552db61abc59fd1a43dd2a6..bdf6b3975a29fa78df6ad1f3bab8c9f46c8a6187 100644 (file)
--- a/gcc/testsuite/gcc.dg/ifcvt-fabs-1.c
+++ b/gcc/testsuite/gcc.dg/ifcvt-fabs-1.c
@@ -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 --git a/gcc/testsuite/gcc.dg/loop-3.c b/gcc/testsuite/gcc.dg/loop-3.c
index f7ceaddb8994e9fbdc76b4ebfcdc2d47a50e3233..06428d92feb8e6778b60bb788d74c020c8835e27 100644 (file)
--- a/gcc/testsuite/gcc.dg/loop-3.c
+++ b/gcc/testsuite/gcc.dg/loop-3.c
@@ -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 --git a/gcc/testsuite/gcc.dg/nested-calls-1.c b/gcc/testsuite/gcc.dg/nested-calls-1.c
index b3f08becac0cad92d6c3054482d051134ae82575..89fdc88c6302b2282146b254a7c1a27295a3a7d9 100644 (file)
--- a/gcc/testsuite/gcc.dg/nested-calls-1.c
+++ b/gcc/testsuite/gcc.dg/nested-calls-1.c
@@ -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 --git a/gcc/testsuite/gcc.dg/pr20017.c b/gcc/testsuite/gcc.dg/pr20017.c
index 16bd72b315d00cb8b37577f287ab3935b2b44072..1fd6d586ec75e21651b1da86c70bb6fea8411b2d 100644 (file)
--- a/gcc/testsuite/gcc.dg/pr20017.c
+++ b/gcc/testsuite/gcc.dg/pr20017.c
@@ -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 --git a/gcc/testsuite/gcc.dg/smod-1.c b/gcc/testsuite/gcc.dg/smod-1.c
index e75978af5958433b632a352f0d2fa3ba01c382a9..8ff60de136281853c97b465036993d561ff31098 100644 (file)
--- a/gcc/testsuite/gcc.dg/smod-1.c
+++ b/gcc/testsuite/gcc.dg/smod-1.c
@@ -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 --git a/gcc/testsuite/gcc.dg/sync-2.c b/gcc/testsuite/gcc.dg/sync-2.c
index 8b92eadd5982e61ee2520b0b53e4d740d681f47f..ab2e27632a1fc02c627c06f0c0acdf5378d13eb4 100644 (file)
--- a/gcc/testsuite/gcc.dg/sync-2.c
+++ b/gcc/testsuite/gcc.dg/sync-2.c
@@ -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 --git a/gcc/testsuite/gcc.dg/tls/opt-3.c b/gcc/testsuite/gcc.dg/tls/opt-3.c
index e59e5110b5be95528582618c74ec611f1803bfa5..0bec5303c2828d0469187b15074e7f63a4299333 100644 (file)
--- a/gcc/testsuite/gcc.dg/tls/opt-3.c
+++ b/gcc/testsuite/gcc.dg/tls/opt-3.c
@@ -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 --git a/gcc/testsuite/gcc.dg/torture/badshift.c b/gcc/testsuite/gcc.dg/torture/badshift.c
index dec71cfa2d1d718f0ddd25e51376867996156ab0..7288a374576cb0495580b5743799fcb8e55dc587 100644 (file)
--- a/gcc/testsuite/gcc.dg/torture/badshift.c
+++ b/gcc/testsuite/gcc.dg/torture/badshift.c
@@ -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: