From abc5ce6596ec949555403bcccd99f194e8ddfede Mon Sep 17 00:00:00 2001 From: tnn Date: Fri, 28 Feb 2020 18:14:28 +0000 Subject: libffi: provide a stub function as temporary band aid for aarch64 --- devel/libffi/distinfo | 3 ++- devel/libffi/patches/patch-src_closures.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 devel/libffi/patches/patch-src_closures.c diff --git a/devel/libffi/distinfo b/devel/libffi/distinfo index 77134b4bdb5..4cee13df178 100644 --- a/devel/libffi/distinfo +++ b/devel/libffi/distinfo @@ -1,10 +1,11 @@ -$NetBSD: distinfo,v 1.48 2020/02/28 16:36:14 tnn Exp $ +$NetBSD: distinfo,v 1.49 2020/02/28 18:14:28 tnn Exp $ SHA1 (libffi-3.3.tar.gz) = 8df6cb570c8d6596a67d1c0773bf00650154f7aa RMD160 (libffi-3.3.tar.gz) = 2cd43b66d792f1bad76df2e19a8411beacfcb8e0 SHA512 (libffi-3.3.tar.gz) = 61513801a156f11420f541d325de697131846487122d6bdcf5491b18b4da788589f5c0bb07e88e396495d3be5830d74e9135595e2b8ddbfe95c448d8597fbd6f Size (libffi-3.3.tar.gz) = 1305466 bytes SHA1 (patch-configure) = 81f1f2bee39a40f2a34b3a6cea0b210d13037482 +SHA1 (patch-src_closures.c) = f818bd0384f146a17964e2320df1321d8b83ec73 SHA1 (patch-src_m68k_ffi.c) = 5179cfd150bc7de15eb1c5ee0a327016c2c32b3e SHA1 (patch-src_m88k_elfbsd.S) = 6572c7fa39c00096cb4a80bb88993ff1b4aaa8cc SHA1 (patch-src_mips_ffi.c) = 7353f68f73917af6bff0b90393ac3404ea54fb99 diff --git a/devel/libffi/patches/patch-src_closures.c b/devel/libffi/patches/patch-src_closures.c new file mode 100644 index 00000000000..cfb980836d9 --- /dev/null +++ b/devel/libffi/patches/patch-src_closures.c @@ -0,0 +1,29 @@ +$NetBSD: patch-src_closures.c,v 1.4 2020/02/28 18:14:28 tnn Exp $ + +provide stub of ffi_data_to_code_pointer to get aarch64 to link + +--- src/closures.c.orig 2019-11-20 11:15:41.000000000 +0000 ++++ src/closures.c +@@ -37,6 +37,7 @@ + + #ifdef __NetBSD__ + #include ++#include + #endif + + #if __NetBSD_Version__ - 0 >= 799007200 +@@ -109,6 +110,14 @@ ffi_closure_free (void *ptr) + munmap(dataseg, rounded_size); + munmap(codeseg, rounded_size); + } ++ ++void * ++ffi_data_to_code_pointer (void *data) ++{ ++ errx(1, "ffi_data_to_code_pointer: not implemented"); ++ return NULL; ++} ++ + #else /* !NetBSD with PROT_MPROTECT */ + + #if !FFI_MMAP_EXEC_WRIT && !FFI_EXEC_TRAMPOLINE_TABLE -- cgit v1.2.3