[gcc/devel/c++-modules] testsuite: Assorted x32 testsuite fixes

[gcc/devel/c++-modules] testsuite: Assorted x32 testsuite fixes

[Nathan Sidwell]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="us-ascii", Size: 3468 bytes --]

https://gcc.gnu.org/g:9ae8bc027743d7c2d25f90d6752a1f4e0dc153cf

commit 9ae8bc027743d7c2d25f90d6752a1f4e0dc153cf
Author: Uros Bizjak <ubizjak@gmail.com>
Date:   Fri Mar 13 16:34:32 2020 +0100

    testsuite: Assorted x32 testsuite fixes
    
            * 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.

Diff:
---
 gcc/testsuite/ChangeLog                 | 11 +++++++++++
 gcc/testsuite/gcc.target/i386/pr64409.c |  4 ++--
 gcc/testsuite/gcc.target/i386/pr71958.c |  7 ++++---
 gcc/testsuite/gcc.target/i386/pr90096.c |  2 +-
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2f738fadd80..e7b8c882655 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,14 @@
+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.
+
 2020-03-13  Patrick Palka  <ppalka@redhat.com>
 
 	PR c++/67960
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