cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update devel/libffi to 3.4.2

Browse Source 
changelog: https://github.com/libffi/libffi/releases/tag/v3.4.2

tested with few of the 'big' consumer (cabal-install, jna, ghc, gforth,
guile2, python/3.9, ruby/3.1) by gnezdo@ (thanks!) and me on amd64.

maintainer timeout, ok sthen@
This commit is contained in:
op 2022-05-26 07:24:38 +00:00
parent f8ad0dfe55
commit 3f68f4bae4
10 changed files with 21 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
devel/libffi/Makefile
View File

@ -1,8 +1,8 @@
COMMENT= Foreign Function Interface
DISTNAME= libffi-3.3
REVISION= 1
SHARED_LIBS += ffi 1.2 # .6.4
V= 3.4.2
DISTNAME= libffi-$V
SHARED_LIBS += ffi 2.0 # 9.0
CATEGORIES= devel
MAINTAINER= Jasper Lievisse Adriaanse <jasper@openbsd.org>
@ -17,8 +17,7 @@ PERMIT_PACKAGE= Yes
WANTLIB += c++abi
.endif
MASTER_SITES= https://sourceware.org/pub/libffi/ \
ftp://sourceware.org/pub/libffi/
MASTER_SITES= https://github.com/libffi/libffi/releases/download/v$V/
DEBUG_PACKAGES = ${BUILD_PACKAGES}

4
devel/libffi/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (libffi-3.3.tar.gz) = cvunkicD3fp6Ao1ROsFahcjVTI1n9V+lpIAohdxlIFY=
SIZE (libffi-3.3.tar.gz) = 1305466
SHA256 (libffi-3.4.2.tar.gz) = VA+3IWGaaro73u99lA2Ong5tLBk1lbwkMkG3f/npNiA=
SIZE (libffi-3.4.2.tar.gz) = 1351355

2
devel/libffi/patches/patch-configure
View File

@ -3,7 +3,7 @@
Index: configure
--- configure.orig
+++ configure
@@ -18475,6 +18475,12 @@ $as_echo "#define SYMBOL_UNDERSCORE 1" >>confdefs.h
@@ -18650,6 +18650,12 @@ $as_echo "#define SYMBOL_UNDERSCORE 1" >>confdefs.h
fi

8
devel/libffi/patches/patch-configure_host
View File

@ -1,12 +1,12 @@
Index: configure.host
--- configure.host.orig
+++ configure.host
@@ -203,7 +203,7 @@ case "${host}" in
@@ -216,7 +216,7 @@ case "${host}" in
TARGET=POWERPC_FREEBSD; TARGETDIR=powerpc
HAVE_LONG_DOUBLE_VARIANT=1
CFLAGS="$CFLAGS -D__NO_FPRS__"
;;
- powerpc64-*-freebsd*)
+ powerpc64-*-freebsd* | powerpc64-*-openbsd*)
- powerpc64-*-freebsd* | powerpc64le-*-freebsd*)
+ powerpc64-*-freebsd* | powerpc64le-*-freebsd* | powerpc64-*-openbsd*)
TARGET=POWERPC; TARGETDIR=powerpc
;;
powerpc*-*-rtems*)

10
devel/libffi/patches/patch-src_arm_ffi_c
View File

@ -3,8 +3,8 @@ https://svnweb.freebsd.org/ports/head/devel/libffi/files/patch-src__arm__ffi.c?r
Index: src/arm/ffi.c
--- src/arm/ffi.c.orig
+++ src/arm/ffi.c
@@ -55,6 +55,11 @@ extern unsigned int ffi_arm_trampoline[3] FFI_HIDDEN;
#endif
@@ -64,6 +64,11 @@ extern unsigned char ffi_arm_trampoline[12] FFI_HIDDEN
#include <machine/sysarch.h>
#endif
+#ifdef __arm__
@ -15,7 +15,7 @@ Index: src/arm/ffi.c
/* Forward declares. */
static int vfp_type_p (const ffi_type *);
static void layout_vfp_args (ffi_cif *);
@@ -591,6 +596,16 @@ ffi_prep_closure_loc (ffi_closure * closure,
@@ -621,6 +626,16 @@ ffi_prep_closure_loc (ffi_closure * closure,
config[0] = closure;
config[1] = closure_func;
#else
@ -30,5 +30,5 @@ Index: src/arm/ffi.c
+ } while (0);
+#endif
#ifndef _M_ARM
memcpy(closure->tramp, ffi_arm_trampoline, 8);
#if defined(FFI_EXEC_STATIC_TRAMP)
if (ffi_tramp_is_present(closure))

8
devel/libffi/patches/patch-src_closures_c
View File

@ -1,15 +1,15 @@
Index: src/closures.c
--- src/closures.c.orig
+++ src/closures.c
@@ -837,6 +837,7 @@ dlmmap (void *start, size_t length, int prot,
&& flags == (MAP_PRIVATE | MAP_ANONYMOUS)
&& fd == -1 && offset == 0);
@@ -878,6 +878,7 @@ dlmmap (void *start, size_t length, int prot,
return ptr;
}
+#if 0
if (execfd == -1 && is_emutramp_enabled ())
{
ptr = mmap (start, length, prot & ~PROT_EXEC, flags, fd, offset);
@@ -855,6 +856,7 @@ dlmmap (void *start, size_t length, int prot,
@@ -896,6 +897,7 @@ dlmmap (void *start, size_t length, int prot,
with ((prot & ~PROT_WRITE) | PROT_EXEC) and mremap with
MREMAP_DUP and prot at this point. */
}

19
devel/libffi/patches/patch-src_mips_n32_S
View File

@ -1,19 +0,0 @@
Use EH_FRAME_FLAGS to get section flags that clang's integrated assembler
expects. This fixes the following build error on mips64:
../src/mips/n32.S:585:9: error: changed section flags for .eh_frame, expected: 0x2
.section .eh_frame,"aw",@progbits
^
Index: src/mips/n32.S
--- src/mips/n32.S.orig
+++ src/mips/n32.S
@@ -582,7 +582,7 @@ cls_epilogue:
.end ffi_closure_N32
#ifdef __GNUC__
- .section .eh_frame,"aw",@progbits
+ .section .eh_frame,EH_FRAME_FLAGS,@progbits
.Lframe1:
.4byte .LECIE1-.LSCIE1 # length
.LSCIE1:

18
devel/libffi/patches/patch-src_powerpc_ffi_powerpc_h
View File

@ -1,18 +0,0 @@
Fix for:
../src/powerpc/ffi_powerpc.h:105: error: expected declaration
specifiers or '...' before 'float128'
From:
https://github.com/libffi/libffi/pull/532/commits/2138adb2a5b6a0bc2fe3518e0645eacc89b6f392
Index: src/powerpc/ffi_powerpc.h
--- src/powerpc/ffi_powerpc.h.orig
+++ 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);

46
devel/libffi/patches/patch-src_powerpc_sysv_S
View File

@ -1,46 +0,0 @@
From 4d6d2866ae43e55325e8ee96561221804602cd7a Mon Sep 17 00:00:00 2001
From: Samuel Holland <samuel@sholland.org>
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
Index: src/powerpc/sysv.S
--- src/powerpc/sysv.S.orig
+++ 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
devel/libffi/patches/patch-testsuite_lib_libffi_exp
View File

@ -3,7 +3,7 @@ cc1: error: unrecognized command line option "-Wno-psabi"
Index: testsuite/lib/libffi.exp
--- testsuite/lib/libffi.exp.orig
+++ testsuite/lib/libffi.exp
@@ -488,7 +488,7 @@ proc run-many-tests { testcases extra_flags } {
@@ -491,7 +491,7 @@ proc run-many-tests { testcases extra_flags } {
}
}
"gnu" {