mpx-check.h (main): Use __get_cpuid_count and return NORUNRES on failure.

	* gcc.target/i386/mpx/mpx-check.h (main): Use __get_cpuid_count
	and return NORUNRES on failure.
	* gcc.target/i386/mpx/va-arg-pack-1-lbv.c (foo1): Use
	__builtin_va_arg_pack instead of __va_arg_pack.
	* gcc.target/i386/mpx/va-arg-pack-1-nov.c (foo1): Ditto.
	* gcc.target/i386/mpx/va-arg-pack-1-ubv.c (foo1): Ditto.
	* gcc.target/i386/mpx/va-arg-pack-2-lbv.c (foo1): Ditto.
	* gcc.target/i386/mpx/va-arg-pack-2-nov.c (foo1): Ditto.
	* gcc.target/i386/mpx/va-arg-pack-2-ubv.c (foo1): Ditto.

From-SVN: r251627

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4ead57edfa2c43e892b4b318cac82878762ff2d7..18e7739b4a7029efe8a038ea9be1c054b49e6534 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,15 @@
+2017-09-03  Uros Bizjak  <ubizjak@gmail.com>
+
+       * gcc.target/i386/mpx/mpx-check.h (main): Use __get_cpuid_count
+       and return NORUNRES on failure.
+       * gcc.target/i386/mpx/va-arg-pack-1-lbv.c (foo1): Use
+       __builtin_va_arg_pack instead of __va_arg_pack.
+       * gcc.target/i386/mpx/va-arg-pack-1-nov.c (foo1): Ditto.
+       * gcc.target/i386/mpx/va-arg-pack-1-ubv.c (foo1): Ditto.
+       * gcc.target/i386/mpx/va-arg-pack-2-lbv.c (foo1): Ditto.
+       * gcc.target/i386/mpx/va-arg-pack-2-nov.c (foo1): Ditto.
+       * gcc.target/i386/mpx/va-arg-pack-2-ubv.c (foo1): Ditto.
+
 2017-09-01  Jakub Jelinek  <jakub@redhat.com>
 
        PR target/81766

diff --git a/gcc/testsuite/gcc.target/i386/mpx/mpx-check.h b/gcc/testsuite/gcc.target/i386/mpx/mpx-check.h
index 73aa01f2565bb168208cdec618e89b5a1d0de7a5..dd90fbd275abce9e4ca50d971c078c0957634e62 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/mpx/mpx-check.h
+++ b/gcc/testsuite/gcc.target/i386/mpx/mpx-check.h
@@ -31,10 +31,8 @@ main (int argc, const char **argv)
 {
   unsigned int eax, ebx, ecx, edx;
 
-  if (__get_cpuid_max (0, NULL) < 7)
-    return 0;
-
-  __cpuid_count (7, 0, eax, ebx, ecx, edx);
+  if (!__get_cpuid_count (7, 0, &eax, &ebx, &ecx, &edx))
+    return NORUNRES;
 
   /* Run MPX test only if host has MPX support.  */
   if ((ebx & bit_MPX) && (xgetbv (0) & XSTATE_BNDREGS))

diff --git a/gcc/testsuite/gcc.target/i386/mpx/va-arg-pack-1-lbv.c b/gcc/testsuite/gcc.target/i386/mpx/va-arg-pack-1-lbv.c
index 5aa60072df339445be2d16495a95b730d326f60b..bbbb256ae30910010e55a560415b301ced9985b0 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/mpx/va-arg-pack-1-lbv.c
+++ b/gcc/testsuite/gcc.target/i386/mpx/va-arg-pack-1-lbv.c
@@ -28,7 +28,7 @@ foo2 (int i1, int *p1, ...)
 static __attribute__((always_inline)) int
 foo1 (int *p1, ...)
 {
-  return foo2 (10, p1, __va_arg_pack ());
+  return foo2 (10, p1, __builtin_va_arg_pack ());
 }
 
 int prebuf[100];

diff --git a/gcc/testsuite/gcc.target/i386/mpx/va-arg-pack-1-nov.c b/gcc/testsuite/gcc.target/i386/mpx/va-arg-pack-1-nov.c
index 55c65d92bd969084643c0176d9bec4e87dbc00a8..4beda02b9515746b612ef81d8ed163450d23a07f 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/mpx/va-arg-pack-1-nov.c
+++ b/gcc/testsuite/gcc.target/i386/mpx/va-arg-pack-1-nov.c
@@ -25,7 +25,7 @@ foo2 (int i1, int *p1, ...)
 static __attribute__((always_inline)) int
 foo1 (int *p1, ...)
 {
-  return foo2 (10, p1, __va_arg_pack ());
+  return foo2 (10, p1, __builtin_va_arg_pack ());
 }
 
 int prebuf[100];

diff --git a/gcc/testsuite/gcc.target/i386/mpx/va-arg-pack-1-ubv.c b/gcc/testsuite/gcc.target/i386/mpx/va-arg-pack-1-ubv.c
index 11b498eba479f55f0a9bd536a1c2026314a4d945..4b76384275568d00e986a6354c25faddf0e76012 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/mpx/va-arg-pack-1-ubv.c
+++ b/gcc/testsuite/gcc.target/i386/mpx/va-arg-pack-1-ubv.c
@@ -28,7 +28,7 @@ foo2 (int i1, int *p1, ...)
 static __attribute__((always_inline)) int
 foo1 (int *p1, ...)
 {
-  return foo2 (10, p1, __va_arg_pack ());
+  return foo2 (10, p1, __builtin_va_arg_pack ());
 }
 
 int prebuf[100];

diff --git a/gcc/testsuite/gcc.target/i386/mpx/va-arg-pack-2-lbv.c b/gcc/testsuite/gcc.target/i386/mpx/va-arg-pack-2-lbv.c
index 9f1941d69f14b8f83a4a2c3bee5f06bd89205644..dab1dc86792a394b445b4f04105aac0fb24c59df 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/mpx/va-arg-pack-2-lbv.c
+++ b/gcc/testsuite/gcc.target/i386/mpx/va-arg-pack-2-lbv.c
@@ -30,7 +30,7 @@ foo2 (int i1, int *p1, ...)
 static __attribute__((always_inline)) int
 foo1 (int *p1, ...)
 {
-  return foo2 (10, p1, __va_arg_pack ());
+  return foo2 (10, p1, __builtin_va_arg_pack ());
 }
 
 int prebuf[100];

diff --git a/gcc/testsuite/gcc.target/i386/mpx/va-arg-pack-2-nov.c b/gcc/testsuite/gcc.target/i386/mpx/va-arg-pack-2-nov.c
index 903afbce29290fca0c9051f9f10464876a756f29..6bf4721f75adfcbfc926832e83cf1d765d4d40b8 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/mpx/va-arg-pack-2-nov.c
+++ b/gcc/testsuite/gcc.target/i386/mpx/va-arg-pack-2-nov.c
@@ -27,7 +27,7 @@ foo2 (int i1, int *p1, ...)
 static __attribute__((always_inline)) int
 foo1 (int *p1, ...)
 {
-  return foo2 (10, p1, __va_arg_pack ());
+  return foo2 (10, p1, __builtin_va_arg_pack ());
 }
 
 int prebuf[100];

diff --git a/gcc/testsuite/gcc.target/i386/mpx/va-arg-pack-2-ubv.c b/gcc/testsuite/gcc.target/i386/mpx/va-arg-pack-2-ubv.c
index f5d842abf0d43ab46593ac8c441da18036c50fdf..4af59758fb01eaf654c8dd823e141c36790791a8 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/mpx/va-arg-pack-2-ubv.c
+++ b/gcc/testsuite/gcc.target/i386/mpx/va-arg-pack-2-ubv.c
@@ -30,7 +30,7 @@ foo2 (int i1, int *p1, ...)
 static __attribute__((always_inline)) int
 foo1 (int *p1, ...)
 {
-  return foo2 (10, p1, __va_arg_pack ());
+  return foo2 (10, p1, __builtin_va_arg_pack ());
 }
 
 int prebuf[100];