From patchwork Thu Jan 29 21:53:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jack Howarth X-Patchwork-Id: 434654 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 39DCB1401AC for ; Fri, 30 Jan 2015 08:54:20 +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 :mime-version:date:message-id:subject:from:to:content-type; q= dns; s=default; b=nn1wVY0qZpgQfP2Nj8KT4sTrdXz4TejoX3eSOqu2qGkbPe zAWeXYblULu9WhPkgd3AOsZwW0ng4ySJn1Hplob/OfWe6X8JxbnKMZLNPNUyWLSY lZQ7NlXkmhNYdq/w270cbhArEOWkf8n2jV6milARS+l26X2FfRzkHX9T7Umzk= 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 :mime-version:date:message-id:subject:from:to:content-type; s= default; bh=uiyq9n+MtfQfbSPQbxfvsYtr9so=; b=coW7v0yQqQZkUl8+g8Ds lO5hl37lSBH32hU4A2BjF0VQ3YncAc6hqi5aBpiMQ0XQ5GLWnXsOCiAE67ZmXMwx biYwDKlzjm08PYvkuhFL9S0jXYSly4K22GEL02LINbsDL87VJYqxMHF6gqnqBd3h uluKjkmTlfDvhcvG8AyQ97c= Received: (qmail 10068 invoked by alias); 29 Jan 2015 21:53:51 -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 10044 invoked by uid 89); 29 Jan 2015 21:53:49 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.4 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-oi0-f44.google.com Received: from mail-oi0-f44.google.com (HELO mail-oi0-f44.google.com) (209.85.218.44) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Thu, 29 Jan 2015 21:53:46 +0000 Received: by mail-oi0-f44.google.com with SMTP id a3so31432200oib.3 for ; Thu, 29 Jan 2015 13:53:44 -0800 (PST) MIME-Version: 1.0 X-Received: by 10.202.183.138 with SMTP id h132mr1770866oif.132.1422568424728; Thu, 29 Jan 2015 13:53:44 -0800 (PST) Received: by 10.76.72.42 with HTTP; Thu, 29 Jan 2015 13:53:44 -0800 (PST) Date: Thu, 29 Jan 2015 16:53:44 -0500 Message-ID: Subject: [PATCH] Fix PR64855 From: Jack Howarth To: GCC Patches X-IsSubscribed: yes The attached patch fixes PR64855 by not setting targetabis on darwin in testsuite/lib/libffi.exp as suggested by Iain Sandoe. Confirmed on x86_64-apple-darwin14 to eliminate the libffi regressions at -m32/-m64. Okay for gcc trunk? Jack 2015-01-29 Jack Howarth PR libffi/64855 * testsuite/lib/libffi.exp: Don't set targetabis on darwin. Index: libffi/testsuite/lib/libffi.exp =================================================================== --- libffi/testsuite/lib/libffi.exp (revision 220263) +++ libffi/testsuite/lib/libffi.exp (working copy) @@ -310,7 +310,7 @@ proc run-many-tests { testcases extra_fl set targetabis { "" } if [string match $compiler_vendor "gnu"] { if { ([istarget "i?86-*-*"] || [istarget "x86_64-*-*"]) - && [is-effective-target ia32] } { + && [is-effective-target ia32] && ![istarget "*-*-darwin*"] } { set targetabis { "" "-DABI_NUM=FFI_STDCALL -DABI_ATTR=__STDCALL__"