From 7e5a3c96db2383a41587d6525b4ac9ea1fafe091 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Mon, 23 May 2016 16:54:04 +0200 Subject: [PATCH] [PR libffi/65567] libffi: Fix, and simply libffi_feature_test libffi/ PR libffi/65567 * testsuite/lib/libffi.exp (libffi_feature_test): Fix, and simply. From-SVN: r236594 --- libffi/ChangeLog | 5 +++++ libffi/testsuite/lib/libffi.exp | 11 ++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/libffi/ChangeLog b/libffi/ChangeLog index 50276807528..8245f5b39f8 100644 --- a/libffi/ChangeLog +++ b/libffi/ChangeLog @@ -1,3 +1,8 @@ +2016-05-23 Thomas Schwinge + + PR libffi/65567 + * testsuite/lib/libffi.exp (libffi_feature_test): Fix, and simply. + 2016-03-17 Andreas Schwab * src/aarch64/ffitarget.h (FFI_SIZEOF_JAVA_RAW) [__ILP32__]: diff --git a/libffi/testsuite/lib/libffi.exp b/libffi/testsuite/lib/libffi.exp index 169fe74ca7c..a0f6ab397ee 100644 --- a/libffi/testsuite/lib/libffi.exp +++ b/libffi/testsuite/lib/libffi.exp @@ -227,20 +227,21 @@ proc libffi_target_compile { source dest type options } { # TEST should be a preprocessor condition. Returns true if it holds. proc libffi_feature_test { test } { - set src "ffitest.c" + set src "ffitest[pid].c" set f [open $src "w"] puts $f "#include " puts $f $test - puts $f "xyzzy" + puts $f "/* OK */" + puts $f "#else" + puts $f "# error Failed $test" puts $f "#endif" close $f - set lines [libffi_target_compile $src "" "preprocess" ""] + set lines [libffi_target_compile $src /dev/null assembly ""] file delete $src - set last [lindex [split $lines] end] - return [regexp -- "xyzzy" $last] + return [string match "" $lines] } # Utility routines. -- 2.30.2