From nobody Sat Dec 18 17:13:06 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 5AA041906E6F; Sat, 18 Dec 2021 17:13:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JGXVW08zBz4VJr; Sat, 18 Dec 2021 17:13:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D8E1213364; Sat, 18 Dec 2021 17:13:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BIHD6MT053248; Sat, 18 Dec 2021 17:13:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BIHD6Qf053247; Sat, 18 Dec 2021 17:13:06 GMT (envelope-from git) Date: Sat, 18 Dec 2021 17:13:06 GMT Message-Id: <202112181713.1BIHD6Qf053247@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 519bf9038856 - main - devel/dyncall: Update to 1.3 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 519bf90388561b897affade9cd8d33ed1b275752 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639847587; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y38vAN/DGfky38LoGrYoQYbFV7hNGniwh7aQqd3/haA=; b=DfWpz402OKYR38c6LtrJfXnqESOuRVnetWNoyONBcX/EJ9AtQ0X9XL3qqiqOkNvQe0E8vA OS5B6noQbBBvxtdGMgWjhT/Ap1Z97kDr3X/oxBYW1nM12z3riPy+3DcZbmDN0e8n/sr6YV 7rLdVXgXQCa2Lqs3bdKEISOlA4KLDostMkQzv173vBaFbw2i3MfoM6X8HAqDU0RYMfgSZq 8SSvVKzyORdnt8uYSzYykEUDe4pAhhfuK1NCchlN+qFMishSkykngEATD0kMDrCHFznexG 8tEU+C8iD6dWxH8wUz5PNGSdBjSMOsDfU9GTU3WmsKOVO5V5Ac0C+x3+LcI0tg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639847587; a=rsa-sha256; cv=none; b=CsAIFRdI7Q94QwsN3QmMyTYgn/5duCklDgBq/sve375ZDCoxGzX2Tthl8ewRTbdjSFLX8s Y2zwv4jvXPAoaS8MNLptW8E7WRxgzKtHeD/33EjmWbOUMkylcMHz69g9kbqOIoiCszoNVv u2jybcD/BiL0clmEu976wxg+ZLoYu4M7wPb3S/bn4xO2Alewe0j1h074rOU4+mxYvFpVs6 1KaoU8xHhfX/msM65P55RQkXEA2Zdid05Wl6BC4FR0eJrdi9sQQ+YBwMwWZqdjnv/A636a FNCmrjMO8T687wv43n3pmxgDqk5ReqfDbyiju0LE5/+i3BV0RhB+M1Rap1VjSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/ports/commit/?id=519bf90388561b897affade9cd8d33ed1b275752 commit 519bf90388561b897affade9cd8d33ed1b275752 Author: Tassilo Philipp AuthorDate: 2021-12-18 17:12:20 +0000 Commit: Li-Wen Hsu CommitDate: 2021-12-18 17:12:20 +0000 devel/dyncall: Update to 1.3 PR: 260491 --- devel/dyncall/Makefile | 5 +- devel/dyncall/distinfo | 6 +- devel/dyncall/files/patch-arm | 176 ------------------------------------------ devel/dyncall/pkg-plist | 1 + 4 files changed, 6 insertions(+), 182 deletions(-) diff --git a/devel/dyncall/Makefile b/devel/dyncall/Makefile index 4dd29eb20c39..815a52feb723 100644 --- a/devel/dyncall/Makefile +++ b/devel/dyncall/Makefile @@ -1,7 +1,5 @@ -# Created by: Tassilo Philipp - PORTNAME= dyncall -DISTVERSION= 1.2 +DISTVERSION= 1.3 CATEGORIES= devel MASTER_SITES= https://www.dyncall.org/r${DISTVERSION}/ \ http://www.potion-studios.com/ @@ -24,6 +22,7 @@ CFLAGS+= -fPIC do-install: ${INSTALL_DATA} \ + ${WRKSRC}/dyncall/dyncall_version.h \ ${WRKSRC}/dyncall/dyncall_value.h \ ${WRKSRC}/dyncall/dyncall_macros.h \ ${WRKSRC}/dyncall/dyncall_callf.h \ diff --git a/devel/dyncall/distinfo b/devel/dyncall/distinfo index 89ef1734d0cf..dffdeda8415d 100644 --- a/devel/dyncall/distinfo +++ b/devel/dyncall/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1611413243 -SHA256 (dyncall-1.2.tar.gz) = e88154c0243421560704f5c7294afbdec9e991afa0601d5adff5042ea81808d7 -SIZE (dyncall-1.2.tar.gz) = 523701 +TIMESTAMP = 1639737750 +SHA256 (dyncall-1.3.tar.gz) = abf62cfc31ebd7f21658daa1370a7781cc5143162bc0868384ac07def9e3d390 +SIZE (dyncall-1.3.tar.gz) = 540763 diff --git a/devel/dyncall/files/patch-arm b/devel/dyncall/files/patch-arm deleted file mode 100644 index 0433091778d8..000000000000 --- a/devel/dyncall/files/patch-arm +++ /dev/null @@ -1,176 +0,0 @@ -fix arm32 builds when using clang's integrated assembler (syntax-only fix for v1.2 until v1.3 is released) - ---- dyncall/dyncall_call_arm32_arm_armhf.S.orig 2021-01-22 15:43:00 UTC -+++ dyncall/dyncall_call_arm32_arm_armhf.S -@@ -59,7 +59,7 @@ ENTRY_C(dcCall_arm32_armhf) - add r5, r1, #16 /* r5 = stack args (after intreg ones) */ - - /* Load 16 single-precision registers (= 8 double-precision registers). */ -- fldmiad r3, {d0-d7} -+ vldmia r3, {d0-d7} - - /* prep stack parameter area (includes room for spill area, callee spills if needed) */ - sub r13, r13, r2 -@@ -77,7 +77,7 @@ armhf_pushArgs: - - armhf_call: - ldmia r1, {r0-r3} /* Load first 4 arguments for new call into r0-r3. */ -- /* 'blx %r4' workaround for ARMv4t: */ -+ /* 'blx r4' workaround for ARMv4t: */ - mov r14, r15 /* Branch return address(r15) -> link register (r14) -- r15 always points to address of current + 2 instructions (= Epilog code). */ - bx r4 /* Call (ARM/THUMB), available for ARMv4t. */ - ---- dyncall/dyncall_call_arm32_thumb_armhf.S.orig 2021-01-22 15:43:00 UTC -+++ dyncall/dyncall_call_arm32_thumb_armhf.S -@@ -68,7 +68,7 @@ ENTRY_C(dcCall_arm32_armhf) - mov r5 , r1 /* r5 = 'args' (2nd argument is passed in r1). */ - - /* Load 16 single-precision registers (= 8 double-precision registers). */ -- fldmiad r3, {d0-d7} -+ vldmia r3, {d0-d7} - - sub r2 , #16 - cmp r2, #0 -@@ -99,7 +99,7 @@ armhf_pushArgs: - - armhf_call: - ldmia r5!, {r0-r3} /* Load first 4 arguments for new call into r0-r3. */ -- /* 'blx %r4' workaround for ARMv4t: */ -+ /* 'blx r4' workaround for ARMv4t: */ - // mov r14, r15 /* Branch return address(r15) -> link register (r14) -- r15 always points to address of current + 2 instructions (= Epilog code). */ - mov r6, r15 - add r6, #5 ---- dyncall/dyncall_call_arm32_thumb_gas.s.orig 2021-01-22 15:43:00 UTC -+++ dyncall/dyncall_call_arm32_thumb_gas.s -@@ -37,45 +37,45 @@ dcCall_arm32_thumb: - - /* Prolog. This function never needs to spill inside its prolog, so just store the permanent registers. */ - /* Code below is not using high registers, so not storing them in prolog, which is more involved with thumb, anyways. */ -- push {%r4-%r7, %r14} /* Frame ptr, permanent registers, link register -> save area on stack. */ -- mov %r7, %r13 /* Set frame ptr. */ -- sub %r13, #4 /* Realign stack to 8 bytes (b/c we stored 5 regs = 20b). */ -+ push {r4-r7, r14} /* Frame ptr, permanent registers, link register -> save area on stack. */ -+ mov r7, r13 /* Set frame ptr. */ -+ sub r13, #4 /* Realign stack to 8 bytes (b/c we stored 5 regs = 20b). */ - - /* Call. */ -- mov %r4, %r0 /* Move 'fptr' to r4 (1st argument is passed in r0). */ -- mov %r5, %r1 /* Move 'args' to r5 (2nd argument is passed in r1). */ -- mov %r6, %r2 /* Move 'size' to r6 (3rd argument is passed in r2). */ -+ mov r4, r0 /* Move 'fptr' to r4 (1st argument is passed in r0). */ -+ mov r5, r1 /* Move 'args' to r5 (2nd argument is passed in r1). */ -+ mov r6, r2 /* Move 'size' to r6 (3rd argument is passed in r2). */ - -- cmp %r6, #16 /* Jump to call if no more than 4 arguments. */ -+ cmp r6, #16 /* Jump to call if no more than 4 arguments. */ - ble call - -- sub %r6, #16 /* Size of remaining arguments. */ -- mov %r0, %r13 /* Set stack pointer to top of stack. */ -- sub %r0, %r0, %r6 -- lsr %r0, #3 /* Align stack on 8 byte boundaries. */ -- lsl %r0, #3 -- mov %r13, %r0 -+ sub r6, #16 /* Size of remaining arguments. */ -+ mov r0, r13 /* Set stack pointer to top of stack. */ -+ sub r0, r0, r6 -+ lsr r0, #3 /* Align stack on 8 byte boundaries. */ -+ lsl r0, #3 -+ mov r13, r0 - -- add %r1, #16 /* Let r1 point to remaining arguments. */ -- mov %r2, #0 /* Init byte counter to 0. */ -+ add r1, #16 /* Let r1 point to remaining arguments. */ -+ mov r2, #0 /* Init byte counter to 0. */ - .thumb_func - pushArgs: -- ldrb %r3, [%r1, %r2] /* Load a byte into r3. */ -- strb %r3, [%r0, %r2] /* Push byte onto stack. */ -- add %r2, %r2, #1 /* Increment byte counter. */ -- cmp %r2, %r6 -+ ldrb r3, [r1, r2] /* Load a byte into r3. */ -+ strb r3, [r0, r2] /* Push byte onto stack. */ -+ add r2, r2, #1 /* Increment byte counter. */ -+ cmp r2, r6 - bne pushArgs - .thumb_func - call: -- ldmia %r5!, {%r0-%r3} /* Load first 4 arguments for new call into r0-r3. */ -+ ldmia r5!, {r0-r3} /* Load first 4 arguments for new call into r0-r3. */ - -- /* 'blx %r4' workaround for ARMv4t in THUMB: */ -- mov %r6, %r15 /* Load PC+2 instructions from here */ -- add %r6, #5 /* Increment by 2 instructions (Address of 'Epilog') and set bit 0 (THUMB) */ -- mov %r14, %r6 /* Store in link register. */ -- bx %r4 /* Branch and force THUMB-mode return (LR bit 0 set). */ -+ /* 'blx r4' workaround for ARMv4t in THUMB: */ -+ mov r6, r15 /* Load PC+2 instructions from here */ -+ add r6, #5 /* Increment by 2 instructions (Address of 'Epilog') and set bit 0 (THUMB) */ -+ mov r14, r6 /* Store in link register. */ -+ bx r4 /* Branch and force THUMB-mode return (LR bit 0 set). */ - - /* Epilog. */ -- mov %r13, %r7 /* Reset stack ptr. */ -- pop {%r4-%r7, %r15} /* Restore permanent registers and program counter. (Force a stay in THUMB in ARMv4, whether ARMv5 can return in ARM or THUMB depending on the bit 0. */ -+ mov r13, r7 /* Reset stack ptr. */ -+ pop {r4-r7, r15} /* Restore permanent registers and program counter. (Force a stay in THUMB in ARMv4, whether ARMv5 can return in ARM or THUMB depending on the bit 0. */ - ---- dyncallback/dyncall_callback_arm32_arm_gas.S.orig 2021-01-22 15:43:00 UTC -+++ dyncallback/dyncall_callback_arm32_arm_gas.S -@@ -47,37 +47,37 @@ CTX_userdata = 16 - dcCallbackThunkEntry: - - /* Prolog. This function never needs to spill inside its prolog, so just store the permanent registers. */ -- stmdb %r13, {%r4-%r11, %r13, %r14} /* Permanent registers and stack pointer, etc... -> save area on stack (except counter). */ -- mov %r11, %r13 /* Set frame pointer. */ -- sub %r13, %r13, #40 /* Adjust stack pointer. */ -+ stmdb r13, {r4-r11, r13, r14} /* Permanent registers and stack pointer, etc... -> save area on stack (except counter). */ -+ mov r11, r13 /* Set frame pointer. */ -+ sub r13, r13, #40 /* Adjust stack pointer. */ - - /* Grab arguments. */ -- mov %r4, #0 -+ mov r4, #0 - #if defined(DC__ABI_ARM_HF) -- stmdb %r13!, {%r4} /* Init freg_count and dreg_count to 0 */ -- stmdb %r13!, {%r4} -- fstmdbd %r13!, {d0-d7} /* Store all fp-registers in DCArgs' f[16] */ -+ stmdb r13!, {r4} /* Init freg_count and dreg_count to 0 */ -+ stmdb r13!, {r4} -+ vstmdb r13!, {d0-d7} /* Store all fp-registers in DCArgs' f[16] */ - #endif -- stmdb %r13!, {%r0-%r4, %r11} /* Spill first 4 args to DCArgs, along with reg_count (init to 0) and (stack) pointer to remaining args. */ -+ stmdb r13!, {r0-r4, r11} /* Spill first 4 args to DCArgs, along with reg_count (init to 0) and (stack) pointer to remaining args. */ - - /* Prepare callback handler call. */ -- mov %r0, %r12 /* Parameter 0 (r0) = DCCallback pointer (r12, pointer to thunk). */ -- mov %r1, %r13 /* Parameter 1 (r1) = DCArgs pointer (r13, stack pointer). */ -- sub %r13, %r13, #DCValue_size /* Make room for return value. */ -- mov %r2, %r13 /* Parameter 2 (r2) = results pointer. */ -- ldr %r3, [%r12, #CTX_userdata] /* Parameter 3 (r3) = userdata pointer. */ -+ mov r0, r12 /* Parameter 0 (r0) = DCCallback pointer (r12, pointer to thunk). */ -+ mov r1, r13 /* Parameter 1 (r1) = DCArgs pointer (r13, stack pointer). */ -+ sub r13, r13, #DCValue_size /* Make room for return value. */ -+ mov r2, r13 /* Parameter 2 (r2) = results pointer. */ -+ ldr r3, [r12, #CTX_userdata] /* Parameter 3 (r3) = userdata pointer. */ - - /* Call. */ -- ldr %r4, [%r12, #CTX_handler] /* Load callback handler pointer into r4. */ -- mov %r14, %r15 /* Branch return address(r15) -> link register (r14) -- r15 always points to address of current + 2 instructions (= Epilog code). */ -- bx %r4 /* Call. */ -+ ldr r4, [r12, #CTX_handler] /* Load callback handler pointer into r4. */ -+ mov r14, r15 /* Branch return address(r15) -> link register (r14) -- r15 always points to address of current + 2 instructions (= Epilog code). */ -+ bx r4 /* Call. */ - - /* Return value. */ -- ldmia %r13, {%r0, %r1} /* Load return value in r0 and r1. */ -+ ldmia r13, {r0, r1} /* Load return value in r0 and r1. */ - #if defined(DC__ABI_ARM_HF) -- fldmiad %r13, {%d0} /* Same for floating point return value (if any). */ -+ vldmia r13, {d0} /* Same for floating point return value (if any). */ - #endif - - /* Epilog. */ -- ldmdb %r11, {%r4-%r11, %r13, %r15} /* Restore permanent registers (restore stack ptr and program counter).@@@db not needed since we rewrite r13? */ -+ ldmdb r11, {r4-r11, r13, r15} /* Restore permanent registers (restore stack ptr and program counter).@@@db not needed since we rewrite r13? */ - diff --git a/devel/dyncall/pkg-plist b/devel/dyncall/pkg-plist index f53aa77f6e35..52825dc21976 100644 --- a/devel/dyncall/pkg-plist +++ b/devel/dyncall/pkg-plist @@ -8,6 +8,7 @@ include/dyncall_macros.h include/dyncall_signature.h include/dyncall_types.h include/dyncall_value.h +include/dyncall_version.h include/dynload.h lib/libdyncall_s.a lib/libdyncallback_s.a