Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1708289751130270"
MIME-Version: 1.0
Date: Sun, 18 Feb 2024 20:55:51 +0000
From: "Adam Ciarcinski" <adam@netbsd.org>
Subject: CVS commit: pkgsrc/devel/libffi
To: pkgsrc-changes@NetBSD.org
Reply-To: adam@netbsd.org
Message-Id: <20240218205551.89950F9F4@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1708289751130270
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	adam
Date:		Sun Feb 18 20:55:51 UTC 2024

Modified Files:
	pkgsrc/devel/libffi: Makefile distinfo
	pkgsrc/devel/libffi/patches: patch-src_mips_ffi.c

Log Message:
libffi: updated to 3.4.6

3.4.6 Feb-18-2024
Fix long double regression on mips64 and alpha.

3.4.5 Feb-15-2024
Add support for wasm32.
Add support for aarch64 branch target identification (bti).
Add support for ARCv3: ARC32 & ARC64.
Add support for HPPA64, and many HPPA fixes.
Add support for Haikuos on PowerPC.
Fixes for AIX, loongson, MIPS, power, sparc64, and x86 Darwin.


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 pkgsrc/devel/libffi/Makefile
cvs rdiff -u -r1.63 -r1.64 pkgsrc/devel/libffi/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/libffi/patches/patch-src_mips_ffi.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1708289751130270
Content-Disposition: inline
Content-Length: 4449
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/devel/libffi/Makefile
diff -u pkgsrc/devel/libffi/Makefile:1.52 pkgsrc/devel/libffi/Makefile:1.53
--- pkgsrc/devel/libffi/Makefile:1.52	Mon Oct 24 09:46:57 2022
+++ pkgsrc/devel/libffi/Makefile	Sun Feb 18 20:55:51 2024
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.52 2022/10/24 09:46:57 adam Exp $
+# $NetBSD: Makefile,v 1.53 2024/02/18 20:55:51 adam Exp $
 
-DISTNAME=	libffi-3.4.4
+DISTNAME=	libffi-3.4.6
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libffi/}
 GITHUB_RELEASE=	v${PKGVERSION_NOREV}
@@ -32,18 +32,18 @@ pre-build:
 .include "../../mk/bsd.prefs.mk"
 
 # patch-src_m68k_ffi.c uses m68k_sync_icache(2)
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-m68k)
+.if ${MACHINE_PLATFORM:MNetBSD-*-m68k}
 LIBS+=		-lm68k
 .endif
 
 # fix http://gnats.netbsd.org/42865
-.if !empty(MACHINE_PLATFORM:MSunOS-*-i386) && !empty(CC_VERSION:Mgcc-[23]*)
+.if ${MACHINE_PLATFORM:MSunOS-*-i386} && ${CC_VERSION:Mgcc-[23]*}
 CPPFLAGS+=	-D__PIC__
 .endif
 
 # On platforms where ld(1) is LLVM ld, relocations against read-only
 # segments has to be explicitly allowed.
-.if !empty(MACHINE_PLATFORM:MFreeBSD-1[2-9].*-*)
+.if ${MACHINE_PLATFORM:MFreeBSD-1[2-9].*-*}
 CFLAGS+=	-Wl,-z,notext
 .endif
 

Index: pkgsrc/devel/libffi/distinfo
diff -u pkgsrc/devel/libffi/distinfo:1.63 pkgsrc/devel/libffi/distinfo:1.64
--- pkgsrc/devel/libffi/distinfo:1.63	Mon Oct 24 09:46:57 2022
+++ pkgsrc/devel/libffi/distinfo	Sun Feb 18 20:55:51 2024
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.63 2022/10/24 09:46:57 adam Exp $
+$NetBSD: distinfo,v 1.64 2024/02/18 20:55:51 adam Exp $
 
-BLAKE2s (libffi-3.4.4.tar.gz) = 59b18534be8708e52e1d47f0874192178f370635168bb8101415a296e73d6e2f
-SHA512 (libffi-3.4.4.tar.gz) = 88680aeb0fa0dc0319e5cd2ba45b4b5a340bc9b4bcf20b1e0613b39cd898f177a3863aa94034d8e23a7f6f44d858a53dcd36d1bb8dee13b751ef814224061889
-Size (libffi-3.4.4.tar.gz) = 1362394 bytes
+BLAKE2s (libffi-3.4.6.tar.gz) = d92dc00d30ca8ef61996cc3c28b5932a6b6769461081460d632403541e17c623
+SHA512 (libffi-3.4.6.tar.gz) = 033d2600e879b83c6bce0eb80f69c5f32aa775bf2e962c9d39fbd21226fa19d1e79173d8eaa0d0157014d54509ea73315ad86842356fc3a303c0831c94c6ab39
+Size (libffi-3.4.6.tar.gz) = 1391684 bytes
 SHA1 (patch-configure) = f5ca2947f3aadf51d59198a5339f81f19dc51cd2
 SHA1 (patch-configure_host) = a4c99cd0fbbbe0f2c806d662b85a6e2c56b31168
 SHA1 (patch-src_aarch64_ffi.c) = e46083e6e6892524868b88dfbcd292f11db036d9
@@ -10,7 +10,7 @@ SHA1 (patch-src_arm_sysv.S) = 9aaa8e12e6
 SHA1 (patch-src_closures.c) = 13c426ad678439d2781477aa2b10497a22223427
 SHA1 (patch-src_m68k_ffi.c) = 5179cfd150bc7de15eb1c5ee0a327016c2c32b3e
 SHA1 (patch-src_m88k_elfbsd.S) = 6572c7fa39c00096cb4a80bb88993ff1b4aaa8cc
-SHA1 (patch-src_mips_ffi.c) = cbdfdab5d23cbb7c403b00166959f792ebfabb4a
+SHA1 (patch-src_mips_ffi.c) = 1fa75056b37f3de4526e81bb8df4d2973067f4d4
 SHA1 (patch-src_mips_ffitarget.h) = 86f144b1dd62d912f1b03016772e2715f336bf6d
 SHA1 (patch-src_powerpc_ffi.c) = b68a93d0f8552efaa8c50256da3af3bde5de7059
 SHA1 (patch-src_powerpc_ffi__powerpc.h) = fafb125b28069d5108726ac7b2d4efdc4fdadf92

Index: pkgsrc/devel/libffi/patches/patch-src_mips_ffi.c
diff -u pkgsrc/devel/libffi/patches/patch-src_mips_ffi.c:1.2 pkgsrc/devel/libffi/patches/patch-src_mips_ffi.c:1.3
--- pkgsrc/devel/libffi/patches/patch-src_mips_ffi.c:1.2	Mon Sep 26 18:43:48 2022
+++ pkgsrc/devel/libffi/patches/patch-src_mips_ffi.c	Sun Feb 18 20:55:51 2024
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_mips_ffi.c,v 1.2 2022/09/26 18:43:48 adam Exp $
+$NetBSD: patch-src_mips_ffi.c,v 1.3 2024/02/18 20:55:51 adam Exp $
 
 Fixes to support the various NetBSD mips ports.
 
---- src/mips/ffi.c.orig	2022-09-19 09:57:23.000000000 +0000
+--- src/mips/ffi.c.orig	2024-02-15 12:54:35.000000000 +0000
 +++ src/mips/ffi.c
 @@ -532,6 +532,7 @@ static ffi_status ffi_prep_cif_machdep_i
                cif->flags += t->type << (arg_reg * FFI_FLAG_BITS);
@@ -28,11 +28,11 @@ Fixes to support the various NetBSD mips
        case FFI_TYPE_LONGDOUBLE:
  	/* Long double is returned as if it were a struct containing
  	   two doubles.  */
-@@ -715,6 +718,7 @@ static ffi_status ffi_prep_cif_machdep_i
- 	    }
- 	  break;
- 	}
+@@ -723,6 +726,7 @@ static ffi_status ffi_prep_cif_machdep_i
+       case FFI_TYPE_SINT64:
+ 	cif->flags += FFI_TYPE_UINT64 << (FFI_FLAG_BITS * 8);
+ 	break;
 +#endif
        default:
- 	cif->flags += FFI_TYPE_INT << (FFI_FLAG_BITS * 8);
+ 	cif->flags += cif->rtype->type << (FFI_FLAG_BITS * 8);
  	break;


--_----------=_1708289751130270--