2009-02-18 H.J. Lu <hongjiu.lu@intel.com>

	* gcc.dg/callabi/callabi.exp: Moved to ...
	* gcc.target/x86_64/abi/callabi/callabi.exp: Here.  Only run
	in 64bit mode.

	* gcc.target/x86_64/abi/callabi/func-1.c: Don't check target.
	* gcc.target/x86_64/abi/callabi/func-indirect.c: Likewise.
	* gcc.target/x86_64/abi/callabi/func-indirect.c: Likewise.
	* gcc.target/x86_64/abi/callabi/pr38891.c: Likewise.
	* gcc.target/x86_64/abi/callabi/vaarg-1.c: Likewise.
	* gcc.target/x86_64/abi/callabi/vaarg-2.c: Likewise.
	* gcc.target/x86_64/abi/callabi/vaarg-3.c: Likewise.

	* gcc.dg/callabi/callabi.h: Moved to ...
	* gcc.target/x86_64/abi/callabi/callabi.h: Here.

	* gcc.dg/callabi/func-1.c: Moved to ...
	* gcc.target/x86_64/abi/callabi/func-1.c: Here.

	* gcc.dg/callabi/func-indirect.c: Moved to ...
	* gcc.target/x86_64/abi/callabi/func-indirect.c: Here.

	* gcc.dg/callabi/pr38891.c: Moved to ...
	* gcc.target/x86_64/abi/callabi/pr38891.c: Here.

	* gcc.dg/callabi/vaarg-1.c: Moved to ...
	* gcc.target/x86_64/abi/callabi/vaarg-1.c: Here.

	* gcc.dg/callabi/vaarg-2.c: Moved to ...
	* gcc.target/x86_64/abi/callabi/vaarg-2.c: Here.

	* gcc.dg/callabi/vaarg-3.c: Moved to ...
	* gcc.target/x86_64/abi/callabi/vaarg-3.c: Here.


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

9 files changed, 47 insertions, 7 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9b8b8a98300..60b17cda832 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,38 @@
+2009-02-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* gcc.dg/callabi/callabi.exp: Moved to ...
+	* gcc.target/x86_64/abi/callabi/callabi.exp: Here.  Only run
+	in 64bit mode.
+
+	* gcc.target/x86_64/abi/callabi/func-1.c: Don't check target.
+	* gcc.target/x86_64/abi/callabi/func-indirect.c: Likewise.
+	* gcc.target/x86_64/abi/callabi/func-indirect.c: Likewise.
+	* gcc.target/x86_64/abi/callabi/pr38891.c: Likewise.
+	* gcc.target/x86_64/abi/callabi/vaarg-1.c: Likewise.
+	* gcc.target/x86_64/abi/callabi/vaarg-2.c: Likewise.
+	* gcc.target/x86_64/abi/callabi/vaarg-3.c: Likewise.
+
+	* gcc.dg/callabi/callabi.h: Moved to ...
+	* gcc.target/x86_64/abi/callabi/callabi.h: Here.
+
+	* gcc.dg/callabi/func-1.c: Moved to ...
+	* gcc.target/x86_64/abi/callabi/func-1.c: Here.
+
+	* gcc.dg/callabi/func-indirect.c: Moved to ...
+	* gcc.target/x86_64/abi/callabi/func-indirect.c: Here.
+
+	* gcc.dg/callabi/pr38891.c: Moved to ...
+	* gcc.target/x86_64/abi/callabi/pr38891.c: Here.
+
+	* gcc.dg/callabi/vaarg-1.c: Moved to ...
+	* gcc.target/x86_64/abi/callabi/vaarg-1.c: Here.
+
+	* gcc.dg/callabi/vaarg-2.c: Moved to ...
+	* gcc.target/x86_64/abi/callabi/vaarg-2.c: Here.
+
+	* gcc.dg/callabi/vaarg-3.c: Moved to ...
+	* gcc.target/x86_64/abi/callabi/vaarg-3.c: Here.
+
 2009-02-17  Xuepeng Guo  <xuepeng.guo@intel.com>
 
 	PR target/38891
diff --git a/gcc/testsuite/gcc.dg/callabi/callabi.exp b/gcc/testsuite/gcc.target/x86_64/abi/callabi/callabi.exp
index 1c11ecc611e..e76d0c10150 100644
--- a/gcc/testsuite/gcc.dg/callabi/callabi.exp
+++ b/gcc/testsuite/gcc.target/x86_64/abi/callabi/callabi.exp
@@ -19,6 +19,11 @@
 # Load support procs.
 load_lib gcc-dg.exp
 
+if { (![istarget x86_64-*-*] && ![istarget i?86-*-*])
+     || [is-effective-target ilp32] } then {
+  return
+}
+
 # If a testcase doesn't have special options, use these.
 global DEFAULT_CFLAGS
 if ![info exists DEFAULT_CFLAGS] then {
diff --git a/gcc/testsuite/gcc.dg/callabi/callabi.h b/gcc/testsuite/gcc.target/x86_64/abi/callabi/callabi.h
index d008ad659cb..d008ad659cb 100644
--- a/gcc/testsuite/gcc.dg/callabi/callabi.h
+++ b/gcc/testsuite/gcc.target/x86_64/abi/callabi/callabi.h
diff --git a/gcc/testsuite/gcc.dg/callabi/func-1.c b/gcc/testsuite/gcc.target/x86_64/abi/callabi/func-1.c
index c727dbe6e53..7d0b5063637 100644
--- a/gcc/testsuite/gcc.dg/callabi/func-1.c
+++ b/gcc/testsuite/gcc.target/x86_64/abi/callabi/func-1.c
@@ -1,7 +1,7 @@
 /* Test for cross x86_64<->w64 abi standard calls.
 */
 /* Origin: Kai Tietz <kai.tietz@onevision.com> */
-/* { dg-do run { target { x86_64-*-* } } } */
+/* { dg-do run } */
 /* { dg-options "-std=gnu99 -ffast-math" } */
 #include "callabi.h"
 
@@ -37,4 +37,4 @@ int main ()
       != func_native (1.0,2.0,3.0,1,2,3))
     abort ();
   return 0;
-}
\ No newline at end of file
+}
diff --git a/gcc/testsuite/gcc.dg/callabi/func-indirect.c b/gcc/testsuite/gcc.target/x86_64/abi/callabi/func-indirect.c
index d7733bd9d72..8c1cac82e1b 100644
--- a/gcc/testsuite/gcc.dg/callabi/func-indirect.c
+++ b/gcc/testsuite/gcc.target/x86_64/abi/callabi/func-indirect.c
@@ -1,7 +1,7 @@
 /* Test for cross x86_64<->w64 abi standard calls via variable.
 */
 /* Origin: Kai Tietz <kai.tietz@onevision.com> */
-/* { dg-do run { target { x86_64-*-* } } } */
+/* { dg-do run } */
 /* { dg-options "-std=gnu99 -ffast-math" } */
 #include "callabi.h"
 
diff --git a/gcc/testsuite/gcc.dg/callabi/pr38891.c b/gcc/testsuite/gcc.target/x86_64/abi/callabi/pr38891.c
index 586e99f143d..d31b8c3774c 100644
--- a/gcc/testsuite/gcc.dg/callabi/pr38891.c
+++ b/gcc/testsuite/gcc.target/x86_64/abi/callabi/pr38891.c
@@ -1,6 +1,6 @@
 /* Test for cross x86_64<->w64 abi standard calls.
 */
-/* { dg-do compile { target { x86_64-*-* } } } */
+/* { dg-do compile } */
 /* { dg-options "-mno-sse" } */
 #include "callabi.h"
 
diff --git a/gcc/testsuite/gcc.dg/callabi/vaarg-1.c b/gcc/testsuite/gcc.target/x86_64/abi/callabi/vaarg-1.c
index 1e745e56085..a6d8463ed5c 100644
--- a/gcc/testsuite/gcc.dg/callabi/vaarg-1.c
+++ b/gcc/testsuite/gcc.target/x86_64/abi/callabi/vaarg-1.c
@@ -1,7 +1,7 @@
 /* Test for cross x86_64<->w64 abi va_list calls.
 */
 /* Origin: Kai Tietz <kai.tietz@onevision.com> */
-/* { dg-do run { target { x86_64-*-* } } } */
+/* { dg-do run } */
 /* { dg-options "-std=gnu99" } */
 #include "callabi.h"
 
diff --git a/gcc/testsuite/gcc.dg/callabi/vaarg-2.c b/gcc/testsuite/gcc.target/x86_64/abi/callabi/vaarg-2.c
index c9b716194a6..e281e860f78 100644
--- a/gcc/testsuite/gcc.dg/callabi/vaarg-2.c
+++ b/gcc/testsuite/gcc.target/x86_64/abi/callabi/vaarg-2.c
@@ -1,7 +1,7 @@
 /* Test for cross x86_64<->w64 abi va_list calls.
 */
 /* Origin: Kai Tietz <kai.tietz@onevision.com> */
-/* { dg-do run { target { x86_64-*-* } } } */
+/* { dg-do run } */
 /* { dg-options "-std=gnu99" } */
 #include "callabi.h"
 
diff --git a/gcc/testsuite/gcc.dg/callabi/vaarg-3.c b/gcc/testsuite/gcc.target/x86_64/abi/callabi/vaarg-3.c
index d0d068754e1..7cca7ac8718 100644
--- a/gcc/testsuite/gcc.dg/callabi/vaarg-3.c
+++ b/gcc/testsuite/gcc.target/x86_64/abi/callabi/vaarg-3.c
@@ -1,7 +1,7 @@
 /* Test for cross x86_64<->w64 abi va_list calls.
 */
 /* Origin: Kai Tietz <kai.tietz@onevision.com> */
-/* { dg-do run { target { x86_64-*-* } } } */
+/* { dg-do run } */
 /* { dg-options "-std=gnu99" } */
 #include "callabi.h"