Fix or1k lack-of-g++ checking in testsuite

diff --git a/testsuite/libffi.call/call.exp b/testsuite/libffi.call/call.exp
index ab47415269047ab6ba30a08269f2ab9042d56359..13ba2bdcd4922b2c454589833dd562792e796c73 100644 (file)
--- 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 69ebe9d00a9ac63eb3d6a743164e7bfcdc0c2ed4..e1145657d14d59509706914cc7f23366a0e6202a 100644 (file)
--- 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 65296f1eed27c7996e32a770fed8b38caf89a6b6..153d24094080e00f75e92b10a575feea296ca9ca 100644 (file)
--- 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"