diff options
Diffstat (limited to 'system/libffi')
| -rw-r--r-- | system/libffi/APKBUILD | 31 | ||||
| -rw-r--r-- | system/libffi/disable-ppc-ldvariant.patch | 11 | ||||
| -rw-r--r-- | system/libffi/fix-testsuite-longdouble.patch | 44 | ||||
| -rw-r--r-- | system/libffi/fix-testsuite-opts.patch | 11 | ||||
| -rw-r--r-- | system/libffi/gnu-linux-define.patch | 15 | ||||
| -rw-r--r-- | system/libffi/powerpc-fixes.patch | 79 |
6 files changed, 7 insertions, 184 deletions
diff --git a/system/libffi/APKBUILD b/system/libffi/APKBUILD index 07a5be5eb..48f7bb2d5 100644 --- a/system/libffi/APKBUILD +++ b/system/libffi/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libffi -pkgver=3.2.1 -pkgrel=6 -pkgdesc="A portable, high level programming interface to various calling conventions." +pkgver=3.4.4 +pkgrel=0 +pkgdesc="A portable foreign function interface library" url="https://sourceware.org/libffi" arch="all" license="MIT" @@ -10,13 +10,7 @@ depends="" makedepends="texinfo" checkdepends="dejagnu" subpackages="$pkgname-dev $pkgname-doc" -source="https://sourceware.org/pub/$pkgname/$pkgname-$pkgver.tar.gz - disable-ppc-ldvariant.patch - fix-testsuite-longdouble.patch - fix-testsuite-opts.patch - gnu-linux-define.patch - powerpc-fixes.patch - " +source="https://github.com/$pkgname/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz" build () { ./configure \ @@ -27,6 +21,8 @@ build () { } check() { + rm -v testsuite/libffi.call/s55.c #979 + make check } @@ -34,19 +30,6 @@ package() { make DESTDIR=""$pkgdir"" install install -m755 -d ""$pkgdir"/usr/share/licenses/$pkgname" install -m644 LICENSE ""$pkgdir"/usr/share/licenses/$pkgname/" - # fix location for headers - # see also: https://github.com/libffi/libffi/issues/24 - mkdir -p "$pkgdir"/usr/include/ - mv "$pkgdir"/usr/lib/libffi-$pkgver/include/*.h \ - "$pkgdir"/usr/include/ - rmdir "$pkgdir"/usr/lib/libffi-$pkgver/include || true - sed -i -e '/^includedir=/{s,=.*,=/usr/include,g}' \ - "$pkgdir"/usr/lib/pkgconfig/libffi.pc } -sha512sums="980ca30a8d76f963fca722432b1fe5af77d7a4e4d2eac5144fbc5374d4c596609a293440573f4294207e1bdd9fda80ad1e1cafb2ffb543df5a275bc3bd546483 libffi-3.2.1.tar.gz -cfd3b11a0e168fd74da0a6219c95610df3466b0769966351b2a5076c93a75996daf9aed41644bebb80e28793bbe18d62272385afd7813c472104cc6c93dcba41 disable-ppc-ldvariant.patch -de92cb20ded7bfefc3e469ba2ac2d9d869d67dc172ec7e2d1222f8530944eb6d5016ae913baf01ac2e26bee1624c682ae9dd08d0e45d5532d59298dbe7e417eb fix-testsuite-longdouble.patch -9b4b1d1b54cc7c96c44ba727556d9bfd2ab261a594061223df2fbd47ae7a067a7b9a3db92dc2e1b45d8c502bf4a192f8988c7638737c7aacfeac31ed1536891a fix-testsuite-opts.patch -264af568ae5388d50f647f891a406945c73cc358692266f65ad341787c0bf5f6bf31203b86c39fa1b338101c1a6d2f4fec60f95a90d379951ff5153f8f9e178f gnu-linux-define.patch -bb3eb51a196aac2849fa0d0214e46f1428d55c8ed4375e5f8cf7fc9076927db935f97ac4d6e61a101897ac6ddc137a0a61e210b8d91888e938c6af122700e935 powerpc-fixes.patch" +sha512sums="88680aeb0fa0dc0319e5cd2ba45b4b5a340bc9b4bcf20b1e0613b39cd898f177a3863aa94034d8e23a7f6f44d858a53dcd36d1bb8dee13b751ef814224061889 libffi-3.4.4.tar.gz" diff --git a/system/libffi/disable-ppc-ldvariant.patch b/system/libffi/disable-ppc-ldvariant.patch deleted file mode 100644 index 8b3f9cea0..000000000 --- a/system/libffi/disable-ppc-ldvariant.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libffi-3.2.1/configure.old 2014-11-12 06:59:57.000000000 -0500 -+++ libffi-3.2.1/configure 2017-10-10 05:44:12.732989967 -0400 -@@ -17237,7 +17237,7 @@ - - powerpc*-*-linux* | powerpc-*-sysv*) - TARGET=POWERPC; TARGETDIR=powerpc -- HAVE_LONG_DOUBLE_VARIANT=1 -+ #HAVE_LONG_DOUBLE_VARIANT=1 - ;; - powerpc-*-amigaos*) - TARGET=POWERPC; TARGETDIR=powerpc diff --git a/system/libffi/fix-testsuite-longdouble.patch b/system/libffi/fix-testsuite-longdouble.patch deleted file mode 100644 index 20fe4b8c6..000000000 --- a/system/libffi/fix-testsuite-longdouble.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- libffi-3.2.1/testsuite/libffi.call/cls_align_longdouble_split.c.old 2014-11-08 07:47:24.000000000 -0500 -+++ libffi-3.2.1/testsuite/libffi.call/cls_align_longdouble_split.c 2017-10-10 06:04:26.293045176 -0400 -@@ -6,7 +6,7 @@ - - /* { dg-excess-errors "no long double format" { xfail x86_64-*-mingw* x86_64-*-cygwin* } } */ - /* { dg-do run { xfail strongarm*-*-* xscale*-*-* } } */ --/* { dg-options -mlong-double-128 { target powerpc64*-*-linux* } } */ -+/* { dg-options -mlong-double-64 { target powerpc64*-*-linux* } } */ - /* { dg-output "" { xfail x86_64-*-mingw* x86_64-*-cygwin* } } */ - - #include "ffitest.h" ---- libffi-3.2.1/testsuite/libffi.call/cls_align_longdouble_split2.c.old 2014-11-08 07:47:24.000000000 -0500 -+++ libffi-3.2.1/testsuite/libffi.call/cls_align_longdouble_split2.c 2017-10-10 06:04:54.283046103 -0400 -@@ -7,7 +7,7 @@ - - /* { dg-excess-errors "no long double format" { xfail x86_64-*-mingw* x86_64-*-cygwin* } } */ - /* { dg-do run { xfail strongarm*-*-* } } */ --/* { dg-options -mlong-double-128 { target powerpc64*-*-linux* } } */ -+/* { dg-options -mlong-double-64 { target powerpc64*-*-linux* } } */ - /* { dg-output "" { xfail x86_64-*-mingw* x86_64-*-cygwin* } } */ - - #include "ffitest.h" ---- libffi-3.2.1/testsuite/libffi.call/cls_longdouble.c.old 2014-11-08 07:47:24.000000000 -0500 -+++ libffi-3.2.1/testsuite/libffi.call/cls_longdouble.c 2017-10-10 06:05:19.683046965 -0400 -@@ -8,7 +8,7 @@ - /* This test is known to PASS on armv7l-unknown-linux-gnueabihf, so I have - remove the xfail for arm*-*-* below, until we know more. */ - /* { dg-do run { xfail strongarm*-*-* xscale*-*-* } } */ --/* { dg-options -mlong-double-128 { target powerpc64*-*-linux* } } */ -+/* { dg-options -mlong-double-64 { target powerpc64*-*-linux* } } */ - /* { dg-output "" { xfail x86_64-*-mingw* x86_64-*-cygwin* } } */ - - #include "ffitest.h" ---- libffi-3.2.1/testsuite/libffi.call/huge_struct.c.old 2014-11-08 07:47:24.000000000 -0500 -+++ libffi-3.2.1/testsuite/libffi.call/huge_struct.c 2017-10-10 06:05:39.383047674 -0400 -@@ -7,7 +7,7 @@ - - /* { dg-excess-errors "" { target x86_64-*-mingw* x86_64-*-cygwin* } } */ - /* { dg-do run { xfail strongarm*-*-* xscale*-*-* } } */ --/* { dg-options -mlong-double-128 { target powerpc64*-*-linux* } } */ -+/* { dg-options -mlong-double-64 { target powerpc64*-*-linux* } } */ - /* { dg-options -Wformat=0 { target moxie*-*-elf } } */ - /* { dg-output "" { xfail x86_64-*-mingw* x86_64-*-cygwin* } } */ - diff --git a/system/libffi/fix-testsuite-opts.patch b/system/libffi/fix-testsuite-opts.patch deleted file mode 100644 index b3d08b4af..000000000 --- a/system/libffi/fix-testsuite-opts.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libffi-3.2.1/testsuite/lib/libffi.old 2014-11-08 06:47:24.000000000 -0600 -+++ libffi-3.2.1/testsuite/lib/libffi.exp 2019-07-22 13:29:32.086840387 -0500 -@@ -281,7 +281,7 @@ - global using_gcc - if { [string match $using_gcc "yes"] } { - set common "-W -Wall -Wno-psabi" -- set optimizations { "-O0" "-O2" "-O3" "-Os" "-O2 -fomit-frame-pointer" } -+ set optimizations { "-O0" "-O2 -fno-inline-small-functions" "-O3 -fno-inline-small-functions" "-Os" "-O2 -fno-inline-small-functions -fomit-frame-pointer" } - } else { - # Assume we are using the vendor compiler. - set common "" diff --git a/system/libffi/gnu-linux-define.patch b/system/libffi/gnu-linux-define.patch deleted file mode 100644 index 8dcae738b..000000000 --- a/system/libffi/gnu-linux-define.patch +++ /dev/null @@ -1,15 +0,0 @@ -http://bugs.alpinelinux.org/issues/4275 - -diff --git a/closures.c.orig b/closures.c -index 721ff00..22a699c 100644 ---- a/src/closures.c.orig -+++ b/src/closures.c -@@ -34,7 +34,7 @@ - #include <ffi_common.h> - - #if !FFI_MMAP_EXEC_WRIT && !FFI_EXEC_TRAMPOLINE_TABLE --# if __gnu_linux__ && !defined(__ANDROID__) -+# if __linux__ && !defined(__ANDROID__) - /* This macro indicates it may be forbidden to map anonymous memory - with both write and execute permission. Code compiled when this - option is defined will attempt to map such pages once, but if it diff --git a/system/libffi/powerpc-fixes.patch b/system/libffi/powerpc-fixes.patch deleted file mode 100644 index e62ae32d1..000000000 --- a/system/libffi/powerpc-fixes.patch +++ /dev/null @@ -1,79 +0,0 @@ -From bf6946074b948540e4147154041ea244bafb38c4 Mon Sep 17 00:00:00 2001 -From: Samuel Holland <samuel@sholland.org> -Date: Sat, 13 Oct 2018 01:14:03 +0000 -Subject: [PATCH] powerpc: Fix alignment after float structs - ---- - src/powerpc/ffi_linux64.c | 8 +++----- - 1 file changed, 3 insertions(+), 5 deletions(-) - -diff --git a/src/powerpc/ffi_linux64.c b/src/powerpc/ffi_linux64.c -index 2534ecf3..197a270d 100644 ---- a/src/powerpc/ffi_linux64.c -+++ b/src/powerpc/ffi_linux64.c -@@ -580,11 +580,9 @@ ffi_prep_args64 (extended_cif *ecif, unsigned long *const stack) - fparg_count++; - } - while (--elnum != 0); -- if ((next_arg.p & 3) != 0) -- { -- if (++next_arg.f == gpr_end.f) -- next_arg.f = rest.f; -- } -+ if ((next_arg.p & 7) != 0) -+ if (++next_arg.f == gpr_end.f) -+ next_arg.f = rest.f; - } - else - do -From 49a1bbadfa0b5ad5c373271c8ba7a5d8911a85d9 Mon Sep 17 00:00:00 2001 -From: Samuel Holland <samuel@sholland.org> -Date: Sat, 13 Oct 2018 01:14:20 +0000 -Subject: [PATCH] powerpc: Don't pad rvalues copied from FP regs - ---- - src/powerpc/ffi.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/powerpc/ffi.c b/src/powerpc/ffi.c -index 7eb543e4..94a11700 100644 ---- a/src/powerpc/ffi.c -+++ b/src/powerpc/ffi.c -@@ -121,8 +121,9 @@ ffi_call_int (ffi_cif *cif, - # endif - /* The SYSV ABI returns a structure of up to 8 bytes in size - left-padded in r3/r4, and the ELFv2 ABI similarly returns a -- structure of up to 8 bytes in size left-padded in r3. */ -- if (rsize <= 8) -+ structure of up to 8 bytes in size left-padded in r3. But -+ note that a structure of a single float is not paddded. */ -+ if (rsize <= 8 && (cif->flags & FLAG_RETURNS_FP) == 0) - memcpy (rvalue, (char *) smst_buffer + 8 - rsize, rsize); - else - #endif -From b0c598d5d6b653a3ea87a2d04afb6b35441e5f7e Mon Sep 17 00:00:00 2001 -From: Samuel Holland <samuel@sholland.org> -Date: Sat, 13 Oct 2018 01:14:58 +0000 -Subject: [PATCH] powerpc: Add missing check in struct alignment - ---- - src/powerpc/ffi_linux64.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/powerpc/ffi_linux64.c b/src/powerpc/ffi_linux64.c -index 197a270d..d755c712 100644 ---- a/src/powerpc/ffi_linux64.c -+++ b/src/powerpc/ffi_linux64.c -@@ -536,7 +536,11 @@ ffi_prep_args64 (extended_cif *ecif, unsigned long *const stack) - if (align > 16) - align = 16; - if (align > 1) -- next_arg.p = ALIGN (next_arg.p, align); -+ { -+ next_arg.p = ALIGN (next_arg.p, align); -+ if (next_arg.ul == gpr_end.ul) -+ next_arg.ul = rest.ul; -+ } - } - #if _CALL_ELF == 2 - elt = discover_homogeneous_aggregate (*ptr, &elnum); |