From 136fec1e27fa9179f9ffb9a18a3b1c26d7f3f286 Mon Sep 17 00:00:00 2001
From: Uros Bizjak <ubizjak@gmail.com>
Date: Mon, 16 Mar 2020 14:38:06 +0100
Subject: [PATCH] x32 does not support MS ABI, skip testcases that require it.

	* testsuite/20_util/bind/91371.cc: Skip for x32.
	* testsuite/20_util/is_function/91371.cc: Ditto.
	* testsuite/20_util/is_member_function_pointer/91371.cc: Ditto.
	* testsuite/20_util/is_object/91371.cc: Ditto.
---
 libstdc++-v3/testsuite/20_util/bind/91371.cc                    | 2 +-
 libstdc++-v3/testsuite/20_util/is_function/91371.cc             | 2 +-
 .../testsuite/20_util/is_member_function_pointer/91371.cc       | 2 +-
 libstdc++-v3/testsuite/20_util/is_object/91371.cc               | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libstdc++-v3/testsuite/20_util/bind/91371.cc b/libstdc++-v3/testsuite/20_util/bind/91371.cc
index a076177ff73..5c872f14148 100644
--- a/libstdc++-v3/testsuite/20_util/bind/91371.cc
+++ b/libstdc++-v3/testsuite/20_util/bind/91371.cc
@@ -15,7 +15,7 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-do compile { target i?86-*-* x86_64-*-* } }
+// { dg-do compile { target { { i?86-*-* x86_64-*-* } && { ! x32 } } } }
 // { dg-require-effective-target c++11 }
 
 #include <functional>
diff --git a/libstdc++-v3/testsuite/20_util/is_function/91371.cc b/libstdc++-v3/testsuite/20_util/is_function/91371.cc
index eccb3e0c121..700ee60aafd 100644
--- a/libstdc++-v3/testsuite/20_util/is_function/91371.cc
+++ b/libstdc++-v3/testsuite/20_util/is_function/91371.cc
@@ -15,7 +15,7 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-do compile { target i?86-*-* x86_64-*-* } }
+// { dg-do compile { target { { i?86-*-* x86_64-*-* } && { ! x32 } } } }
 // { dg-require-effective-target c++11 }
 
 #include <type_traits>
diff --git a/libstdc++-v3/testsuite/20_util/is_member_function_pointer/91371.cc b/libstdc++-v3/testsuite/20_util/is_member_function_pointer/91371.cc
index ace05e041c3..376be9e116e 100644
--- a/libstdc++-v3/testsuite/20_util/is_member_function_pointer/91371.cc
+++ b/libstdc++-v3/testsuite/20_util/is_member_function_pointer/91371.cc
@@ -15,7 +15,7 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-do compile { target i?86-*-* x86_64-*-* } }
+// { dg-do compile { target { { i?86-*-* x86_64-*-* } && { ! x32 } } } }
 // { dg-require-effective-target c++11 }
 
 #include <type_traits>
diff --git a/libstdc++-v3/testsuite/20_util/is_object/91371.cc b/libstdc++-v3/testsuite/20_util/is_object/91371.cc
index 8387cdbed9e..6fc3fd85d2e 100644
--- a/libstdc++-v3/testsuite/20_util/is_object/91371.cc
+++ b/libstdc++-v3/testsuite/20_util/is_object/91371.cc
@@ -15,7 +15,7 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-do compile { target i?86-*-* x86_64-*-* } }
+// { dg-do compile { target { { i?86-*-* x86_64-*-* } && { ! x32 } } } }
 // { dg-require-effective-target c++11 }
 
 #include <type_traits>
-- 
2.30.2