From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 24642 invoked by alias); 23 Sep 2014 12:36:36 -0000 Mailing-List: contact libffi-discuss-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libffi-discuss-owner@sourceware.org Received: (qmail 24537 invoked by uid 89); 23 Sep 2014 12:36:35 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL,BAYES_00,SPF_PASS autolearn=ham version=3.3.2 X-HELO: service87.mimecast.com Received: from service87.mimecast.com (HELO service87.mimecast.com) (91.220.42.44) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 23 Sep 2014 12:36:34 +0000 Received: from cam-owa1.Emea.Arm.com (fw-tnat.cambridge.arm.com [217.140.96.21]) by service87.mimecast.com; Tue, 23 Sep 2014 13:36:32 +0100 Received: from [10.1.209.51] ([10.1.255.212]) by cam-owa1.Emea.Arm.com with Microsoft SMTPSVC(6.0.3790.3959); Tue, 23 Sep 2014 13:36:32 +0100 Message-ID: <5421694F.80209@arm.com> Date: Tue, 23 Sep 2014 12:36:00 -0000 From: Alan Lawrence User-Agent: Thunderbird 2.0.0.24 (X11/20101213) MIME-Version: 1.0 To: libffi-discuss@sourceware.org Subject: [PATCH] Fix compile failure on AArch64 Linux builds X-MC-Unique: 114092313363203101 Content-Type: multipart/mixed; boundary="------------050102010702090400060201" X-IsSubscribed: yes X-SW-Source: 2014/txt/msg00091.txt.bz2 This is a multi-part message in MIME format. --------------050102010702090400060201 Content-Type: text/plain; charset=WINDOWS-1252; format=flowed Content-Transfer-Encoding: quoted-printable Content-length: 670 Hi, commit 5df384077f3633ec8cf2e08f9199e5a44994dbad (Merge pull request #129 fr= om=20 frida/fix/darwin-aarch64-cif-prep // Fix non-variadic CIF initialization fo= r=20 Apple/ARM64) breaks building libffi on aarch64 linux (e.g.=20 aarch64-none-linux-gnu), with error: ../src/aarch64/ffi.c: In function 'ffi_prep_cif_machdep': ../src/aarch64/ffi.c:785:6: error: 'ffi_cif' has no member named=20 'aarch64_nfixedargs' cif->aarch64_nfixedargs =3D 0; ^ make[3]: *** [src/aarch64/ffi.lo] Error 1 Attached patch is a simple fix, tested on aarch64-none-linux-gnu. Is this O= K for=20 trunk (and if so, can someone with write access please commit)? Thanks, Alan --------------050102010702090400060201 Content-Type: text/x-patch; name=libffi_aarch64_nfixedargs.patch Content-Transfer-Encoding: quoted-printable Content-Disposition: inline; filename="libffi_aarch64_nfixedargs.patch" Content-length: 302 diff --git a/src/aarch64/ffi.c b/src/aarch64/ffi.c index 5369ea4..cdb7816 100644 --- a/src/aarch64/ffi.c +++ b/src/aarch64/ffi.c @@ -782,7 +782,9 @@ ffi_prep_cif_machdep (ffi_cif *cif) } } =20 +#if defined (__APPLE__) cif->aarch64_nfixedargs =3D 0; +#endif =20 return FFI_OK; }= --------------050102010702090400060201--