On Sat, Mar 12, 2011 at 02:44:26PM -0800, H.J. Lu wrote:
> Many tests gcc.target/i386 use ilp32 to check ia32 and use lp64 to
> check hardware long long support. I checked in this to fix it.
>
>
Another patch.
H.J.
----
diff --git a/gcc/testsuite/ChangeLog.x32 b/gcc/testsuite/ChangeLog.x32
index 40ba17d..f575587 100644
--- a/gcc/testsuite/ChangeLog.x32
+++ b/gcc/testsuite/ChangeLog.x32
@@ -1,5 +1,27 @@
2011-03-12 H.J. Lu <hongjiu...@intel.com>
+ * g++.dg/torture/stackalign/eh-fastcall-1.C: Require ia32
+ instead of ilp32.
+ * g++.dg/torture/stackalign/eh-thiscall-1.C: Likewise.
+ * g++.dg/torture/stackalign/stdcall-1.C: Likewise.
+ * g++.dg/torture/stackalign/unwind-0.C: Likewise.
+ * g++.dg/torture/stackalign/unwind-1.C: Likewise.
+ * g++.dg/torture/stackalign/unwind-2.C: Likewise.
+ * g++.dg/torture/stackalign/unwind-3.C: Likewise.
+ * g++.dg/torture/stackalign/unwind-4.C: Likewise.
+ * g++.dg/torture/stackalign/unwind-5.C: Likewise.
+ * g++.dg/torture/stackalign/unwind-6.C: Likewise.
+ * gcc.dg/torture/stackalign/alloca-2.c: Likewise.
+ * gcc.dg/torture/stackalign/alloca-4.c: Likewise.
+ * gcc.dg/torture/stackalign/alloca-5.c: Likewise.
+ * gcc.dg/torture/stackalign/alloca-6.c: Likewise.
+ * gcc.dg/torture/stackalign/fastcall-1.c: Likewise.
+ * gcc.dg/torture/stackalign/push-1.c: Likewise.
+ * gcc.dg/torture/stackalign/regparm-1.c: Likewise.
+ * gcc.dg/torture/stackalign/thiscall-1.c: Likewise.
+
+2011-03-12 H.J. Lu <hongjiu...@intel.com>
+
* gcc.target/i386/builtin-copysign.c: Remove __LP64__ check.
2011-03-12 H.J. Lu <hongjiu...@intel.com>
diff --git a/gcc/testsuite/g++.dg/torture/stackalign/eh-fastcall-1.C
b/gcc/testsuite/g++.dg/torture/stackalign/eh-fastcall-1.C
index 4b849a2..2c24ea3 100644
--- a/gcc/testsuite/g++.dg/torture/stackalign/eh-fastcall-1.C
+++ b/gcc/testsuite/g++.dg/torture/stackalign/eh-fastcall-1.C
@@ -1,4 +1,4 @@
-/* { dg-do run { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
+/* { dg-do run { target { { i?86-*-* x86_64-*-* } && ia32 } } } */
#include "check.h"
diff --git a/gcc/testsuite/g++.dg/torture/stackalign/eh-thiscall-1.C
b/gcc/testsuite/g++.dg/torture/stackalign/eh-thiscall-1.C
index de9bed5..403497a 100644
--- a/gcc/testsuite/g++.dg/torture/stackalign/eh-thiscall-1.C
+++ b/gcc/testsuite/g++.dg/torture/stackalign/eh-thiscall-1.C
@@ -1,4 +1,4 @@
-/* { dg-do run { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
+/* { dg-do run { target { { i?86-*-* x86_64-*-* } && ia32 } } } */
#include "check.h"
diff --git a/gcc/testsuite/g++.dg/torture/stackalign/stdcall-1.C
b/gcc/testsuite/g++.dg/torture/stackalign/stdcall-1.C
index 393b37e..18c02be 100644
--- a/gcc/testsuite/g++.dg/torture/stackalign/stdcall-1.C
+++ b/gcc/testsuite/g++.dg/torture/stackalign/stdcall-1.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target { { i?86-*-* x86_64-*-* } && ilp32 } } }
+// { dg-do compile { target { { i?86-*-* x86_64-*-* } && ia32 } } }
// This case is to detect an assertion failure in stack branch development.
diff --git a/gcc/testsuite/g++.dg/torture/stackalign/unwind-0.C
b/gcc/testsuite/g++.dg/torture/stackalign/unwind-0.C
index f8166eb..b1e79d8 100644
--- a/gcc/testsuite/g++.dg/torture/stackalign/unwind-0.C
+++ b/gcc/testsuite/g++.dg/torture/stackalign/unwind-0.C
@@ -1,4 +1,4 @@
-/* { dg-do run { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
+/* { dg-do run { target { { i?86-*-* x86_64-*-* } && ia32 } } } */
#include "test-unwind.h"
diff --git a/gcc/testsuite/g++.dg/torture/stackalign/unwind-1.C
b/gcc/testsuite/g++.dg/torture/stackalign/unwind-1.C
index 70dce74..d61b1ba 100644
--- a/gcc/testsuite/g++.dg/torture/stackalign/unwind-1.C
+++ b/gcc/testsuite/g++.dg/torture/stackalign/unwind-1.C
@@ -1,4 +1,4 @@
-/* { dg-do run { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
+/* { dg-do run { target { { i?86-*-* x86_64-*-* } && ia32 } } } */
#include "test-unwind.h"
diff --git a/gcc/testsuite/g++.dg/torture/stackalign/unwind-2.C
b/gcc/testsuite/g++.dg/torture/stackalign/unwind-2.C
index 791eeb5..7ed0a8d 100644
--- a/gcc/testsuite/g++.dg/torture/stackalign/unwind-2.C
+++ b/gcc/testsuite/g++.dg/torture/stackalign/unwind-2.C
@@ -1,4 +1,4 @@
-/* { dg-do run { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
+/* { dg-do run { target { { i?86-*-* x86_64-*-* } && ia32 } } } */
#include "test-unwind.h"
diff --git a/gcc/testsuite/g++.dg/torture/stackalign/unwind-3.C
b/gcc/testsuite/g++.dg/torture/stackalign/unwind-3.C
index 29dee2d..e3368bf 100644
--- a/gcc/testsuite/g++.dg/torture/stackalign/unwind-3.C
+++ b/gcc/testsuite/g++.dg/torture/stackalign/unwind-3.C
@@ -1,4 +1,4 @@
-/* { dg-do run { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
+/* { dg-do run { target { { i?86-*-* x86_64-*-* } && ia32 } } } */
#include "test-unwind.h"
diff --git a/gcc/testsuite/g++.dg/torture/stackalign/unwind-4.C
b/gcc/testsuite/g++.dg/torture/stackalign/unwind-4.C
index a896176..fddf276 100644
--- a/gcc/testsuite/g++.dg/torture/stackalign/unwind-4.C
+++ b/gcc/testsuite/g++.dg/torture/stackalign/unwind-4.C
@@ -1,4 +1,4 @@
-/* { dg-do run { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
+/* { dg-do run { target { { i?86-*-* x86_64-*-* } && ia32 } } } */
#include "test-unwind.h"
diff --git a/gcc/testsuite/g++.dg/torture/stackalign/unwind-5.C
b/gcc/testsuite/g++.dg/torture/stackalign/unwind-5.C
index 514e4e7..e3e1a85 100644
--- a/gcc/testsuite/g++.dg/torture/stackalign/unwind-5.C
+++ b/gcc/testsuite/g++.dg/torture/stackalign/unwind-5.C
@@ -1,4 +1,4 @@
-/* { dg-do run { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
+/* { dg-do run { target { { i?86-*-* x86_64-*-* } && ia32 } } } */
#include "test-unwind.h"
diff --git a/gcc/testsuite/g++.dg/torture/stackalign/unwind-6.C
b/gcc/testsuite/g++.dg/torture/stackalign/unwind-6.C
index a888ca1..f1188f8 100644
--- a/gcc/testsuite/g++.dg/torture/stackalign/unwind-6.C
+++ b/gcc/testsuite/g++.dg/torture/stackalign/unwind-6.C
@@ -1,4 +1,4 @@
-/* { dg-do run { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
+/* { dg-do run { target { { i?86-*-* x86_64-*-* } && ia32 } } } */
#include "test-unwind.h"
diff --git a/gcc/testsuite/gcc.dg/torture/stackalign/alloca-2.c
b/gcc/testsuite/gcc.dg/torture/stackalign/alloca-2.c
index 139b74e..744d72a 100644
--- a/gcc/testsuite/gcc.dg/torture/stackalign/alloca-2.c
+++ b/gcc/testsuite/gcc.dg/torture/stackalign/alloca-2.c
@@ -1,5 +1,5 @@
/* PR middle-end/37009 */
-/* { dg-do run { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
+/* { dg-do run { target { { i?86-*-* x86_64-*-* } && ia32 } } } */
/* { dg-options "-msse2" } */
/* { dg-require-effective-target sse2_runtime } */
diff --git a/gcc/testsuite/gcc.dg/torture/stackalign/alloca-4.c
b/gcc/testsuite/gcc.dg/torture/stackalign/alloca-4.c
index c3e554a..b23fdf6 100644
--- a/gcc/testsuite/gcc.dg/torture/stackalign/alloca-4.c
+++ b/gcc/testsuite/gcc.dg/torture/stackalign/alloca-4.c
@@ -1,5 +1,5 @@
/* PR middle-end/37009 */
-/* { dg-do run { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
+/* { dg-do run { target { { i?86-*-* x86_64-*-* } && ia32 } } } */
/* { dg-options "-mincoming-stack-boundary=2 -mpreferred-stack-boundary=2" } */
#include "check.h"
diff --git a/gcc/testsuite/gcc.dg/torture/stackalign/alloca-5.c
b/gcc/testsuite/gcc.dg/torture/stackalign/alloca-5.c
index 2ef4443..7b7ed68 100644
--- a/gcc/testsuite/gcc.dg/torture/stackalign/alloca-5.c
+++ b/gcc/testsuite/gcc.dg/torture/stackalign/alloca-5.c
@@ -1,5 +1,5 @@
/* PR middle-end/45234 */
-/* { dg-do run { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
+/* { dg-do run { target { { i?86-*-* x86_64-*-* } && ia32 } } } */
/* { dg-options "-mincoming-stack-boundary=2 -mpreferred-stack-boundary=2" } */
#include "check.h"
diff --git a/gcc/testsuite/gcc.dg/torture/stackalign/alloca-6.c
b/gcc/testsuite/gcc.dg/torture/stackalign/alloca-6.c
index f0e4513..24c8e5a 100644
--- a/gcc/testsuite/gcc.dg/torture/stackalign/alloca-6.c
+++ b/gcc/testsuite/gcc.dg/torture/stackalign/alloca-6.c
@@ -1,5 +1,5 @@
/* PR middle-end/45234 */
-/* { dg-do run { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
+/* { dg-do run { target { { i?86-*-* x86_64-*-* } && ia32 } } } */
/* { dg-options "-mincoming-stack-boundary=2 -mpreferred-stack-boundary=2" } */
#include "check.h"
diff --git a/gcc/testsuite/gcc.dg/torture/stackalign/fastcall-1.c
b/gcc/testsuite/gcc.dg/torture/stackalign/fastcall-1.c
index d1cda10..24dab4d 100644
--- a/gcc/testsuite/gcc.dg/torture/stackalign/fastcall-1.c
+++ b/gcc/testsuite/gcc.dg/torture/stackalign/fastcall-1.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
+/* { dg-do run { target { { i?86-*-* x86_64-*-* } && ia32 } } } */
#include "check.h"
diff --git a/gcc/testsuite/gcc.dg/torture/stackalign/push-1.c
b/gcc/testsuite/gcc.dg/torture/stackalign/push-1.c
index dd5dffc..787f99f 100644
--- a/gcc/testsuite/gcc.dg/torture/stackalign/push-1.c
+++ b/gcc/testsuite/gcc.dg/torture/stackalign/push-1.c
@@ -1,5 +1,5 @@
/* PR middle-end/37010 */
-/* { dg-do run { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
+/* { dg-do run { target { { i?86-*-* x86_64-*-* } && ia32 } } } */
/* { dg-options "-msse2 -mpreferred-stack-boundary=2" } */
/* { dg-require-effective-target sse2_runtime } */
diff --git a/gcc/testsuite/gcc.dg/torture/stackalign/regparm-1.c
b/gcc/testsuite/gcc.dg/torture/stackalign/regparm-1.c
index 9dac024..b9acacf 100644
--- a/gcc/testsuite/gcc.dg/torture/stackalign/regparm-1.c
+++ b/gcc/testsuite/gcc.dg/torture/stackalign/regparm-1.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
+/* { dg-do run { target { { i?86-*-* x86_64-*-* } && ia32 } } } */
#include "check.h"
diff --git a/gcc/testsuite/gcc.dg/torture/stackalign/thiscall-1.c
b/gcc/testsuite/gcc.dg/torture/stackalign/thiscall-1.c
index 6f22e07..27b71b6 100644
--- a/gcc/testsuite/gcc.dg/torture/stackalign/thiscall-1.c
+++ b/gcc/testsuite/gcc.dg/torture/stackalign/thiscall-1.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
+/* { dg-do run { target { { i?86-*-* x86_64-*-* } && ia32 } } } */
#include "check.h"
