On Tue, Mar 15, 2011 at 10:50:33AM -0700, H.J. Lu wrote:
> On Sat, Mar 12, 2011 at 03:29:30PM -0800, H.J. Lu wrote:
> > 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.
> >
> >
>
> Another 2 patches.
>
Updates.
H.J.
>From 7e2d3432a20f64d2ca8beeffb436e22d55eb3630 Mon Sep 17 00:00:00 2001
From: H.J. Lu <hjl.to...@gmail.com>
Date: Tue, 15 Mar 2011 19:59:48 -0700
Subject: [PATCH 1/2] Properly check ilp32, ia32 and x32.
---
gcc/testsuite/ChangeLog.x32 | 7 +++
gcc/testsuite/gcc.dg/tree-ssa/stdarg-2.c | 60 +++++++++++++++---------------
gcc/testsuite/gcc.dg/tree-ssa/stdarg-3.c | 44 +++++++++++-----------
gcc/testsuite/gcc.dg/tree-ssa/stdarg-4.c | 16 ++++----
gcc/testsuite/gcc.dg/tree-ssa/stdarg-5.c | 14 +++---
5 files changed, 74 insertions(+), 67 deletions(-)
diff --git a/gcc/testsuite/ChangeLog.x32 b/gcc/testsuite/ChangeLog.x32
index f93c01c..59e3d21 100644
--- a/gcc/testsuite/ChangeLog.x32
+++ b/gcc/testsuite/ChangeLog.x32
@@ -1,5 +1,12 @@
2011-03-15 H.J. Lu <hongjiu...@intel.com>
+ * gcc.dg/tree-ssa/stdarg-2.c: Properly check ilp32, ia32 and x32.
+ * gcc.dg/tree-ssa/stdarg-3.c: Likewise.
+ * gcc.dg/tree-ssa/stdarg-4.c: Likewise.
+ * gcc.dg/tree-ssa/stdarg-5.c: Likewise.
+
+2011-03-15 H.J. Lu <hongjiu...@intel.com>
+
* gcc.target/i386/pr48037-1.c: Also allow x32.
2011-03-15 H.J. Lu <hongjiu...@intel.com>
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/stdarg-2.c
b/gcc/testsuite/gcc.dg/tree-ssa/stdarg-2.c
index e7a2447..a864399 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/stdarg-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/stdarg-2.c
@@ -21,8 +21,8 @@ f1 (int i, ...)
va_start (ap, i);
va_end (ap);
}
-/* { dg-final { scan-tree-dump "f1: va_list escapes 0, needs to save 0 GPR
units and 0 FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && lp64 } }
} } */
-/* { dg-final { scan-tree-dump "f1: va_list escapes 0, needs to save 0 GPR
units and 0 FPR units" "stdarg" { target { powerpc*-*-linux* && ia32 } } } } */
+/* { dg-final { scan-tree-dump "f1: va_list escapes 0, needs to save 0 GPR
units and 0 FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && { x32 ||
lp64 } } } } } */
+/* { dg-final { scan-tree-dump "f1: va_list escapes 0, needs to save 0 GPR
units and 0 FPR units" "stdarg" { target { powerpc*-*-linux* && ilp32 } } } } */
/* { dg-final { scan-tree-dump "f1: va_list escapes 0, needs to save 0 GPR
units and 0 FPR units" "stdarg" { target alpha*-*-linux* } } } */
/* { dg-final { scan-tree-dump "f1: va_list escapes 0, needs to save 0 GPR
units and 0 FPR units" "stdarg" { target s390*-*-linux* } } } */
/* { dg-final { scan-tree-dump "f1: va_list escapes 0, needs to save 0 GPR
units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */
@@ -41,8 +41,8 @@ f2 (int i, ...)
}
/* Assume the counters can be number of registers or bytes on 32-bit
architecture or bytes on 64-bit architecture. */
-/* { dg-final { scan-tree-dump "f2: va_list escapes 0, needs to save \[148\]
GPR units and 0 FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && lp64
} } } } */
-/* { dg-final { scan-tree-dump "f2: va_list escapes 0, needs to save \[148\]
GPR units and 0 FPR units" "stdarg" { target { powerpc*-*-linux* && ia32 } } }
} */
+/* { dg-final { scan-tree-dump "f2: va_list escapes 0, needs to save \[148\]
GPR units and 0 FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && { x32
|| lp64 } } } } } */
+/* { dg-final { scan-tree-dump "f2: va_list escapes 0, needs to save \[148\]
GPR units and 0 FPR units" "stdarg" { target { powerpc*-*-linux* && ilp32 } } }
} */
/* { dg-final { scan-tree-dump "f2: va_list escapes 0, needs to save 8 GPR
units and 1" "stdarg" { target alpha*-*-linux* } } } */
/* { dg-final { scan-tree-dump "f2: va_list escapes 0, needs to save 1 GPR
units and 0 FPR units" "stdarg" { target s390*-*-linux* } } } */
/* { dg-final { scan-tree-dump "f2: va_list escapes 0, needs to save \[148\]
GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */
@@ -57,8 +57,8 @@ f3 (int i, ...)
d = va_arg (ap, double);
va_end (ap);
}
-/* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save 0 GPR
units and \[1-9\]\[0-9\]* FPR units" "stdarg" { target { { i?86-*-* x86_64-*-*
} && lp64 } } } } */
-/* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save 0 GPR
units and \[1-9\]\[0-9\]* FPR units" "stdarg" { target { powerpc*-*-linux* && {
powerpc_fprs && ia32 } } } } } */
+/* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save 0 GPR
units and \[1-9\]\[0-9\]* FPR units" "stdarg" { target { { i?86-*-* x86_64-*-*
} && { x32 || lp64 } } } } } */
+/* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save 0 GPR
units and \[1-9\]\[0-9\]* FPR units" "stdarg" { target { powerpc*-*-linux* && {
powerpc_fprs && ilp32 } } } } } */
/* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save 0 GPR
units and 1 FPR units" "stdarg" { target s390*-*-linux* } } } */
/* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save 8 GPR
units and 2" "stdarg" { target alpha*-*-linux* } } } */
/* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save
\[1-9\]\[0-9\]* GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32
} } } } */
@@ -74,8 +74,8 @@ f4 (int i, ...)
foo (i, ap);
va_end (ap);
}
-/* { dg-final { scan-tree-dump "f4: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && lp64 }
} } } */
-/* { dg-final { scan-tree-dump "f4: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { powerpc*-*-linux* && ia32 } } } }
*/
+/* { dg-final { scan-tree-dump "f4: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && { x32
|| lp64 } } } } } */
+/* { dg-final { scan-tree-dump "f4: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { powerpc*-*-linux* && ilp32 } } } }
*/
/* { dg-final { scan-tree-dump "f4: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target alpha*-*-linux* } } } */
/* { dg-final { scan-tree-dump "f4: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target s390*-*-linux* } } } */
/* { dg-final { scan-tree-dump "f4: va_list escapes 1, needs to save all GPR
units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */
@@ -92,8 +92,8 @@ f5 (int i, ...)
va_end (ap);
va_end (gap);
}
-/* { dg-final { scan-tree-dump "f5: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && lp64 }
} } } */
-/* { dg-final { scan-tree-dump "f5: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { powerpc*-*-linux* && ia32 } } } }
*/
+/* { dg-final { scan-tree-dump "f5: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && { x32
|| lp64 } } } } } */
+/* { dg-final { scan-tree-dump "f5: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { powerpc*-*-linux* && ilp32 } } } }
*/
/* { dg-final { scan-tree-dump "f5: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target alpha*-*-linux* } } } */
/* { dg-final { scan-tree-dump "f5: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target s390*-*-linux* } } } */
/* { dg-final { scan-tree-dump "f5: va_list escapes 1, needs to save all GPR
units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */
@@ -112,8 +112,8 @@ f6 (int i, ...)
bar (x);
va_end (ap);
}
-/* { dg-final { scan-tree-dump "f6: va_list escapes 0, needs to save (3|12|24)
GPR units and 0 FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && lp64
} } } } */
-/* { dg-final { scan-tree-dump "f6: va_list escapes 0, needs to save (3|12|24)
GPR units and 0 FPR units" "stdarg" { target { powerpc*-*-linux* && ia32 } } }
} */
+/* { dg-final { scan-tree-dump "f6: va_list escapes 0, needs to save (3|12|24)
GPR units and 0 FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && { x32
|| lp64 } } } } } */
+/* { dg-final { scan-tree-dump "f6: va_list escapes 0, needs to save (3|12|24)
GPR units and 0 FPR units" "stdarg" { target { powerpc*-*-linux* && ilp32 } } }
} */
/* { dg-final { scan-tree-dump "f6: va_list escapes 0, needs to save 24 GPR
units and 1" "stdarg" { target alpha*-*-linux* } } } */
/* { dg-final { scan-tree-dump "f6: va_list escapes 0, needs to save 3 GPR
units and 0 FPR units" "stdarg" { target s390*-*-linux* } } } */
/* { dg-final { scan-tree-dump "f6: va_list escapes 0, needs to save (3|12|24)
GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */
@@ -129,8 +129,8 @@ f7 (int i, ...)
bar (6);
va_end (ap);
}
-/* { dg-final { scan-tree-dump "f7: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && lp64 }
} } } */
-/* { dg-final { scan-tree-dump "f7: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { powerpc*-*-linux* && ia32 } } } }
*/
+/* { dg-final { scan-tree-dump "f7: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && { x32
|| lp64 } } } } } */
+/* { dg-final { scan-tree-dump "f7: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { powerpc*-*-linux* && ilp32 } } } }
*/
/* { dg-final { scan-tree-dump "f7: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target alpha*-*-linux* } } } */
/* { dg-final { scan-tree-dump "f7: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target s390*-*-linux* } } } */
/* { dg-final { scan-tree-dump "f7: va_list escapes 1, needs to save all GPR
units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */
@@ -148,8 +148,8 @@ f8 (int i, ...)
bar (x);
va_end (ap);
}
-/* { dg-final { scan-tree-dump "f8: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && lp64 }
} } } */
-/* { dg-final { scan-tree-dump "f8: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { powerpc*-*-linux* && ia32 } } } }
*/
+/* { dg-final { scan-tree-dump "f8: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && { x32
|| lp64 } } } } } */
+/* { dg-final { scan-tree-dump "f8: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { powerpc*-*-linux* && ilp32 } } } }
*/
/* { dg-final { scan-tree-dump "f8: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target alpha*-*-linux* } } } */
/* { dg-final { scan-tree-dump "f8: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target s390*-*-linux* } } } */
/* { dg-final { scan-tree-dump "f8: va_list escapes 1, needs to save all GPR
units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */
@@ -165,8 +165,8 @@ f9 (int i, ...)
bar (6);
va_end (ap);
}
-/* { dg-final { scan-tree-dump "f9: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && lp64 }
} } } */
-/* { dg-final { scan-tree-dump "f9: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { powerpc*-*-linux* && ia32 } } } }
*/
+/* { dg-final { scan-tree-dump "f9: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && { x32
|| lp64 } } } } } */
+/* { dg-final { scan-tree-dump "f9: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { powerpc*-*-linux* && ilp32 } } } }
*/
/* { dg-final { scan-tree-dump "f9: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target alpha*-*-linux* } } } */
/* { dg-final { scan-tree-dump "f9: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target s390*-*-linux* } } } */
/* { dg-final { scan-tree-dump "f9: va_list escapes 1, needs to save all GPR
units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */
@@ -184,8 +184,8 @@ f10 (int i, ...)
bar (x);
va_end (ap);
}
-/* { dg-final { scan-tree-dump "f10: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && lp64 }
} } } */
-/* { dg-final { scan-tree-dump "f10: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { powerpc*-*-linux* && ia32 } } } }
*/
+/* { dg-final { scan-tree-dump "f10: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && { x32
|| lp64 } } } } } */
+/* { dg-final { scan-tree-dump "f10: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { powerpc*-*-linux* && ilp32 } } } }
*/
/* { dg-final { scan-tree-dump "f10: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target alpha*-*-linux* } } } */
/* { dg-final { scan-tree-dump "f10: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target s390*-*-linux* } } } */
/* { dg-final { scan-tree-dump "f10: va_list escapes 1, needs to save all GPR
units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */
@@ -204,8 +204,8 @@ f11 (int i, ...)
bar (x);
va_end (ap);
}
-/* { dg-final { scan-tree-dump "f11: va_list escapes 0, needs to save
(3|12|24) GPR units and 0 FPR units" "stdarg" { target { { i?86-*-* x86_64-*-*
} && lp64 } } } } */
-/* { dg-final { scan-tree-dump "f11: va_list escapes 0, needs to save
(3|12|24) GPR units and 0 FPR units" "stdarg" { target { powerpc*-*-linux* &&
ia32 } } } } */
+/* { dg-final { scan-tree-dump "f11: va_list escapes 0, needs to save
(3|12|24) GPR units and 0 FPR units" "stdarg" { target { { i?86-*-* x86_64-*-*
} && { x32 || lp64 } } } } } */
+/* { dg-final { scan-tree-dump "f11: va_list escapes 0, needs to save
(3|12|24) GPR units and 0 FPR units" "stdarg" { target { powerpc*-*-linux* &&
ilp32 } } } } */
/* { dg-final { scan-tree-dump "f11: va_list escapes 0, needs to save 24 GPR
units and 1" "stdarg" { target alpha*-*-linux* } } } */
/* { dg-final { scan-tree-dump "f11: va_list escapes 0, needs to save 3 GPR
units and 0 FPR units" "stdarg" { target s390*-*-linux* } } } */
/* { dg-final { scan-tree-dump "f11: va_list escapes 0, needs to save
(3|12|24) GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } }
} */
@@ -224,8 +224,8 @@ f12 (int i, ...)
bar (x);
va_end (ap);
}
-/* { dg-final { scan-tree-dump "f12: va_list escapes 0, needs to save 0 GPR
units and \[1-9\]\[0-9\]* FPR units" "stdarg" { target { { i?86-*-* x86_64-*-*
} && lp64 } } } } */
-/* { dg-final { scan-tree-dump "f12: va_list escapes 0, needs to save 0 GPR
units and \[1-9\]\[0-9\]* FPR units" "stdarg" { target { powerpc*-*-linux* && {
powerpc_fprs && ia32 } } } } } */
+/* { dg-final { scan-tree-dump "f12: va_list escapes 0, needs to save 0 GPR
units and \[1-9\]\[0-9\]* FPR units" "stdarg" { target { { i?86-*-* x86_64-*-*
} && { x32 || lp64 } } } } } */
+/* { dg-final { scan-tree-dump "f12: va_list escapes 0, needs to save 0 GPR
units and \[1-9\]\[0-9\]* FPR units" "stdarg" { target { powerpc*-*-linux* && {
powerpc_fprs && ilp32 } } } } } */
/* { dg-final { scan-tree-dump "f12: va_list escapes 0, needs to save 24 GPR
units and 2" "stdarg" { target alpha*-*-linux* } } } */
/* { dg-final { scan-tree-dump "f12: va_list escapes 0, needs to save 0 GPR
units and 3 FPR units" "stdarg" { target s390*-*-linux* } } } */
/* { dg-final { scan-tree-dump "f12: va_list escapes 0, needs to save
\[1-9]\[0-9\]* GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 }
} } } */
@@ -244,8 +244,8 @@ f13 (int i, ...)
bar (x);
va_end (ap);
}
-/* { dg-final { scan-tree-dump "f13: va_list escapes 0, needs to save 0 GPR
units and \[1-9\]\[0-9\]* FPR units" "stdarg" { target { { i?86-*-* x86_64-*-*
} && lp64 } } } } */
-/* { dg-final { scan-tree-dump "f13: va_list escapes 0, needs to save 0 GPR
units and \[1-9\]\[0-9\]* FPR units" "stdarg" { target { powerpc*-*-linux* && {
powerpc_fprs && ia32 } } } } } */
+/* { dg-final { scan-tree-dump "f13: va_list escapes 0, needs to save 0 GPR
units and \[1-9\]\[0-9\]* FPR units" "stdarg" { target { { i?86-*-* x86_64-*-*
} && { x32 || lp64 } } } } } */
+/* { dg-final { scan-tree-dump "f13: va_list escapes 0, needs to save 0 GPR
units and \[1-9\]\[0-9\]* FPR units" "stdarg" { target { powerpc*-*-linux* && {
powerpc_fprs && ilp32 } } } } } */
/* { dg-final { scan-tree-dump "f13: va_list escapes 0, needs to save 24 GPR
units and 2" "stdarg" { target alpha*-*-linux* } } } */
/* { dg-final { scan-tree-dump "f13: va_list escapes 0, needs to save 0 GPR
units and 3 FPR units" "stdarg" { target s390*-*-linux* } } } */
/* { dg-final { scan-tree-dump "f13: va_list escapes 0, needs to save
\[1-9]\[0-9\]* GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 }
} } } */
@@ -264,8 +264,8 @@ f14 (int i, ...)
bar (x);
va_end (ap);
}
-/* { dg-final { scan-tree-dump "f14: va_list escapes 0, needs to save \[148\]
GPR units and \[1-9\]\[0-9\]* FPR units" "stdarg" { target { { i?86-*-*
x86_64-*-* } && lp64 } } } } */
-/* { dg-final { scan-tree-dump "f14: va_list escapes 0, needs to save \[148\]
GPR units and \[1-9\]\[0-9\]* FPR units" "stdarg" { target { powerpc*-*-linux*
&& { powerpc_fprs && ia32 } } } } } */
+/* { dg-final { scan-tree-dump "f14: va_list escapes 0, needs to save \[148\]
GPR units and \[1-9\]\[0-9\]* FPR units" "stdarg" { target { { i?86-*-*
x86_64-*-* } && { x32 || lp64 } } } } } */
+/* { dg-final { scan-tree-dump "f14: va_list escapes 0, needs to save \[148\]
GPR units and \[1-9\]\[0-9\]* FPR units" "stdarg" { target { powerpc*-*-linux*
&& { powerpc_fprs && ilp32 } } } } } */
/* { dg-final { scan-tree-dump "f14: va_list escapes 0, needs to save 24 GPR
units and 3" "stdarg" { target alpha*-*-linux* } } } */
/* { dg-final { scan-tree-dump "f14: va_list escapes 0, needs to save 1 GPR
units and 2 FPR units" "stdarg" { target s390*-*-linux* } } } */
/* { dg-final { scan-tree-dump "f14: va_list escapes 0, needs to save
\[1-9]\[0-9\]* GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 }
} } } */
@@ -288,8 +288,8 @@ f15 (int i, ...)
f15_1 (ap);
va_end (ap);
}
-/* { dg-final { scan-tree-dump "f15: va_list escapes 0, needs to save \[148\]
GPR units and \[1-9\]\[0-9\]* FPR units" "stdarg" { target { { i?86-*-*
x86_64-*-* } && lp64 } } } } */
-/* { dg-final { scan-tree-dump "f15: va_list escapes 0, needs to save \[148\]
GPR units and \[1-9\]\[0-9\]* FPR units" "stdarg" { target { powerpc*-*-linux*
&& { powerpc_fprs && ia32 } } } } } */
+/* { dg-final { scan-tree-dump "f15: va_list escapes 0, needs to save \[148\]
GPR units and \[1-9\]\[0-9\]* FPR units" "stdarg" { target { { i?86-*-*
x86_64-*-* } && { x32 || lp64 } } } } } */
+/* { dg-final { scan-tree-dump "f15: va_list escapes 0, needs to save \[148\]
GPR units and \[1-9\]\[0-9\]* FPR units" "stdarg" { target { powerpc*-*-linux*
&& { powerpc_fprs && ilp32 } } } } } */
/* { dg-final { scan-tree-dump "f15: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target alpha*-*-linux* } } } */
/* { dg-final { scan-tree-dump "f15: va_list escapes 0, needs to save 1 GPR
units and 2 FPR units" "stdarg" { target s390*-*-linux* } } } */
/* { dg-final { scan-tree-dump-not "f15: va_list escapes 0, needs to save 0
GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/stdarg-3.c
b/gcc/testsuite/gcc.dg/tree-ssa/stdarg-3.c
index 9ffbe3f..e67c568 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/stdarg-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/stdarg-3.c
@@ -20,11 +20,11 @@ f1 (int i, ...)
x = va_arg (gap, long);
va_end (gap);
}
-/* { dg-final { scan-tree-dump "f1: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && lp64 }
} } } */
+/* { dg-final { scan-tree-dump "f1: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && { x32
|| lp64 } } } } } */
/* { dg-final { scan-tree-dump "f1: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { powerpc*-*-linux* && ilp32 } } } }
*/
/* { dg-final { scan-tree-dump "f1: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target alpha*-*-linux* } } } */
/* { dg-final { scan-tree-dump "f1: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target s390*-*-linux* } } } */
-/* { dg-final { scan-tree-dump "f1: va_list escapes 1, needs to save all GPR
units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } } */
+/* { dg-final { scan-tree-dump "f1: va_list escapes 1, needs to save all GPR
units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */
/* { dg-final { scan-tree-dump "f1: va_list escapes 1, needs to save all GPR
units" "stdarg" { target ia64-*-* } } } */
/* { dg-final { scan-tree-dump "f1: va_list escapes 1, needs to save all GPR
units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */
@@ -35,11 +35,11 @@ f2 (int i, ...)
bar (i);
va_end (gap);
}
-/* { dg-final { scan-tree-dump "f2: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && lp64 }
} } } */
+/* { dg-final { scan-tree-dump "f2: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && { x32
|| lp64 } } } } } */
/* { dg-final { scan-tree-dump "f2: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { powerpc*-*-linux* && ilp32 } } } }
*/
/* { dg-final { scan-tree-dump "f2: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target alpha*-*-linux* } } } */
/* { dg-final { scan-tree-dump "f2: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target s390*-*-linux* } } } */
-/* { dg-final { scan-tree-dump "f2: va_list escapes 1, needs to save all GPR
units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } } */
+/* { dg-final { scan-tree-dump "f2: va_list escapes 1, needs to save all GPR
units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */
/* { dg-final { scan-tree-dump "f2: va_list escapes 1, needs to save all GPR
units" "stdarg" { target ia64-*-* } } } */
/* { dg-final { scan-tree-dump "f2: va_list escapes 1, needs to save all GPR
units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */
@@ -53,11 +53,11 @@ f3 (int i, ...)
x = va_arg (aps[4], long);
va_end (aps[4]);
}
-/* { dg-final { scan-tree-dump "f3: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && lp64 }
} } } */
+/* { dg-final { scan-tree-dump "f3: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && { x32
|| lp64 } } } } } */
/* { dg-final { scan-tree-dump "f3: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { powerpc*-*-linux* && ilp32 } } } }
*/
/* { dg-final { scan-tree-dump "f3: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target alpha*-*-linux* } } } */
/* { dg-final { scan-tree-dump "f3: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target s390*-*-linux* } } } */
-/* { dg-final { scan-tree-dump "f3: va_list escapes 1, needs to save all GPR
units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } } */
+/* { dg-final { scan-tree-dump "f3: va_list escapes 1, needs to save all GPR
units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */
/* { dg-final { scan-tree-dump "f3: va_list escapes 1, needs to save all GPR
units" "stdarg" { target ia64-*-* } } } */
/* { dg-final { scan-tree-dump "f3: va_list escapes 1, needs to save all GPR
units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */
@@ -69,11 +69,11 @@ f4 (int i, ...)
bar (i);
va_end (aps[4]);
}
-/* { dg-final { scan-tree-dump "f4: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && lp64 }
} } } */
+/* { dg-final { scan-tree-dump "f4: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && { x32
|| lp64 } } } } } */
/* { dg-final { scan-tree-dump "f4: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { powerpc*-*-linux* && ilp32 } } } }
*/
/* { dg-final { scan-tree-dump "f4: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target alpha*-*-linux* } } } */
/* { dg-final { scan-tree-dump "f4: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target s390*-*-linux* } } } */
-/* { dg-final { scan-tree-dump "f4: va_list escapes 1, needs to save all GPR
units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } } */
+/* { dg-final { scan-tree-dump "f4: va_list escapes 1, needs to save all GPR
units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */
/* { dg-final { scan-tree-dump "f4: va_list escapes 1, needs to save all GPR
units" "stdarg" { target ia64-*-* } } } */
/* { dg-final { scan-tree-dump "f4: va_list escapes 1, needs to save all GPR
units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */
@@ -85,11 +85,11 @@ f5 (int i, ...)
foo (i, aps[4]);
va_end (aps[4]);
}
-/* { dg-final { scan-tree-dump "f5: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && lp64 }
} } } */
+/* { dg-final { scan-tree-dump "f5: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && { x32
|| lp64 } } } } } */
/* { dg-final { scan-tree-dump "f5: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { powerpc*-*-linux* && ilp32 } } } }
*/
/* { dg-final { scan-tree-dump "f5: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target alpha*-*-linux* } } } */
/* { dg-final { scan-tree-dump "f5: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target s390*-*-linux* } } } */
-/* { dg-final { scan-tree-dump "f5: va_list escapes 1, needs to save all GPR
units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } } */
+/* { dg-final { scan-tree-dump "f5: va_list escapes 1, needs to save all GPR
units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */
/* { dg-final { scan-tree-dump "f5: va_list escapes 1, needs to save all GPR
units" "stdarg" { target ia64-*-* } } } */
/* { dg-final { scan-tree-dump "f5: va_list escapes 1, needs to save all GPR
units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */
@@ -103,11 +103,11 @@ f6 (int i, ...)
x = va_arg (a.g, long);
va_end (a.g);
}
-/* { dg-final { scan-tree-dump "f6: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && lp64 }
} } } */
+/* { dg-final { scan-tree-dump "f6: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && { x32
|| lp64 } } } } } */
/* { dg-final { scan-tree-dump "f6: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { powerpc*-*-linux* && ilp32 } } } }
*/
/* { dg-final { scan-tree-dump "f6: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target alpha*-*-linux* } } } */
/* { dg-final { scan-tree-dump "f6: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target s390*-*-linux* } } } */
-/* { dg-final { scan-tree-dump "f6: va_list escapes 1, needs to save all GPR
units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } } */
+/* { dg-final { scan-tree-dump "f6: va_list escapes 1, needs to save all GPR
units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */
/* { dg-final { scan-tree-dump "f6: va_list escapes 1, needs to save all GPR
units" "stdarg" { target ia64-*-* } } } */
/* { dg-final { scan-tree-dump "f6: va_list escapes 1, needs to save all GPR
units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */
@@ -119,11 +119,11 @@ f7 (int i, ...)
bar (i);
va_end (a.g);
}
-/* { dg-final { scan-tree-dump "f7: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && lp64 }
} } } */
+/* { dg-final { scan-tree-dump "f7: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && { x32
|| lp64 } } } } } */
/* { dg-final { scan-tree-dump "f7: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { powerpc*-*-linux* && ilp32 } } } }
*/
/* { dg-final { scan-tree-dump "f7: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target alpha*-*-linux* } } } */
/* { dg-final { scan-tree-dump "f7: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target s390*-*-linux* } } } */
-/* { dg-final { scan-tree-dump "f7: va_list escapes 1, needs to save all GPR
units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } } */
+/* { dg-final { scan-tree-dump "f7: va_list escapes 1, needs to save all GPR
units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */
/* { dg-final { scan-tree-dump "f7: va_list escapes 1, needs to save all GPR
units" "stdarg" { target ia64-*-* } } } */
/* { dg-final { scan-tree-dump "f7: va_list escapes 1, needs to save all GPR
units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */
@@ -135,11 +135,11 @@ f8 (int i, ...)
foo (i, a.g);
va_end (a.g);
}
-/* { dg-final { scan-tree-dump "f8: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && lp64 }
} } } */
+/* { dg-final { scan-tree-dump "f8: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && { x32
|| lp64 } } } } } */
/* { dg-final { scan-tree-dump "f8: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { powerpc*-*-linux* && ilp32 } } } }
*/
/* { dg-final { scan-tree-dump "f8: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target alpha*-*-linux* } } } */
/* { dg-final { scan-tree-dump "f8: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target s390*-*-linux* } } } */
-/* { dg-final { scan-tree-dump "f8: va_list escapes 1, needs to save all GPR
units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } } */
+/* { dg-final { scan-tree-dump "f8: va_list escapes 1, needs to save all GPR
units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */
/* { dg-final { scan-tree-dump "f8: va_list escapes 1, needs to save all GPR
units" "stdarg" { target ia64-*-* } } } */
/* { dg-final { scan-tree-dump "f8: va_list escapes 1, needs to save all GPR
units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */
@@ -151,11 +151,11 @@ f10 (int i, ...)
x = va_arg (a.h[1], long);
va_end (a.h[1]);
}
-/* { dg-final { scan-tree-dump "f10: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && lp64 }
} } } */
+/* { dg-final { scan-tree-dump "f10: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && { x32
|| lp64 } } } } } */
/* { dg-final { scan-tree-dump "f10: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { powerpc*-*-linux* && ilp32 } } } }
*/
/* { dg-final { scan-tree-dump "f10: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target alpha*-*-linux* } } } */
/* { dg-final { scan-tree-dump "f10: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target s390*-*-linux* } } } */
-/* { dg-final { scan-tree-dump "f10: va_list escapes 1, needs to save all GPR
units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } } */
+/* { dg-final { scan-tree-dump "f10: va_list escapes 1, needs to save all GPR
units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */
/* { dg-final { scan-tree-dump "f10: va_list escapes 1, needs to save all GPR
units" "stdarg" { target ia64-*-* } } } */
/* { dg-final { scan-tree-dump "f10: va_list escapes 1, needs to save all GPR
units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */
@@ -167,11 +167,11 @@ f11 (int i, ...)
bar (i);
va_end (a.h[1]);
}
-/* { dg-final { scan-tree-dump "f11: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && lp64 }
} } } */
+/* { dg-final { scan-tree-dump "f11: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && { x32
|| lp64 } } } } } */
/* { dg-final { scan-tree-dump "f11: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { powerpc*-*-linux* && ilp32 } } } }
*/
/* { dg-final { scan-tree-dump "f11: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target alpha*-*-linux* } } } */
/* { dg-final { scan-tree-dump "f11: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target s390*-*-linux* } } } */
-/* { dg-final { scan-tree-dump "f11: va_list escapes 1, needs to save all GPR
units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } } */
+/* { dg-final { scan-tree-dump "f11: va_list escapes 1, needs to save all GPR
units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */
/* { dg-final { scan-tree-dump "f11: va_list escapes 1, needs to save all GPR
units" "stdarg" { target ia64-*-* } } } */
/* { dg-final { scan-tree-dump "f11: va_list escapes 1, needs to save all GPR
units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */
@@ -183,11 +183,11 @@ f12 (int i, ...)
foo (i, a.h[1]);
va_end (a.h[1]);
}
-/* { dg-final { scan-tree-dump "f12: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && lp64 }
} } } */
+/* { dg-final { scan-tree-dump "f12: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && { x32
|| lp64 } } } } } */
/* { dg-final { scan-tree-dump "f12: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target { powerpc*-*-linux* && ilp32 } } } }
*/
/* { dg-final { scan-tree-dump "f12: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target alpha*-*-linux* } } } */
/* { dg-final { scan-tree-dump "f12: va_list escapes 1, needs to save all GPR
units and all FPR units" "stdarg" { target s390*-*-linux* } } } */
-/* { dg-final { scan-tree-dump "f12: va_list escapes 1, needs to save all GPR
units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } } */
+/* { dg-final { scan-tree-dump "f12: va_list escapes 1, needs to save all GPR
units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */
/* { dg-final { scan-tree-dump "f12: va_list escapes 1, needs to save all GPR
units" "stdarg" { target ia64-*-* } } } */
/* { dg-final { scan-tree-dump "f12: va_list escapes 1, needs to save all GPR
units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */
/* { dg-final { cleanup-tree-dump "stdarg" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/stdarg-4.c
b/gcc/testsuite/gcc.dg/tree-ssa/stdarg-4.c
index f64ba8f..67e82c6 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/stdarg-4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/stdarg-4.c
@@ -23,8 +23,8 @@ f1 (int i, ...)
x = va_arg (ap, long);
va_end (ap);
}
-/* { dg-final { scan-tree-dump "f1: va_list escapes 0, needs to save all GPR
units and 0 FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && lp64 } }
} } */
-/* { dg-final { scan-tree-dump "f1: va_list escapes 0, needs to save all GPR
units and 0 FPR units" "stdarg" { target { powerpc*-*-linux* && ia32 } } } } */
+/* { dg-final { scan-tree-dump "f1: va_list escapes 0, needs to save all GPR
units and 0 FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && { x32 ||
{ x32 || lp64 } } } } } } */
+/* { dg-final { scan-tree-dump "f1: va_list escapes 0, needs to save all GPR
units and 0 FPR units" "stdarg" { target { powerpc*-*-linux* && ilp32 } } } } */
/* { dg-final { scan-tree-dump "f1: va_list escapes 0, needs to save all GPR
units and 1" "stdarg" { target alpha*-*-linux* } } } */
/* { dg-final { scan-tree-dump "f1: va_list escapes 0, needs to save all GPR
units and 0 FPR units" "stdarg" { target s390*-*-linux* } } } */
/* { dg-final { scan-tree-dump "f1: va_list escapes \[01\], needs to save all
GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */
@@ -40,8 +40,8 @@ f2 (int i, ...)
d = va_arg (ap, double);
va_end (ap);
}
-/* { dg-final { scan-tree-dump "f2: va_list escapes 0, needs to save 0 GPR
units and all FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && lp64 }
} } } */
-/* { dg-final { scan-tree-dump "f2: va_list escapes 0, needs to save 0 GPR
units and all FPR units" "stdarg" { target { powerpc*-*-linux* && {
powerpc_fprs && ia32 } } } } } */
+/* { dg-final { scan-tree-dump "f2: va_list escapes 0, needs to save 0 GPR
units and all FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && { x32
|| { x32 || lp64 } } } } } } */
+/* { dg-final { scan-tree-dump "f2: va_list escapes 0, needs to save 0 GPR
units and all FPR units" "stdarg" { target { powerpc*-*-linux* && {
powerpc_fprs && ilp32 } } } } } */
/* { dg-final { scan-tree-dump "f2: va_list escapes 0, needs to save all GPR
units and 2" "stdarg" { target alpha*-*-linux* } } } */
/* { dg-final { scan-tree-dump "f2: va_list escapes 0, needs to save 0 GPR
units and all FPR units" "stdarg" { target s390*-*-linux* } } } */
/* { dg-final { scan-tree-dump "f2: va_list escapes \[01\], needs to save all
GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */
@@ -63,8 +63,8 @@ f3 (int i, ...)
bar (x);
}
}
-/* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save \[148\]
GPR units and 0 FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && lp64
} } } } */
-/* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save \[148\]
GPR units and 0 FPR units" "stdarg" { target { powerpc*-*-linux* && ia32 } } }
} */
+/* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save \[148\]
GPR units and 0 FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && { x32
|| lp64 } } } } } */
+/* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save \[148\]
GPR units and 0 FPR units" "stdarg" { target { powerpc*-*-linux* && ilp32 } } }
} */
/* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save 8 GPR
units and 1" "stdarg" { target alpha*-*-linux* } } } */
/* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save 1 GPR
units and 0 FPR units" "stdarg" { target s390*-*-linux* } } } */
/* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save \[148\]
GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */
@@ -84,8 +84,8 @@ f4 (int i, ...)
bar (d + 2.5);
}
}
-/* { dg-final { scan-tree-dump "f4: va_list escapes 0, needs to save 0 GPR
units and \[1-9\]\[0-9\]* FPR units" "stdarg" { target { { i?86-*-* x86_64-*-*
} && lp64 } } } } */
-/* { dg-final { scan-tree-dump "f4: va_list escapes 0, needs to save 0 GPR
units and \[1-9\]\[0-9\]* FPR units" "stdarg" { target { powerpc*-*-linux* && {
powerpc_fprs && ia32 } } } } } */
+/* { dg-final { scan-tree-dump "f4: va_list escapes 0, needs to save 0 GPR
units and \[1-9\]\[0-9\]* FPR units" "stdarg" { target { { i?86-*-* x86_64-*-*
} && { x32 || lp64 } } } } } */
+/* { dg-final { scan-tree-dump "f4: va_list escapes 0, needs to save 0 GPR
units and \[1-9\]\[0-9\]* FPR units" "stdarg" { target { powerpc*-*-linux* && {
powerpc_fprs && ilp32 } } } } } */
/* { dg-final { scan-tree-dump "f4: va_list escapes 0, needs to save 8 GPR
units and 2" "stdarg" { target alpha*-*-linux* } } } */
/* { dg-final { scan-tree-dump "f4: va_list escapes 0, needs to save 0 GPR
units and 1 FPR units" "stdarg" { target s390*-*-linux* } } } */
/* { dg-final { scan-tree-dump "f4: va_list escapes 0, needs to save \[148\]
GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/stdarg-5.c
b/gcc/testsuite/gcc.dg/tree-ssa/stdarg-5.c
index 08f2787..e592c3f 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/stdarg-5.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/stdarg-5.c
@@ -22,7 +22,7 @@ f1 (int i, ...)
s1 = va_arg (ap, struct S1);
va_end (ap);
}
-/* { dg-final { scan-tree-dump "f1: va_list escapes 0, needs to save 0 GPR
units and 0 FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && lp64 } }
} } */
+/* { dg-final { scan-tree-dump "f1: va_list escapes 0, needs to save 0 GPR
units and 0 FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && { x32 ||
lp64 } } } } } */
/* { dg-final { scan-tree-dump "f1: va_list escapes 0, needs to save all GPR
units and 1" "stdarg" { target alpha*-*-linux* } } } */
/* { dg-final { scan-tree-dump "f1: va_list escapes 0, needs to save all GPR
units and 0 FPR units" "stdarg" { target s390*-*-linux* } } } */
@@ -35,7 +35,7 @@ f2 (int i, ...)
s2 = va_arg (ap, struct S2);
va_end (ap);
}
-/* { dg-final { scan-tree-dump "f2: va_list escapes 0, needs to save all GPR
units and all FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && lp64 }
} } } */
+/* { dg-final { scan-tree-dump "f2: va_list escapes 0, needs to save all GPR
units and all FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && { x32
|| lp64 } } } } } */
/* { dg-final { scan-tree-dump "f2: va_list escapes 0, needs to save all GPR
units and 1" "stdarg" { target alpha*-*-linux* } } } */
/* { dg-final { scan-tree-dump "f2: va_list escapes 0, needs to save all GPR
units and 0 FPR units" "stdarg" { target s390*-*-linux* } } } */
@@ -53,7 +53,7 @@ f3 (int i, ...)
bar (s1.i);
}
}
-/* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save 0 GPR
units and 0 FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && lp64 } }
} } */
+/* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save 0 GPR
units and 0 FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && { x32 ||
lp64 } } } } } */
/* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save 32 GPR
units and 1" "stdarg" { target alpha*-*-linux* } } } */
/* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save 1 GPR
units and 0 FPR units" "stdarg" { target s390*-*-linux* } } } */
@@ -71,7 +71,7 @@ f4 (int i, ...)
bar (s2.i);
}
}
-/* { dg-final { scan-tree-dump "f4: va_list escapes 0, needs to save 16 GPR
units and 16 FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && lp64 } }
} } */
+/* { dg-final { scan-tree-dump "f4: va_list escapes 0, needs to save 16 GPR
units and 16 FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && { x32 ||
lp64 } } } } } */
/* { dg-final { scan-tree-dump "f4: va_list escapes 0, needs to save 24 GPR
units and 1" "stdarg" { target alpha*-*-linux* } } } */
/* { dg-final { scan-tree-dump "f4: va_list escapes 0, needs to save 2 GPR
units and 0 FPR units" "stdarg" { target s390*-*-linux* } } } */
@@ -85,7 +85,7 @@ f5 (int i, ...)
va_end (ap);
bar (__real__ ci + __imag__ ci);
}
-/* { dg-final { scan-tree-dump "f5: va_list escapes 0, needs to save 16 GPR
units and 0 FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && lp64 } }
} } */
+/* { dg-final { scan-tree-dump "f5: va_list escapes 0, needs to save 16 GPR
units and 0 FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && { x32 ||
lp64 } } } } } */
/* { dg-final { scan-tree-dump "f5: va_list escapes 0, needs to save 32 GPR
units and 1" "stdarg" { target alpha*-*-linux* } } } */
/* { dg-final { scan-tree-dump "f5: va_list escapes 0, needs to save (4|2) GPR
units and 0 FPR units" "stdarg" { target s390*-*-linux* } } } */
@@ -99,7 +99,7 @@ f6 (int i, ...)
va_end (ap);
bar (__real__ ci + __imag__ cd);
}
-/* { dg-final { scan-tree-dump "f6: va_list escapes 0, needs to save 8 GPR
units and 32 FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && lp64 } }
} } */
+/* { dg-final { scan-tree-dump "f6: va_list escapes 0, needs to save 8 GPR
units and 32 FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && { x32 ||
lp64 } } } } } */
/* { dg-final { scan-tree-dump "f6: va_list escapes 0, needs to save 32 GPR
units and 3" "stdarg" { target alpha*-*-linux* } } } */
/* { dg-final { scan-tree-dump "f6: va_list escapes 0, needs to save (3|2) GPR
units and 0 FPR units" "stdarg" { target s390*-*-linux* } } } */
@@ -113,7 +113,7 @@ f7 (int i, ...)
va_end (ap);
bar (__real__ cd + __imag__ cd);
}
-/* { dg-final { scan-tree-dump "f7: va_list escapes 0, needs to save 0 GPR
units and 64 FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && lp64 } }
} } */
+/* { dg-final { scan-tree-dump "f7: va_list escapes 0, needs to save 0 GPR
units and 64 FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && { x32 ||
lp64 } } } } } */
/* { dg-final { scan-tree-dump "f7: va_list escapes 0, needs to save 32 GPR
units and 2" "stdarg" { target alpha*-*-linux* } } } */
/* { dg-final { scan-tree-dump "f7: va_list escapes 0, needs to save 2 GPR
units and 0 FPR units" "stdarg" { target s390*-*-linux* } } } */
/* { dg-final { cleanup-tree-dump "stdarg" } } */
--
1.7.4
>From 4c1fec44176f196e16f0d45bf826d6041cec4719 Mon Sep 17 00:00:00 2001
From: H.J. Lu <hjl.to...@gmail.com>
Date: Tue, 15 Mar 2011 20:12:33 -0700
Subject: [PATCH 2/2] Check ia32 instead of ilp32.
---
gcc/testsuite/ChangeLog.x32 | 10 ++++++++++
gcc/testsuite/gcc.dg/20050503-1.c | 2 +-
gcc/testsuite/gcc.dg/builtin-apply4.c | 2 +-
gcc/testsuite/gcc.dg/pr35045.c | 2 +-
gcc/testsuite/gcc.dg/pr36584.c | 4 ++--
.../gcc.dg/torture/fp-int-convert-float80-timode.c | 2 +-
gcc/testsuite/gcc.dg/torture/pr36891.c | 4 ++--
gcc/testsuite/gcc.dg/tree-ssa/loop-28.c | 2 +-
8 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/gcc/testsuite/ChangeLog.x32 b/gcc/testsuite/ChangeLog.x32
index 59e3d21..32c3e34 100644
--- a/gcc/testsuite/ChangeLog.x32
+++ b/gcc/testsuite/ChangeLog.x32
@@ -1,5 +1,15 @@
2011-03-15 H.J. Lu <hongjiu...@intel.com>
+ * gcc.dg/20050503-1.c: Check ia32 instead of ilp32.
+ * gcc.dg/builtin-apply4.c: Likewise.
+ * gcc.dg/pr35045.c: Likewise.
+ * gcc.dg/pr36584.c: Likewise.
+ * gcc.dg/torture/fp-int-convert-float80-timode.c: Likewise.
+ * gcc.dg/torture/pr36891.c: Likewise.
+ * gcc.dg/tree-ssa/loop-28.c: Likewise.
+
+2011-03-15 H.J. Lu <hongjiu...@intel.com>
+
* gcc.dg/tree-ssa/stdarg-2.c: Properly check ilp32, ia32 and x32.
* gcc.dg/tree-ssa/stdarg-3.c: Likewise.
* gcc.dg/tree-ssa/stdarg-4.c: Likewise.
diff --git a/gcc/testsuite/gcc.dg/20050503-1.c
b/gcc/testsuite/gcc.dg/20050503-1.c
index d118b95..200494f 100644
--- a/gcc/testsuite/gcc.dg/20050503-1.c
+++ b/gcc/testsuite/gcc.dg/20050503-1.c
@@ -2,7 +2,7 @@
Test whether tail call information is propagated through builtin
expanders. */
/* { dg-do compile } */
-/* { dg-skip-if "" { { i?86-*-* x86_64-*-* } && { ilp32 && { ! nonpic } } } {
"*" } { "" } } */
+/* { dg-skip-if "" { { i?86-*-* x86_64-*-* } && { ia32 && { ! nonpic } } } {
"*" } { "" } } */
/* { dg-options "-O2" } */
typedef __SIZE_TYPE__ size_t;
diff --git a/gcc/testsuite/gcc.dg/builtin-apply4.c
b/gcc/testsuite/gcc.dg/builtin-apply4.c
index 7a14356..530da71 100644
--- a/gcc/testsuite/gcc.dg/builtin-apply4.c
+++ b/gcc/testsuite/gcc.dg/builtin-apply4.c
@@ -1,6 +1,6 @@
/* PR tree-optimization/20076 */
/* { dg-options "-O2 -Wmissing-noreturn" } */
-/* { dg-options "-O2 -mno-mmx" { target { { i?86-*-* x86_64-*-* } && ilp32 } }
} */
+/* { dg-options "-O2 -mno-mmx" { target { { i?86-*-* x86_64-*-* } && ia32 } }
} */
/* { dg-do run } */
extern void abort (void);
diff --git a/gcc/testsuite/gcc.dg/pr35045.c b/gcc/testsuite/gcc.dg/pr35045.c
index 0b2b209..bcd01d7 100644
--- a/gcc/testsuite/gcc.dg/pr35045.c
+++ b/gcc/testsuite/gcc.dg/pr35045.c
@@ -1,5 +1,5 @@
/* { dg-do run } */
-/* { dg-skip-if "" { { i?86-*-* x86_64-*-* } && { ilp32 && { ! nonpic } } } {
"*" } { "" } } */
+/* { dg-skip-if "" { { i?86-*-* x86_64-*-* } && { ia32 && { ! nonpic } } } {
"*" } { "" } } */
/* { dg-options "-O2 -fgcse-after-reload" } */
extern void abort (void);
diff --git a/gcc/testsuite/gcc.dg/pr36584.c b/gcc/testsuite/gcc.dg/pr36584.c
index c0b005d..1b6e38c 100644
--- a/gcc/testsuite/gcc.dg/pr36584.c
+++ b/gcc/testsuite/gcc.dg/pr36584.c
@@ -1,7 +1,7 @@
/* { dg-do run } */
/* { dg-options "-O2 -lm" } */
-/* { dg-options "-O2 -msse2 -mfpmath=sse" { target { { i?86-*-* x86_64-*-* }
&& ilp32 } } } */
-/* { dg-require-effective-target sse2_runtime { target { { i?86-*-* x86_64-*-*
} && ilp32 } } } */
+/* { dg-options "-O2 -msse2 -mfpmath=sse" { target { { i?86-*-* x86_64-*-* }
&& ia32 } } } */
+/* { dg-require-effective-target sse2_runtime { target { { i?86-*-* x86_64-*-*
} && ia32 } } } */
extern double fabs (double);
extern void abort (void);
diff --git a/gcc/testsuite/gcc.dg/torture/fp-int-convert-float80-timode.c
b/gcc/testsuite/gcc.dg/torture/fp-int-convert-float80-timode.c
index 5b9bb70..7600994 100644
--- a/gcc/testsuite/gcc.dg/torture/fp-int-convert-float80-timode.c
+++ b/gcc/testsuite/gcc.dg/torture/fp-int-convert-float80-timode.c
@@ -2,7 +2,7 @@
/* Origin: Joseph Myers <jos...@codesourcery.com> */
/* { dg-do run { target i?86-*-* x86_64-*-* ia64-*-* } } */
/* { dg-options "" } */
-/* { dg-options "-mmmx" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
+/* { dg-options "-mmmx" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */
#include "fp-int-convert.h"
diff --git a/gcc/testsuite/gcc.dg/torture/pr36891.c
b/gcc/testsuite/gcc.dg/torture/pr36891.c
index 53e6163..5a8e5c3 100644
--- a/gcc/testsuite/gcc.dg/torture/pr36891.c
+++ b/gcc/testsuite/gcc.dg/torture/pr36891.c
@@ -1,7 +1,7 @@
/* { dg-do compile } */
/* { dg-options "-ffast-math" } */
-/* { dg-options "-ffast-math -msse" { target { { i?86-*-* x86_64-*-* } &&
ilp32 } } } */
-/* { dg-require-effective-target sse { target { { i?86-*-* x86_64-*-* } &&
ilp32 } } } */
+/* { dg-options "-ffast-math -msse" { target { { i?86-*-* x86_64-*-* } && ia32
} } } */
+/* { dg-require-effective-target sse { target { { i?86-*-* x86_64-*-* } &&
ia32 } } } */
#define __vector __attribute__((vector_size(16) ))
__vector float f(void);
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-28.c
b/gcc/testsuite/gcc.dg/tree-ssa/loop-28.c
index 77d0c47..c277b68 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loop-28.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-28.c
@@ -1,5 +1,5 @@
/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
-/* { dg-require-effective-target ilp32 } */
+/* { dg-require-effective-target ia32 } */
/* { dg-options "-O2 -fprefetch-loop-arrays -march=athlon
-fdump-tree-optimized -fdump-tree-aprefetch --param max-unrolled-insns=1000" }
*/
char x[100000];
--
1.7.4
