Yocto 4.2+ moved to libffi 3.4.x, that ships libffi.so.8 while intel-oneapi-compiler was still linked with libffi.so.7.
Revive the libffi recipe with changes so it can coexist with the newer libffi version in openembedded-core. Signed-off-by: Zoltán Böszörményi <[email protected]> --- ...ess-platforms-with-no-__int128-part2.patch | 34 ++++++ ...1-Address-platforms-with-no-__int128.patch | 27 +++++ ...-missed-ifndef-for-__mips_soft_float.patch | 27 +++++ ...m-sysv-reverted-clang-VFP-mitigation.patch | 104 ++++++++++++++++++ ...pc.h-fix-build-failure-with-powerpc7.patch | 62 +++++++++++ ...uild-failure-on-power7-and-older-532.patch | 38 +++++++ .../libffi/libffi33/not-win32.patch | 35 ++++++ .../recipes-support/libffi/libffi33_3.3.bb | 44 ++++++++ 8 files changed, 371 insertions(+) create mode 100644 dynamic-layers/openembedded-layer/recipes-support/libffi/libffi33/0001-Address-platforms-with-no-__int128-part2.patch create mode 100644 dynamic-layers/openembedded-layer/recipes-support/libffi/libffi33/0001-Address-platforms-with-no-__int128.patch create mode 100644 dynamic-layers/openembedded-layer/recipes-support/libffi/libffi33/0001-Fixed-missed-ifndef-for-__mips_soft_float.patch create mode 100644 dynamic-layers/openembedded-layer/recipes-support/libffi/libffi33/0001-arm-sysv-reverted-clang-VFP-mitigation.patch create mode 100644 dynamic-layers/openembedded-layer/recipes-support/libffi/libffi33/0001-ffi_powerpc.h-fix-build-failure-with-powerpc7.patch create mode 100644 dynamic-layers/openembedded-layer/recipes-support/libffi/libffi33/0001-powerpc-fix-build-failure-on-power7-and-older-532.patch create mode 100644 dynamic-layers/openembedded-layer/recipes-support/libffi/libffi33/not-win32.patch create mode 100644 dynamic-layers/openembedded-layer/recipes-support/libffi/libffi33_3.3.bb diff --git a/dynamic-layers/openembedded-layer/recipes-support/libffi/libffi33/0001-Address-platforms-with-no-__int128-part2.patch b/dynamic-layers/openembedded-layer/recipes-support/libffi/libffi33/0001-Address-platforms-with-no-__int128-part2.patch new file mode 100644 index 00000000..6b5b7d47 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/libffi/libffi33/0001-Address-platforms-with-no-__int128-part2.patch @@ -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 <[email protected]> + +--- 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++; + } diff --git a/dynamic-layers/openembedded-layer/recipes-support/libffi/libffi33/0001-Address-platforms-with-no-__int128.patch b/dynamic-layers/openembedded-layer/recipes-support/libffi/libffi33/0001-Address-platforms-with-no-__int128.patch new file mode 100644 index 00000000..2e32a502 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/libffi/libffi33/0001-Address-platforms-with-no-__int128.patch @@ -0,0 +1,27 @@ +From 68f45b9049dffb54f5a29a3a495ab3dfcf010634 Mon Sep 17 00:00:00 2001 +From: Anthony Green <[email protected]> +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 <[email protected]> +--- + 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++; diff --git a/dynamic-layers/openembedded-layer/recipes-support/libffi/libffi33/0001-Fixed-missed-ifndef-for-__mips_soft_float.patch b/dynamic-layers/openembedded-layer/recipes-support/libffi/libffi33/0001-Fixed-missed-ifndef-for-__mips_soft_float.patch new file mode 100644 index 00000000..397194bc --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/libffi/libffi33/0001-Fixed-missed-ifndef-for-__mips_soft_float.patch @@ -0,0 +1,27 @@ +From 14e2e74682db3bfcf057688f738fdd842a02ff2d Mon Sep 17 00:00:00 2001 +From: Carl Hurd <[email protected]> +Date: Wed, 18 Jul 2018 09:04:32 -0400 +Subject: [PATCH] Fixed missed #ifndef for __mips_soft_float + +Signed-off-by: Peter Kjellerstedt <[email protected]> +Upstream-Status: Submitted [https://github.com/libffi/libffi/pull/442] +--- + src/mips/o32.S | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/mips/o32.S b/src/mips/o32.S +index 44e74cb..799139b 100644 +--- a/src/mips/o32.S ++++ b/src/mips/o32.S +@@ -282,9 +282,11 @@ $LCFI12: + li $13, 1 # FFI_O32 + bne $16, $13, 1f # Skip fp save if FFI_O32_SOFT_FLOAT + ++#ifndef __mips_soft_float + # Store all possible float/double registers. + s.d $f12, FA_0_0_OFF2($fp) + s.d $f14, FA_1_0_OFF2($fp) ++#endif + 1: + # prepare arguments for ffi_closure_mips_inner_O32 + REG_L a0, 4($15) # cif diff --git a/dynamic-layers/openembedded-layer/recipes-support/libffi/libffi33/0001-arm-sysv-reverted-clang-VFP-mitigation.patch b/dynamic-layers/openembedded-layer/recipes-support/libffi/libffi33/0001-arm-sysv-reverted-clang-VFP-mitigation.patch new file mode 100644 index 00000000..782dce70 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/libffi/libffi33/0001-arm-sysv-reverted-clang-VFP-mitigation.patch @@ -0,0 +1,104 @@ +From 501a6b55853af549fae72723e74271f2a4ec7cf6 Mon Sep 17 00:00:00 2001 +From: Brett Warren <[email protected]> +Date: Fri, 27 Nov 2020 15:28:42 +0000 +Subject: [PATCH] arm/sysv: reverted clang VFP mitigation + +Since commit e3d2812ce43940aacae5bab2d0e965278cb1e7ea, +seperate instructions were used when compiling under clang, +as clang didn't allow the directives at the time. This mitigation +now causes compilation to fail under clang 10, as described by +https://github.com/libffi/libffi/issues/607. Now that +clang supports the LDC and SDC instructions, this mitigation +has been reverted. + +Upstream-Status: Pending +Signed-off-by: Brett Warren <[email protected]> +--- + src/arm/sysv.S | 33 --------------------------------- + 1 file changed, 33 deletions(-) + +diff --git a/src/arm/sysv.S b/src/arm/sysv.S +index 63180a4..e3ce526 100644 +--- a/src/arm/sysv.S ++++ b/src/arm/sysv.S +@@ -128,13 +128,8 @@ ARM_FUNC_START(ffi_call_VFP) + cfi_startproc + + cmp r3, #3 @ load only d0 if possible +-#ifdef __clang__ +- vldrle d0, [sp] +- vldmgt sp, {d0-d7} +-#else + ldcle p11, cr0, [r0] @ vldrle d0, [sp] + ldcgt p11, cr0, [r0], {16} @ vldmgt sp, {d0-d7} +-#endif + add r0, r0, #64 @ discard the vfp register args + /* FALLTHRU */ + ARM_FUNC_END(ffi_call_VFP) +@@ -172,25 +167,13 @@ ARM_FUNC_START(ffi_call_SYSV) + nop + 0: + E(ARM_TYPE_VFP_S) +-#ifdef __clang__ +- vstr s0, [r2] +-#else + stc p10, cr0, [r2] @ vstr s0, [r2] +-#endif + pop {fp,pc} + E(ARM_TYPE_VFP_D) +-#ifdef __clang__ +- vstr d0, [r2] +-#else + stc p11, cr0, [r2] @ vstr d0, [r2] +-#endif + pop {fp,pc} + E(ARM_TYPE_VFP_N) +-#ifdef __clang__ +- vstm r2, {d0-d3} +-#else + stc p11, cr0, [r2], {8} @ vstm r2, {d0-d3} +-#endif + pop {fp,pc} + E(ARM_TYPE_INT64) + str r1, [r2, #4] +@@ -287,11 +270,7 @@ ARM_FUNC_START(ffi_closure_VFP) + add ip, sp, #16 + sub sp, sp, #64+32 @ allocate frame + cfi_adjust_cfa_offset(64+32) +-#ifdef __clang__ +- vstm sp, {d0-d7} +-#else + stc p11, cr0, [sp], {16} @ vstm sp, {d0-d7} +-#endif + stmdb sp!, {ip,lr} + + /* See above. */ +@@ -320,25 +299,13 @@ ARM_FUNC_START_LOCAL(ffi_closure_ret) + cfi_rel_offset(lr, 4) + 0: + E(ARM_TYPE_VFP_S) +-#ifdef __clang__ +- vldr s0, [r2] +-#else + ldc p10, cr0, [r2] @ vldr s0, [r2] +-#endif + ldm sp, {sp,pc} + E(ARM_TYPE_VFP_D) +-#ifdef __clang__ +- vldr d0, [r2] +-#else + ldc p11, cr0, [r2] @ vldr d0, [r2] +-#endif + ldm sp, {sp,pc} + E(ARM_TYPE_VFP_N) +-#ifdef __clang__ +- vldm r2, {d0-d3} +-#else + ldc p11, cr0, [r2], {8} @ vldm r2, {d0-d3} +-#endif + ldm sp, {sp,pc} + E(ARM_TYPE_INT64) + ldr r1, [r2, #4] +-- +2.17.1 + diff --git a/dynamic-layers/openembedded-layer/recipes-support/libffi/libffi33/0001-ffi_powerpc.h-fix-build-failure-with-powerpc7.patch b/dynamic-layers/openembedded-layer/recipes-support/libffi/libffi33/0001-ffi_powerpc.h-fix-build-failure-with-powerpc7.patch new file mode 100644 index 00000000..52e6e453 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/libffi/libffi33/0001-ffi_powerpc.h-fix-build-failure-with-powerpc7.patch @@ -0,0 +1,62 @@ +From de93adfb6f48100946bba2c3abad2a77a0cfde0b Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine <[email protected]> +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 + +Upstream-Status: Submitted [https://github.com/libffi/libffi/pull/561] +Signed-off-by: Fabrice Fontaine <[email protected]> +Signed-off-by: Andrew Geissler <[email protected]> +--- + 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 8e2f2f0..960a5c4 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.21.0 (Apple Git-122) + diff --git a/dynamic-layers/openembedded-layer/recipes-support/libffi/libffi33/0001-powerpc-fix-build-failure-on-power7-and-older-532.patch b/dynamic-layers/openembedded-layer/recipes-support/libffi/libffi33/0001-powerpc-fix-build-failure-on-power7-and-older-532.patch new file mode 100644 index 00000000..8a7aea43 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/libffi/libffi33/0001-powerpc-fix-build-failure-on-power7-and-older-532.patch @@ -0,0 +1,38 @@ +From 4dc6cc961300b9deffb648b1237390a5bea1c6d6 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <[email protected]> +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 <[email protected]> +Signed-off-by: Alexander Kanavin <[email protected]> +--- + 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); diff --git a/dynamic-layers/openembedded-layer/recipes-support/libffi/libffi33/not-win32.patch b/dynamic-layers/openembedded-layer/recipes-support/libffi/libffi33/not-win32.patch new file mode 100644 index 00000000..62daaf4b --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/libffi/libffi33/not-win32.patch @@ -0,0 +1,35 @@ +From 306719369a0d3608b4ff2737de74ae284788a14b Mon Sep 17 00:00:00 2001 +From: Ross Burton <[email protected]> +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 +libffi.pc. When pkg-config is then used to obtain the linker flags for libffi +it can't tell that this path is on the default search path and returns +$SYSROOT/usr/lib/../lib which then gets written all over the target sysroot. +This then means the sstate can't be shared and triggers QA errors. + +As this block is generally pointless, disable it. + +Upstream-Status: Inappropriate +Signed-off-by: Ross Burton <[email protected]> + +--- + 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 +@@ -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... +-if test "x$GCC" = "xyes"; then ++if false; then + if test -n "$with_cross_host" && + test x"$with_cross_host" != x"no"; then + toolexecdir='${exec_prefix}'/'$(target_alias)' diff --git a/dynamic-layers/openembedded-layer/recipes-support/libffi/libffi33_3.3.bb b/dynamic-layers/openembedded-layer/recipes-support/libffi/libffi33_3.3.bb new file mode 100644 index 00000000..970d9fb8 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/libffi/libffi33_3.3.bb @@ -0,0 +1,44 @@ +SUMMARY = "A portable foreign function interface library" +HOMEPAGE = "http://sourceware.org/libffi/"; +DESCRIPTION = "The `libffi' library provides a portable, high level programming interface to various calling \ +conventions. This allows a programmer to call any function specified by a call interface description at run \ +time. FFI stands for Foreign Function Interface. A foreign function interface is the popular name for the \ +interface that allows code written in one language to call code written in another language. The `libffi' \ +library really only provides the lowest, machine dependent layer of a fully featured foreign function interface. \ +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=492385fe22195952f5b9b197868ba268" + +S = "${WORKDIR}/libffi-${PV}" + +SRC_URI = "https://github.com/libffi/libffi/releases/download/v${PV}/libffi-${PV}.tar.gz \ + file://not-win32.patch \ + file://0001-Fixed-missed-ifndef-for-__mips_soft_float.patch \ + file://0001-arm-sysv-reverted-clang-VFP-mitigation.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 \ + file://0001-ffi_powerpc.h-fix-build-failure-with-powerpc7.patch \ + " +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" + +EXTRA_OECONF += "--disable-builddir" +EXTRA_OEMAKE_class-target = "LIBTOOLFLAGS='--tag=CC'" +inherit autotools texinfo multilib_header + +do_install:append() { + oe_multilib_header ffi.h ffitarget.h +} + +FILES:${PN}-dev += "${libdir}/libffi-${PV}" + +# Doesn't compile in MIPS16e mode due to use of hand-written +# assembly +MIPS_INSTRUCTION_SET = "mips" + +BBCLASSEXTEND = "native nativesdk" + -- 2.40.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#7995): https://lists.yoctoproject.org/g/meta-intel/message/7995 Mute This Topic: https://lists.yoctoproject.org/mt/99425261/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
