Revert "gnu: libffi: Add unreleased patch to fix float128 on powerpc64le."
This reverts commit 4fff5ab241
. In
<https://debbugs.gnu.org/cgi/bugreport.cgi?bug=45252> we decided to apply a
patch to master instead, so this change is no longer needed on core-updates.
master
parent
00f34c0057
commit
b50341dba9
|
@ -1207,7 +1207,6 @@ dist_patch_DATA = \
|
||||||
%D%/packages/patches/jfsutils-include-systypes.patch \
|
%D%/packages/patches/jfsutils-include-systypes.patch \
|
||||||
%D%/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch \
|
%D%/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch \
|
||||||
%D%/packages/patches/kdbusaddons-kinit-file-name.patch \
|
%D%/packages/patches/kdbusaddons-kinit-file-name.patch \
|
||||||
%D%/packages/patches/libffi-float128-powerpc64le.patch \
|
|
||||||
%D%/packages/patches/libffi-3.3-powerpc-fixes.patch \
|
%D%/packages/patches/libffi-3.3-powerpc-fixes.patch \
|
||||||
%D%/packages/patches/libvirt-create-machine-cgroup.patch \
|
%D%/packages/patches/libvirt-create-machine-cgroup.patch \
|
||||||
%D%/packages/patches/libziparchive-add-includes.patch \
|
%D%/packages/patches/libziparchive-add-includes.patch \
|
||||||
|
|
|
@ -51,8 +51,7 @@
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0mi0cpf8aa40ljjmzxb7im6dbj45bb0kllcd09xgmp834y9agyvj"))
|
"0mi0cpf8aa40ljjmzxb7im6dbj45bb0kllcd09xgmp834y9agyvj"))
|
||||||
(patches (search-patches "libffi-3.3-powerpc-fixes.patch"
|
(patches (search-patches "libffi-3.3-powerpc-fixes.patch"))))
|
||||||
"libffi-float128-powerpc64le.patch"))))
|
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(;; Prevent the build system from passing -march and -mtune to the
|
`(;; Prevent the build system from passing -march and -mtune to the
|
||||||
|
|
|
@ -1,58 +0,0 @@
|
||||||
From de93adfb6f48100946bba2c3abad2a77a0cfde0b Mon Sep 17 00:00:00 2001
|
|
||||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
||||||
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 <fontaine.fabrice@gmail.com>
|
|
||||||
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
|
|
||||||
---
|
|
||||||
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;
|
|
Reference in New Issue