From dc375f71623b01743d49bf01d91a15fe1745f6f6 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 27 Jul 2021 18:27:58 +0100 Subject: dev-libs/libffi-compat: add libffi.so.7 compat slot Bug: https://bugs.gentoo.org/804660 Signed-off-by: Sergei Trofimovich Package-Manager: Portage-3.0.20, Repoman-3.0.3 --- dev-libs/libffi-compat/Manifest | 1 + .../files/libffi-3.3-compiler-vendor-quote.patch | 33 +++++++++ .../files/libffi-3.3-power7-memcpy-2.patch | 28 ++++++++ .../files/libffi-3.3-power7-memcpy.patch | 42 ++++++++++++ .../libffi-compat/files/libffi-3.3-power7.patch | 39 +++++++++++ .../files/libffi-3.3-ppc-int128.patch | 63 +++++++++++++++++ .../files/libffi-3.3-ppc-vector-offset.patch | 53 +++++++++++++++ .../files/libffi-3.3_rc0-ppc-macos-go.patch | 79 ++++++++++++++++++++++ dev-libs/libffi-compat/libffi-compat-3.3-r2.ebuild | 71 +++++++++++++++++++ 9 files changed, 409 insertions(+) create mode 100644 dev-libs/libffi-compat/files/libffi-3.3-compiler-vendor-quote.patch create mode 100644 dev-libs/libffi-compat/files/libffi-3.3-power7-memcpy-2.patch create mode 100644 dev-libs/libffi-compat/files/libffi-3.3-power7-memcpy.patch create mode 100644 dev-libs/libffi-compat/files/libffi-3.3-power7.patch create mode 100644 dev-libs/libffi-compat/files/libffi-3.3-ppc-int128.patch create mode 100644 dev-libs/libffi-compat/files/libffi-3.3-ppc-vector-offset.patch create mode 100644 dev-libs/libffi-compat/files/libffi-3.3_rc0-ppc-macos-go.patch create mode 100644 dev-libs/libffi-compat/libffi-compat-3.3-r2.ebuild (limited to 'dev-libs/libffi-compat') diff --git a/dev-libs/libffi-compat/Manifest b/dev-libs/libffi-compat/Manifest index f77899f02299..222a7e22f068 100644 --- a/dev-libs/libffi-compat/Manifest +++ b/dev-libs/libffi-compat/Manifest @@ -1 +1,2 @@ DIST libffi-3.2.1.tar.gz 940837 BLAKE2B d202ccaa185acfd2476ed2a9b011891507cd8efbbda60f67c583268d1563853442ed829acecbf81c9b6b9a930345780bb7a4bd80e71e50ef544c7f4eab8cb01f SHA512 980ca30a8d76f963fca722432b1fe5af77d7a4e4d2eac5144fbc5374d4c596609a293440573f4294207e1bdd9fda80ad1e1cafb2ffb543df5a275bc3bd546483 +DIST libffi-3.3.tar.gz 1305466 BLAKE2B cddc40729a30a9bd34d675809f51f8d1b4ccaffa54bc6dd6f7e965f4e260edd34754719f9f6247c8957aeb7cf154d56ce1fe16a54c3f1ad39afbebdf41d23caa SHA512 61513801a156f11420f541d325de697131846487122d6bdcf5491b18b4da788589f5c0bb07e88e396495d3be5830d74e9135595e2b8ddbfe95c448d8597fbd6f diff --git a/dev-libs/libffi-compat/files/libffi-3.3-compiler-vendor-quote.patch b/dev-libs/libffi-compat/files/libffi-3.3-compiler-vendor-quote.patch new file mode 100644 index 000000000000..db5b69ce2db9 --- /dev/null +++ b/dev-libs/libffi-compat/files/libffi-3.3-compiler-vendor-quote.patch @@ -0,0 +1,33 @@ +https://bugs.gentoo.org/753299 +--- a/testsuite/lib/libffi.exp ++++ b/testsuite/lib/libffi.exp +@@ -287,9 +287,6 @@ proc libffi-init { args } { + verbose "libffi $blddirffi" + + # Which compiler are we building with? +- set tmp [grep "$blddirffi/config.log" "^ax_cv_c_compiler_vendor.*$"] +- regexp -- {^[^=]*=(.*)$} $tmp nil compiler_vendor +- + if { [string match $compiler_vendor "gnu"] } { + set gccdir [lookfor_file $tool_root_dir gcc/libgcc.a] + if {$gccdir != ""} { +--- a/configure.ac ++++ b/configure.ac +@@ -59,6 +59,7 @@ fi + cat > local.exp < local.exp < +Date: Fri, 29 Nov 2019 07:00:35 -0500 +Subject: [PATCH] Address platforms with no __int128. + +--- + 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++; +-- +2.26.0 + diff --git a/dev-libs/libffi-compat/files/libffi-3.3-power7-memcpy.patch b/dev-libs/libffi-compat/files/libffi-3.3-power7-memcpy.patch new file mode 100644 index 000000000000..91f9a6f60fae --- /dev/null +++ b/dev-libs/libffi-compat/files/libffi-3.3-power7-memcpy.patch @@ -0,0 +1,42 @@ +From e50b9ef8b910fa642ef158f6642e60d54d7ad740 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 7 Dec 2019 02:34:14 -0800 +Subject: [PATCH] powerpc64: Use memcpy to help platforms with no __int128. + (#534) + +Signed-off-by: Khem Raj +--- + src/powerpc/ffi_linux64.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/powerpc/ffi_linux64.c b/src/powerpc/ffi_linux64.c +index 7364770..4d50878 100644 +--- a/src/powerpc/ffi_linux64.c ++++ b/src/powerpc/ffi_linux64.c +@@ -680,9 +680,9 @@ ffi_prep_args64 (extended_cif *ecif, unsigned long *const stack) + { + 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++; + } +-- +2.26.0 + diff --git a/dev-libs/libffi-compat/files/libffi-3.3-power7.patch b/dev-libs/libffi-compat/files/libffi-3.3-power7.patch new file mode 100644 index 000000000000..83f518f4c2e3 --- /dev/null +++ b/dev-libs/libffi-compat/files/libffi-3.3-power7.patch @@ -0,0 +1,39 @@ +https://bugs.gentoo.org/701128 + +From 2138adb2a5b6a0bc2fe3518e0645eacc89b6f392 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Thu, 28 Nov 2019 00:02:42 +0000 +Subject: [PATCH] powerpc: fix build failure on power7 and older + +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 +Signed-off-by: Sergei Trofimovich +--- + src/powerpc/ffi_powerpc.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- 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); +-- +2.24.0 + diff --git a/dev-libs/libffi-compat/files/libffi-3.3-ppc-int128.patch b/dev-libs/libffi-compat/files/libffi-3.3-ppc-int128.patch new file mode 100644 index 000000000000..ed53ae99902f --- /dev/null +++ b/dev-libs/libffi-compat/files/libffi-3.3-ppc-int128.patch @@ -0,0 +1,63 @@ +From 4f9e20ac51ce13d46fed3c869e1deb6d9bb89444 Mon Sep 17 00:00:00 2001 +From: Andrew Geissler +Date: Fri, 1 May 2020 06:58:30 -0500 +Subject: [PATCH] ffi_powerpc.h: fix build failure with powerpc7 (#561) + +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 +Signed-off-by: Andrew Geissler + +Co-authored-by: Fabrice Fontaine +--- + 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.27.0 + diff --git a/dev-libs/libffi-compat/files/libffi-3.3-ppc-vector-offset.patch b/dev-libs/libffi-compat/files/libffi-3.3-ppc-vector-offset.patch new file mode 100644 index 000000000000..4bcd27e4f152 --- /dev/null +++ b/dev-libs/libffi-compat/files/libffi-3.3-ppc-vector-offset.patch @@ -0,0 +1,53 @@ +From 4d6d2866ae43e55325e8ee96561221804602cd7a Mon Sep 17 00:00:00 2001 +From: Samuel Holland +Date: Fri, 21 Feb 2020 21:06:15 -0600 +Subject: [PATCH] Update powerpc sysv assembly for ffi_powerpc.h changes (#541) + +Some of the flag bits were moved when adding powerpc64 vector support. + +Fixes #536 +--- + src/powerpc/sysv.S | 12 +++++------- + 1 file changed, 5 insertions(+), 7 deletions(-) + +diff --git a/src/powerpc/sysv.S b/src/powerpc/sysv.S +index 1474ce7..df97734 100644 +--- a/src/powerpc/sysv.S ++++ b/src/powerpc/sysv.S +@@ -104,17 +104,16 @@ ENTRY(ffi_call_SYSV) + bctrl + + /* Now, deal with the return value. */ +- mtcrf 0x01,%r31 /* cr7 */ ++ mtcrf 0x03,%r31 /* cr6-cr7 */ + bt- 31,L(small_struct_return_value) + bt- 30,L(done_return_value) + #ifndef __NO_FPRS__ + bt- 29,L(fp_return_value) + #endif + stw %r3,0(%r30) +- bf+ 28,L(done_return_value) ++ bf+ 27,L(done_return_value) + stw %r4,4(%r30) +- mtcrf 0x02,%r31 /* cr6 */ +- bf 27,L(done_return_value) ++ bf 26,L(done_return_value) + stw %r5,8(%r30) + stw %r6,12(%r30) + /* Fall through... */ +@@ -145,10 +144,9 @@ L(done_return_value): + #ifndef __NO_FPRS__ + L(fp_return_value): + .cfi_restore_state +- bf 28,L(float_return_value) ++ bf 27,L(float_return_value) + stfd %f1,0(%r30) +- mtcrf 0x02,%r31 /* cr6 */ +- bf 27,L(done_return_value) ++ bf 26,L(done_return_value) + stfd %f2,8(%r30) + b L(done_return_value) + L(float_return_value): +-- +2.27.0 + diff --git a/dev-libs/libffi-compat/files/libffi-3.3_rc0-ppc-macos-go.patch b/dev-libs/libffi-compat/files/libffi-3.3_rc0-ppc-macos-go.patch new file mode 100644 index 000000000000..88f9b4557657 --- /dev/null +++ b/dev-libs/libffi-compat/files/libffi-3.3_rc0-ppc-macos-go.patch @@ -0,0 +1,79 @@ +ffi_darwin: use FFI_GO_CLOSURES guard to avoid unsolvable dependencies + +The go calls depend on compilation and link-time signatures and symbols +which are missing because they aren't build due to FFO_GO_CLOSURES not +being set. + +Signed-off-by: Fabian Groffen + +--- a/src/powerpc/ffi_darwin.c 2018-04-02 14:21:51.000000000 +0200 ++++ b/src/powerpc/ffi_darwin.c 2018-12-10 13:57:26.000000000 +0100 +@@ -909,8 +909,10 @@ + extern void ffi_call_AIX(extended_cif *, long, unsigned, unsigned *, + void (*fn)(void), void (*fn2)(void)); + ++#if FFI_GO_CLOSURES + extern void ffi_call_go_AIX(extended_cif *, long, unsigned, unsigned *, + void (*fn)(void), void (*fn2)(void), void *closure); ++#endif + + extern void ffi_call_DARWIN(extended_cif *, long, unsigned, unsigned *, + void (*fn)(void), void (*fn2)(void), ffi_type*); +@@ -950,6 +952,7 @@ + } + } + ++#if FFI_GO_CLOSURES + void + ffi_call_go (ffi_cif *cif, void (*fn) (void), void *rvalue, void **avalue, + void *closure) +@@ -981,6 +984,7 @@ + break; + } + } ++#endif + + static void flush_icache(char *); + static void flush_range(char *, int); +@@ -1110,6 +1114,7 @@ + return FFI_OK; + } + ++#if FFI_GO_CLOSURES + ffi_status + ffi_prep_go_closure (ffi_go_closure* closure, + ffi_cif* cif, +@@ -1133,6 +1138,7 @@ + } + return FFI_OK; + } ++#endif + + static void + flush_icache(char *addr) +@@ -1168,9 +1174,11 @@ + ffi_closure_helper_DARWIN (ffi_closure *, void *, + unsigned long *, ffi_dblfl *); + ++#if FFI_GO_CLOSURES + ffi_type * + ffi_go_closure_helper_DARWIN (ffi_go_closure*, void *, + unsigned long *, ffi_dblfl *); ++#endif + + /* Basically the trampoline invokes ffi_closure_ASM, and on + entry, r11 holds the address of the closure. +@@ -1430,6 +1438,7 @@ + closure->user_data, rvalue, pgr, pfr); + } + ++#if FFI_GO_CLOSURES + ffi_type * + ffi_go_closure_helper_DARWIN (ffi_go_closure *closure, void *rvalue, + unsigned long *pgr, ffi_dblfl *pfr) +@@ -1437,4 +1446,5 @@ + return ffi_closure_helper_common (closure->cif, closure->fun, + closure, rvalue, pgr, pfr); + } ++#endif + diff --git a/dev-libs/libffi-compat/libffi-compat-3.3-r2.ebuild b/dev-libs/libffi-compat/libffi-compat-3.3-r2.ebuild new file mode 100644 index 000000000000..2cfc48a26b21 --- /dev/null +++ b/dev-libs/libffi-compat/libffi-compat-3.3-r2.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit libtool multilib-minimal + +DESCRIPTION="a portable, high level programming interface to various calling conventions" +HOMEPAGE="https://sourceware.org/libffi/" +SRC_URI="https://github.com/libffi/libffi/releases/download/v${PV}/libffi-${PV}.tar.gz" + +LICENSE="MIT" +SLOT="7" # SONAME=libffi.so.7 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="debug pax-kernel test" + +RESTRICT="!test? ( test )" + +RDEPEND="!dev-libs/libffi:0/7" # conflicts on libffi.so.7 +DEPEND="" +BDEPEND="test? ( dev-util/dejagnu )" + +DOCS="ChangeLog* README.md" + +PATCHES=( + "${FILESDIR}"/libffi-3.2.1-o-tmpfile-eacces.patch #529044 + "${FILESDIR}"/libffi-3.3_rc0-ppc-macos-go.patch + "${FILESDIR}"/libffi-3.3-power7.patch + "${FILESDIR}"/libffi-3.3-power7-memcpy.patch + "${FILESDIR}"/libffi-3.3-power7-memcpy-2.patch + "${FILESDIR}"/libffi-3.3-ppc-int128.patch + "${FILESDIR}"/libffi-3.3-ppc-vector-offset.patch + "${FILESDIR}"/libffi-3.3-compiler-vendor-quote.patch +) + +S=${WORKDIR}/libffi-${PV} + +ECONF_SOURCE=${S} + +src_prepare() { + default + if [[ ${CHOST} == arm64-*-darwin* ]] ; then + # ensure we use aarch64 asm, not x86 on arm64 + sed -i -e 's/aarch64\*-\*-\*/arm64*-*-*|&/' \ + configure configure.host || die + fi +} + +multilib_src_configure() { + use userland_BSD && export HOST="${CHOST}" + # --includedir= path maintains a few properties: + # 1. have stable name across libffi versions: some packages like + # dev-lang/ghc or kde-frameworks/networkmanager-qt embed + # ${includedir} at build-time. Don't require those to be + # rebuilt unless SONAME changes. bug #695788 + # + # We use /usr/.../${PN} (instead of former /usr/.../${P}). + # + # 2. have ${ABI}-specific location as ffi.h is target-dependent. + # + # We use /usr/$(get_libdir)/... to have ABI identifier. + econf \ + --includedir="${EPREFIX}"/usr/$(get_libdir)/${PN}/include \ + --disable-multi-os-directory \ + --disable-static \ + $(use_enable pax-kernel pax_emutramp) \ + $(use_enable debug) +} + +multilib_src_install() { + dolib.so .libs/libffi.so.${SLOT}* +} -- cgit v1.2.3-65-gdbad