From patchwork Mon Jan 26 14:19:20 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rainer Orth X-Patchwork-Id: 432752 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id F181B140188 for ; Tue, 27 Jan 2015 01:20:33 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:references:date:in-reply-to:message-id :mime-version:content-type; q=dns; s=default; b=rscvRTmLJ63fI2s/ qwqsdeC+CXIlbiB9iqbKpmaYHqFND0xFDioGY1+g3pE9OXo2Ds6mfDPG86+YO/v6 KF1t+qHTBCkZrGAjd3rH9d7KY9UMsYXDAdpiaPQki6HNR7ZomSDAzfFaeSrp/WJD IL7EppfzvdH+e5B0/QbWZaZeFU8= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:references:date:in-reply-to:message-id :mime-version:content-type; s=default; bh=K/0eAd/iV1pHCG7f2zbdIl aFUD4=; b=D1w9PNkZUNB/x6UVcXcreZy1aeM+fAUw6+KFmSHNOS3W5t0kf2AYYb 78UxG6bn2ze1G5YntbDIWml/F5xFAGm+Nhua/niwK4FuUAcACdiNu5aggCSSbUx7 iie1OugYCVVlvSHXLYQRnlwxScEcfLsUphYQxUmtsq6aLjrxEHQe8= Received: (qmail 18778 invoked by alias); 26 Jan 2015 14:19:31 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 15532 invoked by uid 89); 26 Jan 2015 14:19:26 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-1.1 required=5.0 tests=AWL, RCVD_IN_DNSWL_NONE, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: smtp-relay.CeBiTec.Uni-Bielefeld.DE Received: from snape.CeBiTec.Uni-Bielefeld.DE (HELO smtp-relay.CeBiTec.Uni-Bielefeld.DE) (129.70.160.84) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 26 Jan 2015 14:19:25 +0000 Received: from localhost (localhost.CeBiTec.Uni-Bielefeld.DE [127.0.0.1]) by smtp-relay.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTP id 0DD652D0; Mon, 26 Jan 2015 15:19:23 +0100 (CET) Received: from smtp-relay.CeBiTec.Uni-Bielefeld.DE ([127.0.0.1]) by localhost (malfoy.CeBiTec.Uni-Bielefeld.DE [127.0.0.1]) (amavisd-new, port 10024) with LMTP id i1yHQfZWq4Mz; Mon, 26 Jan 2015 15:19:21 +0100 (CET) Received: from lokon.CeBiTec.Uni-Bielefeld.DE (lokon.CeBiTec.Uni-Bielefeld.DE [129.70.161.110]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp-relay.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTPS id 032C12CF; Mon, 26 Jan 2015 15:19:21 +0100 (CET) Received: (from ro@localhost) by lokon.CeBiTec.Uni-Bielefeld.DE (8.14.7+Sun/8.14.7/Submit) id t0QEJKVs021526; Mon, 26 Jan 2015 15:19:20 +0100 (CET) From: Rainer Orth To: "H.J. Lu" Cc: Jakub Jelinek , Richard Henderson , GCC Patches , iant@golang.org, Jeff Law Subject: Re: [COMMITTED] Merge libffi with upstream References: <54B3F790.9050507@redhat.com> <20150116133454.GP1405@tucnak.redhat.com> Date: Mon, 26 Jan 2015 15:19:20 +0100 In-Reply-To: (H. J. Lu's message of "Fri, 16 Jan 2015 05:43:05 -0800") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4 (usg-unix-v) MIME-Version: 1.0 X-IsSubscribed: yes "H.J. Lu" writes: > On Fri, Jan 16, 2015 at 5:38 AM, Rainer Orth > wrote: >> Jakub Jelinek writes: >> >>>> @@ -311,7 +312,8 @@ proc run-many-tests { testcases extra_fl >>>> >>>> set targetabis { "" } >>>> if [string match $compiler_vendor "gnu"] { >>>> - if [istarget "i?86-*-*"] { >>>> + if { ([istarget "i?86-*-*"] || [istarget "x86_64-*-*"]) >>>> + && [is-effective-target ilp32] } { >>> >>> Shouldn't that be ia32 instead if ilp32 ? I mean, do you want >>> it for -mx32 too or not? >> >> I've no idea if x32 supports stdcall or not. > > No, x32 doesn't. You should check ia32, not ilp32. 2015-01-16 Rainer Orth * testsuite/lib/libffi.exp: Load target-supports.exp. (run-many-tests): Only set targetabis for ia32. This patch worked for me. Ok for mainline now? Thanks. Rainer # HG changeset patch # Parent 5b70ffc67684f61ff23547e4b3ad25e64a2ca2a2 Correctly check for 32-bit x86 diff --git a/libffi/testsuite/lib/libffi.exp b/libffi/testsuite/lib/libffi.exp --- 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 @@ -311,7 +312,8 @@ proc run-many-tests { testcases extra_fl 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__"