summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/libffi
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2019-12-05 17:32:36 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-12-09 12:00:42 +0000
commit22e4a638163cdee5d0693cf73ad1abde0665253f (patch)
treeb660feda28b3aeebbc8a4a9577bf6030b93980ea /meta/recipes-support/libffi
parent7b228f2d796cb8e46c81cad4a9273311324d76bf (diff)
downloadpoky-22e4a638163cdee5d0693cf73ad1abde0665253f.tar.gz
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>
Diffstat (limited to 'meta/recipes-support/libffi')
-rw-r--r--meta/recipes-support/libffi/libffi/0001-Address-platforms-with-no-__int128-part2.patch34
-rw-r--r--meta/recipes-support/libffi/libffi_3.3.bb1
2 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-support/libffi/libffi/0001-Address-platforms-with-no-__int128-part2.patch b/meta/recipes-support/libffi/libffi/0001-Address-platforms-with-no-__int128-part2.patch
new file mode 100644
index 0000000000..6b5b7d4747
--- /dev/null
+++ b/meta/recipes-support/libffi/libffi/0001-Address-platforms-with-no-__int128-part2.patch
@@ -0,0 +1,34 @@
1Address platforms with no __int128.
2
3Fixes remaining pieces from
4https://github.com/libffi/libffi/commit/6663047f56c2932a6b10a790f4ac6666dd181326
5
6Upstream-Status: Pending
7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8
9--- a/src/powerpc/ffi_linux64.c.org 2019-12-05 14:48:33.140579431 -0800
10+++ a/src/powerpc/ffi_linux64.c 2019-12-05 14:53:58.827244495 -0800
11@@ -680,9 +680,9 @@ ffi_prep_args64 (extended_cif *ecif, uns
12 {
13 if (vecarg_count < NUM_VEC_ARG_REGISTERS64
14 && i < nfixedargs)
15- *vec_base.f128++ = *arg.f128++;
16+ memcpy (vec_base.f128++, arg.f128, sizeof (float128));
17 else
18- *next_arg.f128 = *arg.f128++;
19+ memcpy (next_arg.f128, arg.f128++, sizeof (float128));
20 if (++next_arg.f128 == gpr_end.f128)
21 next_arg.f128 = rest.f128;
22 vecarg_count++;
23@@ -986,9 +986,9 @@ ffi_closure_helper_LINUX64 (ffi_cif *cif
24 do
25 {
26 if (pvec < end_pvec && i < nfixedargs)
27- *to.f128 = *pvec++;
28+ memcpy (to.f128, pvec++, sizeof (float128));
29 else
30- *to.f128 = *from.f128;
31+ memcpy (to.f128, from.f128, sizeof (float128));
32 to.f128++;
33 from.f128++;
34 }
diff --git a/meta/recipes-support/libffi/libffi_3.3.bb b/meta/recipes-support/libffi/libffi_3.3.bb
index f57d03d2f5..803a25fa35 100644
--- a/meta/recipes-support/libffi/libffi_3.3.bb
+++ b/meta/recipes-support/libffi/libffi_3.3.bb
@@ -15,6 +15,7 @@ SRC_URI = "https://github.com/libffi/libffi/releases/download/v${PV}/${BPN}-${PV
15 file://0001-Fixed-missed-ifndef-for-__mips_soft_float.patch \ 15 file://0001-Fixed-missed-ifndef-for-__mips_soft_float.patch \
16 file://0001-powerpc-fix-build-failure-on-power7-and-older-532.patch \ 16 file://0001-powerpc-fix-build-failure-on-power7-and-older-532.patch \
17 file://0001-Address-platforms-with-no-__int128.patch \ 17 file://0001-Address-platforms-with-no-__int128.patch \
18 file://0001-Address-platforms-with-no-__int128-part2.patch \
18 " 19 "
19SRC_URI[md5sum] = "6313289e32f1d38a9df4770b014a2ca7" 20SRC_URI[md5sum] = "6313289e32f1d38a9df4770b014a2ca7"
20SRC_URI[sha256sum] = "72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056" 21SRC_URI[sha256sum] = "72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056"