[commited] testsuite: Assorted x32 testsuite fixes

[commited] testsuite: Assorted x32 testsuite fixes

[Uros Bizjak]

[-- Attachment #1: Type: text/plain, Size: 501 bytes --]

2020-03-13  Uroš Bizjak  <ubizjak@gmail.com>

    * gcc.target/i386/pr64409.c: Do not limit compilation to x32 targets.
    (dg-error): Quote 'ms_abi' attribute.
    * gcc.target/i386/pr71958.c: Do not limit compilation to x32 targets.
    Require maybe_x32 effective target.
    (dg-options): Add -mx32.
    (dg-error): Quote 'ms_abi' attribute.
    * gcc.target/i386/pr90096.c (dg-error): Update relative
    location of target x32 error.

Tested on x86_64-linux-gnu {,-mx32}.

Uros.

[-- Attachment #2: t.diff.txt --]
[-- Type: text/plain, Size: 1819 bytes --]

diff --git a/gcc/testsuite/gcc.target/i386/pr64409.c b/gcc/testsuite/gcc.target/i386/pr64409.c
index 7bf9d1e398d..9df9c1817d4 100644
--- a/gcc/testsuite/gcc.target/i386/pr64409.c
+++ b/gcc/testsuite/gcc.target/i386/pr64409.c
@@ -1,6 +1,6 @@
-/* { dg-do compile { target x32 } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target maybe_x32 } */
 /* { dg-options "-O0 -mx32" } */
 
 int a;
-int* __attribute__ ((ms_abi)) fn1 () { return &a; } /* { dg-error "X32 does not support ms_abi attribute" } */
+int* __attribute__ ((ms_abi)) fn1 () { return &a; } /* { dg-error "X32 does not support 'ms_abi' attribute" } */
diff --git a/gcc/testsuite/gcc.target/i386/pr71958.c b/gcc/testsuite/gcc.target/i386/pr71958.c
index 5e60d1787d6..81102fc8eeb 100644
--- a/gcc/testsuite/gcc.target/i386/pr71958.c
+++ b/gcc/testsuite/gcc.target/i386/pr71958.c
@@ -1,6 +1,7 @@
-/* { dg-do compile { target x32 } } */
-/* { dg-options "-mabi=ms" } */
-/* { dg-error "-mabi=ms not supported with X32 ABI" "" { target *-*-* } 0 } */
+/* { dg-do compile } */
+/* { dg-require-effective-target maybe_x32 } */
+/* { dg-options "-mx32 -mabi=ms" } */
+/* { dg-error "'-mabi=ms' not supported with X32 ABI" "" { target *-*-* } 0 } */
 
 void main ()
 {
diff --git a/gcc/testsuite/gcc.target/i386/pr90096.c b/gcc/testsuite/gcc.target/i386/pr90096.c
index fe29e3c76fe..871e0ffc691 100644
--- a/gcc/testsuite/gcc.target/i386/pr90096.c
+++ b/gcc/testsuite/gcc.target/i386/pr90096.c
@@ -19,6 +19,6 @@ bar (__m128 *p)
 {
   return _mm_cvtt_roundss_u64 (*p, _MM_FROUND_TO_ZERO |_MM_FROUND_NO_EXC);
   /* { dg-error "needs isa option -m64 -mavx512f" "" { target lp64 } .-1 } */
-  /* { dg-error "needs isa option -mx32 -mavx512f" "" { target x32 } .-1 } */
+  /* { dg-error "needs isa option -mx32 -mavx512f" "" { target x32 } .-2 } */
 }
 #endif