From patchwork Thu Nov 26 23:21:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: dftxbs3e X-Patchwork-Id: 25379 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3B6ED27BBF8; Thu, 26 Nov 2020 23:23:13 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 83A8427BBF9 for ; Thu, 26 Nov 2020 23:23:09 +0000 (GMT) Received: from localhost ([::1]:37924 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kiQbU-0003dW-Dr for patchwork@mira.cbaines.net; Thu, 26 Nov 2020 18:23:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52100) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kiQbO-0003dA-2y for guix-patches@gnu.org; Thu, 26 Nov 2020 18:23:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59905) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kiQbN-0004Bg-Rm for guix-patches@gnu.org; Thu, 26 Nov 2020 18:23:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kiQbN-0001Cn-Np for guix-patches@gnu.org; Thu, 26 Nov 2020 18:23:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44778] [PATCH] gnu: libffi: Add unreleased patch to fix float128 on powerpc64le. Resent-From: dftxbs3e Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 26 Nov 2020 23:23:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44778 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?utf-8?q?Court=C3=A8s?= Cc: 44778@debbugs.gnu.org, Efraim Flashner Received: via spool by 44778-submit@debbugs.gnu.org id=B44778.16064329254554 (code B ref 44778); Thu, 26 Nov 2020 23:23:01 +0000 Received: (at 44778) by debbugs.gnu.org; 26 Nov 2020 23:22:05 +0000 Received: from localhost ([127.0.0.1]:43217 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kiQaP-0001Au-Ek for submit@debbugs.gnu.org; Thu, 26 Nov 2020 18:22:05 -0500 Received: from smtp4-g21.free.fr ([212.27.42.4]:29690) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kiQaK-0001Aj-OV for 44778@debbugs.gnu.org; Thu, 26 Nov 2020 18:22:00 -0500 Received: from [IPv6:2a01:e0a:2a2:1350:9527:5c74:ee6c:113c] (unknown [IPv6:2a01:e0a:2a2:1350:9527:5c74:ee6c:113c]) (Authenticated sender: dftxbs3e) by smtp4-g21.free.fr (Postfix) with ESMTPSA id 12F2419F57B; Fri, 27 Nov 2020 00:21:49 +0100 (CET) Message-ID: <11a5a9a494b22c5036b6863c6333fdfaa965bbac.camel@free.fr> From: dftxbs3e Date: Fri, 27 Nov 2020 00:21:49 +0100 In-Reply-To: <87lfenzr5i.fsf@gnu.org> References: <87lfenzr5i.fsf@gnu.org> User-Agent: Evolution 3.38.1 (3.38.1-1.fc33) MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches On Thu, 2020-11-26 at 23:31 +0100, Ludovic Courtès wrote: > Hi, Hello! > dftxbs3e skribis: > > > From e195e9e9fe0409dd4b76cac87244cb2b5d7636e0 Mon Sep 17 00:00:00 > > 2001 > > From: John Doe > > Date: Sat, 21 Nov 2020 17:06:07 +0100 > > Subject: [PATCH] gnu: libffi: Add unreleased patch to fix float128 > > on > >  powerpc64le. > > > > Patch fetched from https://github.com/libffi/libffi/pull/561.patch > > Bonus points for a ChangeLog-style commit message.  :-) >   > https://guix.gnu.org/manual/devel/en/html_node/Submitting-Patches.html > Sorry, it's not clear to me yet what that is yet, will read again. > The patch LGTM, but I vaguely remember seeing similar patches by > Efraim > in a branch (?), or was it for 32-bit PowerPC? > > If there’s no collision with other patches in this area, we can > happily > apply it. > There's no collision, Efraim's patch is and mine is . Efraim's patch is about POWER7 and earlier. There's quite a few PRs relating to PowerPC bugs on libffi: https://github.com/libffi/libffi/pulls?q=is%3Apr+powerpc+is%3Aclosed > Ludo’. Thanks a lot for the review! Attached new patch version, I hope it is better with the commit message now. From 568ff570b8077a3c5691139d72532ebb878f3097 Mon Sep 17 00:00:00 2001 From: John Doe Date: Fri, 27 Nov 2020 00:12:08 +0100 Subject: [PATCH] gnu: libffi: Add unreleased patch to fix float128 on powerpc64le. * gnu/packages/patches/libffi-float128-powerpc64le.patch: Import patch file from . * gnu/packages/libffi.scm (libffi)[patches]: Apply patch. * gnu/local.mk (dist_patch_DATA): Add patch file to build system. --- gnu/local.mk | 3 +- gnu/packages/libffi.scm | 1 + .../patches/libffi-float128-powerpc64le.patch | 58 +++++++++++++++++++ 3 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/libffi-float128-powerpc64le.patch diff --git a/gnu/local.mk b/gnu/local.mk index 289f510c11..55c686f15c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1735,7 +1735,8 @@ dist_patch_DATA = \ %D%/packages/patches/xsane-support-ipv6.patch \ %D%/packages/patches/xsane-tighten-default-umask.patch \ %D%/packages/patches/yggdrasil-extra-config.patch \ - %D%/packages/patches/zziplib-CVE-2018-16548.patch + %D%/packages/patches/zziplib-CVE-2018-16548.patch \ + %D%/packages/patches/libffi-float128-powerpc64le.patch MISC_DISTRO_FILES = \ %D%/packages/ld-wrapper.in diff --git a/gnu/packages/libffi.scm b/gnu/packages/libffi.scm index d324892330..f6e2efabe0 100644 --- a/gnu/packages/libffi.scm +++ b/gnu/packages/libffi.scm @@ -48,6 +48,7 @@ (uri (string-append "ftp://sourceware.org/pub/libffi/" name "-" version ".tar.gz")) + (patches (search-patches "libffi-float128-powerpc64le.patch")) (sha256 (base32 "0mi0cpf8aa40ljjmzxb7im6dbj45bb0kllcd09xgmp834y9agyvj")))) diff --git a/gnu/packages/patches/libffi-float128-powerpc64le.patch b/gnu/packages/patches/libffi-float128-powerpc64le.patch new file mode 100644 index 0000000000..4fd32b0102 --- /dev/null +++ b/gnu/packages/patches/libffi-float128-powerpc64le.patch @@ -0,0 +1,58 @@ +From de93adfb6f48100946bba2c3abad2a77a0cfde0b Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 24 Nov 2019 09:52:01 +0100 +Subject: [PATCH] ffi_powerpc.h: fix build failure with powerpc7 + +This is a patch pulled down from the following: +https://github.com/buildroot/buildroot/blob/78926f610b1411b03464152472fd430012deb9ac/package/libffi/0004-ffi_powerpc.h-fix-build-failure-with-powerpc7.patch + +This issue is being hit on OpenBMC code when pulling the latest +libffi tag and building on a P8 ppc64le machine. I verified this +patch fixes the issue we are seeing. + +Below is the original commit message: + +Sicne commit 73dd43afc8a447ba98ea02e9aad4c6898dc77fb0, build on powerpc7 +fails on: + +In file included from ../src/powerpc/ffi.c:33:0: +../src/powerpc/ffi_powerpc.h:61:9: error: '_Float128' is not supported on this target + typedef _Float128 float128; + ^~~~~~~~~ + +Fix this build failure by checking for __HAVE_FLOAT128 before using +_Float128, as _Float128 is enabled only on specific conditions, see +output/host/powerpc64-buildroot-linux-gnu/sysroot/usr/include/bits/floatn.h: + + /* Defined to 1 if the current compiler invocation provides a + floating-point type with the IEEE 754 binary128 format, and this glibc + includes corresponding *f128 interfaces for it. */ + #if defined _ARCH_PWR8 && defined __LITTLE_ENDIAN__ && (_CALL_ELF == 2) \ + && defined __FLOAT128__ && !defined __NO_LONG_DOUBLE_MATH + # define __HAVE_FLOAT128 1 + #else + # define __HAVE_FLOAT128 0 + #endif + +Fixes: + - http://autobuild.buildroot.org/results/5c9dd8fb3b6a128882b6250f197c80232d8a3b53 + +Signed-off-by: Fabrice Fontaine +Signed-off-by: Andrew Geissler +--- + src/powerpc/ffi_powerpc.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/powerpc/ffi_powerpc.h b/src/powerpc/ffi_powerpc.h +index 8e2f2f0e..960a5c42 100644 +--- a/src/powerpc/ffi_powerpc.h ++++ b/src/powerpc/ffi_powerpc.h +@@ -57,7 +57,7 @@ typedef union + double d; + } ffi_dblfl; + +-#if defined(__FLOAT128_TYPE__) ++#if defined(__FLOAT128_TYPE__) && defined(__HAVE_FLOAT128) + typedef _Float128 float128; + #elif defined(__FLOAT128__) + typedef __float128 float128; -- 2.28.0