Received: by mail.netbsd.org (Postfix, from userid 605) id DA9B484E6B; Tue, 20 Sep 2022 15:59:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 15CA784E5D for ; Tue, 20 Sep 2022 15:59:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id ZxAI64fVIdE9 for ; Tue, 20 Sep 2022 15:59:33 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 6CF0784D37 for ; Tue, 20 Sep 2022 15:59:33 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 61A9AFA90; Tue, 20 Sep 2022 15:59:33 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_166368957382840" MIME-Version: 1.0 Date: Tue, 20 Sep 2022 15:59:33 +0000 From: "Havard Eidnes" Subject: CVS commit: pkgsrc/lang/mono To: pkgsrc-changes@NetBSD.org Reply-To: he@netbsd.org X-Mailer: log_accum Message-Id: <20220920155933.61A9AFA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_166368957382840 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: he Date: Tue Sep 20 15:59:33 UTC 2022 Modified Files: pkgsrc/lang/mono: distinfo pkgsrc/lang/mono/patches: patch-mono_utils_mono-sigcontext.h Log Message: lang/mono: fix NetBSD/powerpc support * Add a cast which is needed * Simplify one other macro Fixes build on NetBSD/macppc. To generate a diff of this commit: cvs rdiff -u -r1.116 -r1.117 pkgsrc/lang/mono/distinfo cvs rdiff -u -r1.2 -r1.3 \ pkgsrc/lang/mono/patches/patch-mono_utils_mono-sigcontext.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_166368957382840 Content-Disposition: inline Content-Length: 3060 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/mono/distinfo diff -u pkgsrc/lang/mono/distinfo:1.116 pkgsrc/lang/mono/distinfo:1.117 --- pkgsrc/lang/mono/distinfo:1.116 Tue Feb 8 13:39:17 2022 +++ pkgsrc/lang/mono/distinfo Tue Sep 20 15:59:33 2022 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.116 2022/02/08 13:39:17 gavan Exp $ +$NetBSD: distinfo,v 1.117 2022/09/20 15:59:33 he Exp $ BLAKE2s (mono-6.12.0.122.tar.xz) = 0f4ef4106e8974fea9ddc2b61ab1b0ebd2a8182fb9f098ec9c46655b4ac1b867 SHA512 (mono-6.12.0.122.tar.xz) = 0fbd4147498cc81e384933147eb6aa5c559d17a794a308af7ffa43dce51e0faefde24fc75e987ed804dcb161b52756944bc3611100fc0a4adcc260ca97ddaecd @@ -26,7 +26,7 @@ SHA1 (patch-mono_tests_Makefile.am) = dd SHA1 (patch-mono_tests_Makefile.in) = cf6a670e94b52f41d30ae6262f2f4ed5c0da4c05 SHA1 (patch-mono_utils_jemalloc_Makefile.in) = bb20a6f72c88632bf2e75c83174b4255788ad4ff SHA1 (patch-mono_utils_mono-os-semaphore.h) = b850911945c95be804e9462263d558ef702831ca -SHA1 (patch-mono_utils_mono-sigcontext.h) = b8a6f886661622e9b0d382443536bd3dc998f95f +SHA1 (patch-mono_utils_mono-sigcontext.h) = e57bda25e6554e89899da9d56682e912315970ad SHA1 (patch-mono_utils_mono-threads-posix.c) = 3111d6a47fa104d964b34fdb5f7eca8643559ea3 SHA1 (patch-mono_utils_mono-utils-debug.c) = 39f099969040b3a52101b611be723b25674ea68b SHA1 (patch-msvc_mono.props) = 0ffb74104049e763d28a2c7a17433b35ffb4cf3b Index: pkgsrc/lang/mono/patches/patch-mono_utils_mono-sigcontext.h diff -u pkgsrc/lang/mono/patches/patch-mono_utils_mono-sigcontext.h:1.2 pkgsrc/lang/mono/patches/patch-mono_utils_mono-sigcontext.h:1.3 --- pkgsrc/lang/mono/patches/patch-mono_utils_mono-sigcontext.h:1.2 Wed Mar 3 12:05:41 2021 +++ pkgsrc/lang/mono/patches/patch-mono_utils_mono-sigcontext.h Tue Sep 20 15:59:33 2022 @@ -1,10 +1,22 @@ -$NetBSD: patch-mono_utils_mono-sigcontext.h,v 1.2 2021/03/03 12:05:41 nia Exp $ +$NetBSD: patch-mono_utils_mono-sigcontext.h,v 1.3 2022/09/20 15:59:33 he Exp $ NetBSD/aarch64 support. +Fix NetBSD/powerpc support. --- mono/utils/mono-sigcontext.h.orig 2019-09-19 07:46:07.000000000 +0000 +++ mono/utils/mono-sigcontext.h -@@ -474,6 +474,12 @@ typedef struct ucontext { +@@ -356,8 +356,8 @@ typedef struct ucontext { + + #define UCONTEXT_REG_Rn(ctx, n) (((os_ucontext*)(ctx))->uc_mcontext.__gregs [(n)]) + #define UCONTEXT_REG_FPRn(ctx, n) (((os_ucontext*)(ctx))->uc_mcontext.__fpregs.__fpu_regs [(n)]) +- #define UCONTEXT_REG_NIP(ctx) _UC_MACHINE_PC(ctx) +- #define UCONTEXT_REG_LNK(ctx) (((os_ucontext*)(ctx))->uc_mcontext.__gregs [_REG_LR]) ++ #define UCONTEXT_REG_NIP(ctx) _UC_MACHINE_PC((os_ucontext*)(ctx)) ++ #define UCONTEXT_REG_LNK(ctx) UCONTEXT_REG_Rn(ctx, _REG_LR) + #elif defined(__FreeBSD__) + typedef ucontext_t os_ucontext; + +@@ -472,6 +472,12 @@ typedef struct ucontext { #define UCONTEXT_REG_SP(ctx) (((ucontext_t*)(ctx))->uc_mcontext.mc_gpregs.gp_sp) #define UCONTEXT_REG_R0(ctx) (((ucontext_t*)(ctx))->uc_mcontext.mc_gpregs.gp_x [ARMREG_R0]) #define UCONTEXT_GREGS(ctx) (&(((ucontext_t*)(ctx))->uc_mcontext.mc_gpregs.gp_x)) --_----------=_166368957382840--