CVS commit: pkgsrc/lang/mono6

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Mon Oct 21 23:53:34 UTC 2019

Modified Files:
        pkgsrc/lang/mono6: distinfo
Added Files:
        pkgsrc/lang/mono6/patches: patch-mono_utils_mono-sigcontext.h

Log Message:
mono6: add the missing bits for netbsd/aarch64 support.

unfortunately, mono-sgen crashes a lot, most likely due to pmap bugs.
it takes many retries to get further in the build.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/mono6/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/mono6/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.

Modified files:

Index: pkgsrc/lang/mono6/distinfo
diff -u pkgsrc/lang/mono6/distinfo:1.3 pkgsrc/lang/mono6/distinfo:1.4
--- pkgsrc/lang/mono6/distinfo:1.3      Wed Oct  9 22:46:04 2019
+++ pkgsrc/lang/mono6/distinfo  Mon Oct 21 23:53:34 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2019/10/09 22:46:04 maya Exp $
+$NetBSD: distinfo,v 1.4 2019/10/21 23:53:34 maya Exp $
 
 SHA1 (mono-6.4.0.198.tar.xz) = ad1beb048e34f5b4a958b25cd339d54ac837e480
 RMD160 (mono-6.4.0.198.tar.xz) = 8045bcbe15ee51f3c12b2b99844ad697927d22fc
@@ -19,5 +19,6 @@ SHA1 (patch-mono_metadata_threads.c) = e
 SHA1 (patch-mono_native_Makefile.am) = 5cb2caa4b00327459864eecbe0ea26d9ed4b03e1
 SHA1 (patch-mono_native_mono-native-platform.h) = 9247cf9429d829242ea7dfede8e3b39f89a92850
 SHA1 (patch-mono_utils_mono-os-semaphore.h) = b850911945c95be804e9462263d558ef702831ca
+SHA1 (patch-mono_utils_mono-sigcontext.h) = b8a6f886661622e9b0d382443536bd3dc998f95f
 SHA1 (patch-mono_utils_mono-utils-debug.c) = 30b0ab55c9227705026a8edd1e4bb693ae4f9953
 SHA1 (patch-runtime_mono-wrapper.in) = ea40d2f2e8b67de0ae42c6e608e3c085dc2b040e

Added files:

Index: pkgsrc/lang/mono6/patches/patch-mono_utils_mono-sigcontext.h
diff -u /dev/null pkgsrc/lang/mono6/patches/patch-mono_utils_mono-sigcontext.h:1.1
--- /dev/null   Mon Oct 21 23:53:34 2019
+++ pkgsrc/lang/mono6/patches/patch-mono_utils_mono-sigcontext.h        Mon Oct 21 23:53:34 2019
@@ -0,0 +1,19 @@
+$NetBSD: patch-mono_utils_mono-sigcontext.h,v 1.1 2019/10/21 23:53:34 maya Exp $
+
+NetBSD/aarch64 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 {
+       #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))
++#elif defined(__NetBSD__)
++#include <ucontext.h>
++      #define UCONTEXT_REG_PC(ctx) _UC_MACHINE_PC((ucontext_t*)(ctx))
++      #define UCONTEXT_REG_SP(ctx) _UC_MACHINE_SP((ucontext_t*)(ctx))
++      #define UCONTEXT_REG_R0(ctx) _UC_MACHINE_INTRV((ucontext_t*)(ctx))
++      #define UCONTEXT_GREGS(ctx) (&(((ucontext_t*)(ctx))->uc_mcontext.__gregs))
+ #else
+ #include <ucontext.h>
+       #define UCONTEXT_REG_PC(ctx) (((ucontext_t*)(ctx))->uc_mcontext.pc)