libffi: Fix build on ppc64

Similar fix was applied already upstream but not extended to all the
cases

(From OE-Core rev: ec6d1e337f36d75588133d5b6988ee438600b8ad)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2019-12-05 17:32:36 -08:00
committed by Richard Purdie
parent 7b228f2d79
commit 22e4a63816
2 changed files with 35 additions and 0 deletions

View File

@@ -0,0 +1,34 @@
Address platforms with no __int128.
Fixes remaining pieces from
https://github.com/libffi/libffi/commit/6663047f56c2932a6b10a790f4ac6666dd181326
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
--- a/src/powerpc/ffi_linux64.c.org 2019-12-05 14:48:33.140579431 -0800
+++ a/src/powerpc/ffi_linux64.c 2019-12-05 14:53:58.827244495 -0800
@@ -680,9 +680,9 @@ ffi_prep_args64 (extended_cif *ecif, uns
{
if (vecarg_count < NUM_VEC_ARG_REGISTERS64
&& i < nfixedargs)
- *vec_base.f128++ = *arg.f128++;
+ memcpy (vec_base.f128++, arg.f128, sizeof (float128));
else
- *next_arg.f128 = *arg.f128++;
+ memcpy (next_arg.f128, arg.f128++, sizeof (float128));
if (++next_arg.f128 == gpr_end.f128)
next_arg.f128 = rest.f128;
vecarg_count++;
@@ -986,9 +986,9 @@ ffi_closure_helper_LINUX64 (ffi_cif *cif
do
{
if (pvec < end_pvec && i < nfixedargs)
- *to.f128 = *pvec++;
+ memcpy (to.f128, pvec++, sizeof (float128));
else
- *to.f128 = *from.f128;
+ memcpy (to.f128, from.f128, sizeof (float128));
to.f128++;
from.f128++;
}

View File

@@ -15,6 +15,7 @@ SRC_URI = "https://github.com/libffi/libffi/releases/download/v${PV}/${BPN}-${PV
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 \
file://0001-Address-platforms-with-no-__int128-part2.patch \
"
SRC_URI[md5sum] = "6313289e32f1d38a9df4770b014a2ca7"
SRC_URI[sha256sum] = "72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056"