From d9c1646658cfa8c81c1d37b8a67fa7af59748546 Mon Sep 17 00:00:00 2001 From: Rainer Orth Date: Tue, 27 Jan 2015 09:57:57 +0000 Subject: [PATCH] Correctly check for 32-bit x86 * testsuite/lib/libffi.exp: Load target-supports.exp. (run-many-tests): Only set targetabis for ia32. From-SVN: r220158 --- libffi/ChangeLog | 5 +++++ libffi/testsuite/lib/libffi.exp | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/libffi/ChangeLog b/libffi/ChangeLog index c02ee226574..9d1ae071c50 100644 --- a/libffi/ChangeLog +++ b/libffi/ChangeLog @@ -1,3 +1,8 @@ +2015-01-27 Rainer Orth + + * testsuite/lib/libffi.exp: Load target-supports.exp. + (run-many-tests): Only set targetabis for ia32. + 2015-01-19 Richard Henderson PR libffi/64581 diff --git a/libffi/testsuite/lib/libffi.exp b/libffi/testsuite/lib/libffi.exp index 6f865fd6286..d8d6ce7d77e 100644 --- a/libffi/testsuite/lib/libffi.exp +++ b/libffi/testsuite/lib/libffi.exp @@ -23,6 +23,7 @@ proc load_gcc_lib { filename } { load_lib dg.exp load_lib libgloss.exp +load_gcc_lib target-supports.exp load_gcc_lib target-libpath.exp load_gcc_lib wrapper.exp @@ -308,7 +309,8 @@ proc run-many-tests { testcases extra_flags } { set targetabis { "" } if [string match $compiler_vendor "gnu"] { - if [istarget "i?86-*-*"] { + if { ([istarget "i?86-*-*"] || [istarget "x86_64-*-*"]) + && [is-effective-target ia32] } { set targetabis { "" "-DABI_NUM=FFI_STDCALL -DABI_ATTR=__STDCALL__" -- 2.30.2