From b2344575569bc3bd129ad0ff92b49dc220fb287b Mon Sep 17 00:00:00 2001 From: Anthony Green Date: Tue, 6 Sep 2022 12:43:08 -0400 Subject: Fix unwindtest on macos --- testsuite/lib/libffi.exp | 6 +++++- testsuite/libffi.closures/unwindtest.cc | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/testsuite/lib/libffi.exp b/testsuite/lib/libffi.exp index d77f53d..d21e4e5 100644 --- a/testsuite/lib/libffi.exp +++ b/testsuite/lib/libffi.exp @@ -378,7 +378,8 @@ proc libffi_target_compile { source dest type options } { if { [istarget "*-*-darwin9*"] || [istarget "*-*-darwin1*"] || [istarget "*-*-darwin2*"] } { - lappend options "additional_flags=-Wl,-allow_stack_execute" + # lappend options "additional_flags=-Wl,-allow_stack_execute" + lappend options "additional_flags=-Wno-unused-command-line-argument" } # If you're building the compiler with --prefix set to a place @@ -403,6 +404,9 @@ proc libffi_target_compile { source dest type options } { # this may be required for g++, but just confused clang. if { [string match "*.cc" $source] } { lappend options "c++" + if { [string match "*-*-darwin*" $target_triplet] } { + lappend options "libs= -lc++" + } } if { [string match "arc*-*-linux*" $target_triplet] } { diff --git a/testsuite/libffi.closures/unwindtest.cc b/testsuite/libffi.closures/unwindtest.cc index e114565..6c97c61 100644 --- a/testsuite/libffi.closures/unwindtest.cc +++ b/testsuite/libffi.closures/unwindtest.cc @@ -4,7 +4,7 @@ PR: none. Originator: Jeff Sturm */ -/* { dg-do run { xfail x86_64-apple-darwin* moxie*-*-* } } */ +/* { dg-do run { xfail moxie*-*-* } } */ #include "ffitest.h" -- cgit v1.2.1