From 91a7fbe94e3884536cf2eb8e644bc79d6b19c80e Mon Sep 17 00:00:00 2001
From: Anthony Green <green@moxielogic.com>
Date: Wed, 20 Nov 2019 07:16:41 -0500
Subject: Fix or1k lack-of-g++ checking in testsuite

---
 testsuite/libffi.call/call.exp               | 13 ++++++++++++-
 testsuite/libffi.call/unwindtest.cc          |  2 +-
 testsuite/libffi.call/unwindtest_ffi_call.cc |  2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/testsuite/libffi.call/call.exp b/testsuite/libffi.call/call.exp
index ab47415..13ba2bd 100644
--- a/testsuite/libffi.call/call.exp
+++ b/testsuite/libffi.call/call.exp
@@ -32,10 +32,21 @@ if { [string match $compiler_vendor "microsoft"] } {
     set additional_options "";
 }
 
-set tlist [lsort [glob -nocomplain -- $srcdir/$subdir/*.{c,cc}]]
+set tlist [lsort [glob -nocomplain -- $srcdir/$subdir/*.c]]
 
 run-many-tests $tlist $additional_options
 
+set tlist [lsort [glob -nocomplain -- $srcdir/$subdir/*.cc]]
+
+# No C++ for or1k
+if { [istarget "or1k-*-*"] } {
+    foreach test $tlist {
+        unsupported "$test"
+    }
+} else {
+    run-many-tests $tlist $additional_options
+}
+
 dg-finish
 
 # Local Variables:
diff --git a/testsuite/libffi.call/unwindtest.cc b/testsuite/libffi.call/unwindtest.cc
index 69ebe9d..e114565 100644
--- a/testsuite/libffi.call/unwindtest.cc
+++ b/testsuite/libffi.call/unwindtest.cc
@@ -4,7 +4,7 @@
    PR:		none.
    Originator:	Jeff Sturm <jsturm@one-point.com>  */
 
-/* { dg-do run { xfail x86_64-apple-darwin* moxie*-*-* or1k-*-* } } */
+/* { dg-do run { xfail x86_64-apple-darwin* moxie*-*-* } } */
 
 #include "ffitest.h"
 
diff --git a/testsuite/libffi.call/unwindtest_ffi_call.cc b/testsuite/libffi.call/unwindtest_ffi_call.cc
index 65296f1..153d240 100644
--- a/testsuite/libffi.call/unwindtest_ffi_call.cc
+++ b/testsuite/libffi.call/unwindtest_ffi_call.cc
@@ -4,7 +4,7 @@
    PR:		none.
    Originator:	Andreas Tobler <andreast@gcc.gnu.org> 20061213  */
 
-/* { dg-do run { xfail moxie*-*-* or1k-unknown-elf } } */
+/* { dg-do run { xfail moxie*-*-* } } */
 
 #include "ffitest.h"
 
-- 
cgit v1.2.1