mirror of
https://git.yoctoproject.org/poky
synced 2026-04-30 12:32:12 +02:00
libffi: update to 3.3 final
Add a couple patches to address ppc(64) build failures. License-Update: copyright years (From OE-Core rev: 9aab37ac40c8da5121a931f5979fcc88489021d2) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
committed by
Richard Purdie
Richard Purdie
parent
c96f31006d
commit
991e2b5879
@@ -0,0 +1,27 @@
|
||||
From 68f45b9049dffb54f5a29a3a495ab3dfcf010634 Mon Sep 17 00:00:00 2001
|
||||
From: Anthony Green <green@moxielogic.com>
|
||||
Date: Fri, 29 Nov 2019 07:00:35 -0500
|
||||
Subject: [PATCH] Address platforms with no __int128.
|
||||
|
||||
Upstream-Status: Backport [https://github.com/libffi/libffi/commit/6663047f56c2932a6b10a790f4ac6666dd181326]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
---
|
||||
src/powerpc/ffi_linux64.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/powerpc/ffi_linux64.c b/src/powerpc/ffi_linux64.c
|
||||
index de0d033..7364770 100644
|
||||
--- a/src/powerpc/ffi_linux64.c
|
||||
+++ b/src/powerpc/ffi_linux64.c
|
||||
@@ -547,9 +547,9 @@ ffi_prep_args64 (extended_cif *ecif, unsigned long *const stack)
|
||||
if (next_arg.ul == gpr_end.ul)
|
||||
next_arg.ul = rest.ul;
|
||||
if (vecarg_count < NUM_VEC_ARG_REGISTERS64 && i < nfixedargs)
|
||||
- *vec_base.f128++ = **p_argv.f128;
|
||||
+ memcpy (vec_base.f128++, *p_argv.f128, sizeof (float128));
|
||||
else
|
||||
- *next_arg.f128 = **p_argv.f128;
|
||||
+ memcpy (next_arg.f128, *p_argv.f128, sizeof (float128));
|
||||
if (++next_arg.f128 == gpr_end.f128)
|
||||
next_arg.f128 = rest.f128;
|
||||
vecarg_count++;
|
||||
@@ -1,12 +1,11 @@
|
||||
From 4149a7627a998731cc246d3f58a36808745d04c8 Mon Sep 17 00:00:00 2001
|
||||
From 14e2e74682db3bfcf057688f738fdd842a02ff2d Mon Sep 17 00:00:00 2001
|
||||
From: Carl Hurd <carl@Carls-MacBook-Pro.local>
|
||||
Date: Wed, 18 Jul 2018 09:04:32 -0400
|
||||
Subject: [PATCH] Fixed missed #ifndef for __mips_soft_float
|
||||
|
||||
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
|
||||
---
|
||||
Upstream-Status: Submitted [https://github.com/libffi/libffi/pull/442]
|
||||
|
||||
---
|
||||
src/mips/o32.S | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
@@ -26,6 +25,3 @@ index 44e74cb..799139b 100644
|
||||
1:
|
||||
# prepare arguments for ffi_closure_mips_inner_O32
|
||||
REG_L a0, 4($15) # cif
|
||||
--
|
||||
2.21.0
|
||||
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
From 4dc6cc961300b9deffb648b1237390a5bea1c6d6 Mon Sep 17 00:00:00 2001
|
||||
From: Sergei Trofimovich <slyfox@gentoo.org>
|
||||
Date: Thu, 28 Nov 2019 12:42:41 +0000
|
||||
Subject: [PATCH] powerpc: fix build failure on power7 and older (#532)
|
||||
|
||||
Build failure looks as:
|
||||
```
|
||||
libtool: compile: powerpc-unknown-linux-gnu-gcc \
|
||||
-O2 -mcpu=powerpc -mtune=powerpc -pipe ... -c src/powerpc/ffi.c ...
|
||||
In file included from src/powerpc/ffi.c:33:
|
||||
src/powerpc/ffi_powerpc.h:65:9: error: '__int128' is not supported on this target
|
||||
65 | typedef __int128 float128;
|
||||
| ^~~~~~~~
|
||||
```
|
||||
|
||||
The fix avoids using __int128 in favour of aligned char[16].
|
||||
|
||||
Closes: https://github.com/libffi/libffi/issues/531
|
||||
Upstream-Status: Backport [https://github.com/libffi/libffi/commit/01a75ed76ea7e57f1b7a5c183e2b1e890e6aa0fd]
|
||||
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.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 5ee2a70..8e2f2f0 100644
|
||||
--- a/src/powerpc/ffi_powerpc.h
|
||||
+++ b/src/powerpc/ffi_powerpc.h
|
||||
@@ -62,7 +62,7 @@ typedef _Float128 float128;
|
||||
#elif defined(__FLOAT128__)
|
||||
typedef __float128 float128;
|
||||
#else
|
||||
-typedef __int128 float128;
|
||||
+typedef char float128[16] __attribute__((aligned(16)));
|
||||
#endif
|
||||
|
||||
void FFI_HIDDEN ffi_closure_SYSV (void);
|
||||
@@ -1,3 +1,8 @@
|
||||
From 306719369a0d3608b4ff2737de74ae284788a14b Mon Sep 17 00:00:00 2001
|
||||
From: Ross Burton <ross.burton@intel.com>
|
||||
Date: Thu, 4 Feb 2016 16:22:50 +0000
|
||||
Subject: [PATCH] libffi: ensure sysroot paths are not in libffi.pc
|
||||
|
||||
libffi's configure assumes that cross-compiled builds are complicated and
|
||||
introduces convoluted path manipulation involving gcc search paths to the
|
||||
install paths, resulting in paths like -L/usr/lib/../lib/ appearing in
|
||||
@@ -11,9 +16,15 @@ As this block is generally pointless, disable it.
|
||||
Upstream-Status: Inappropriate
|
||||
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||||
|
||||
---
|
||||
configure.ac | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index b764368..d51ce91 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -350,7 +350,7 @@ AC_ARG_ENABLE(multi-os-directory,
|
||||
@@ -354,7 +354,7 @@ AC_ARG_ENABLE(multi-os-directory,
|
||||
|
||||
# These variables are only ever used when we cross-build to X86_WIN32.
|
||||
# And we only support this with GCC, so...
|
||||
@@ -21,4 +32,4 @@ Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||||
+if false; then
|
||||
if test -n "$with_cross_host" &&
|
||||
test x"$with_cross_host" != x"no"; then
|
||||
toolexecdir="${exec_prefix}"/'$(target_alias)'
|
||||
toolexecdir='${exec_prefix}'/'$(target_alias)'
|
||||
|
||||
@@ -8,24 +8,23 @@ library really only provides the lowest, machine dependent layer of a fully feat
|
||||
A layer must exist above `libffi' that handles type conversions for values passed between the two languages."
|
||||
|
||||
LICENSE = "MIT"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=3610bb17683a0089ed64055416b2ae1b"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=492385fe22195952f5b9b197868ba268"
|
||||
|
||||
SRC_URI = "https://github.com/libffi/libffi/releases/download/v3.3-rc0/libffi-3.3-rc0.tar.gz \
|
||||
SRC_URI = "https://github.com/libffi/libffi/releases/download/v${PV}/${BPN}-${PV}.tar.gz \
|
||||
file://not-win32.patch \
|
||||
file://0001-Fixed-missed-ifndef-for-__mips_soft_float.patch \
|
||||
file://0001-powerpc-fix-build-failure-on-power7-and-older-532.patch \
|
||||
file://0001-Address-platforms-with-no-__int128.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "8d2a82a78faf10a5e53c27d986e8f04e"
|
||||
SRC_URI[sha256sum] = "403d67aabf1c05157855ea2b1d9950263fb6316536c8c333f5b9ab1eb2f20ecf"
|
||||
SRC_URI[md5sum] = "6313289e32f1d38a9df4770b014a2ca7"
|
||||
SRC_URI[sha256sum] = "72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056"
|
||||
UPSTREAM_CHECK_URI = "https://github.com/libffi/libffi/releases/"
|
||||
UPSTREAM_CHECK_REGEX = "libffi-(?P<pver>\d+(\.\d+)+)\.tar"
|
||||
UPSTREAM_VERSION_UNKNOWN = "1"
|
||||
|
||||
EXTRA_OECONF += "--disable-builddir"
|
||||
EXTRA_OEMAKE_class-target = "LIBTOOLFLAGS='--tag=CC'"
|
||||
inherit autotools texinfo multilib_header
|
||||
|
||||
S = "${WORKDIR}/${BPN}-3.3-rc0"
|
||||
|
||||
do_install_append() {
|
||||
oe_multilib_header ffi.h
|
||||
}
|
||||
Reference in New Issue
Block a user