mono: Backport 3 patches from main to 6.14.1

Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>

Author: zboszor

recipes-mono/mono/mono-6.14.1/0001-arm64-Remove-an-unused-function.patch

@@ -0,0 +1,38 @@
+From ef69fc24043f4776f3d8e884898e1281c41b10fb Mon Sep 17 00:00:00 2001
+From: Esme Povirk <esme@codeweavers.com>
+Date: Sat, 12 Apr 2025 20:30:41 +0000
+Subject: [PATCH 1/3] arm64: Remove an unused function.
+
+Upstream-Status: Backport
+---
+ mono/mini/mini-arm64.c | 14 --------------
+ 1 file changed, 14 deletions(-)
+
+diff --git a/mono/mini/mini-arm64.c b/mono/mini/mini-arm64.c
+index cc6401d3514..9b32f424199 100644
+--- a/mono/mini/mini-arm64.c
++++ b/mono/mini/mini-arm64.c
+@@ -485,20 +485,6 @@ emit_cmpw_imm (guint8 *code, int sreg, int imm)
+ 	return code;
+ }
+ 
+-static __attribute__ ((__warn_unused_result__)) guint8*
+-emit_cmpx_imm (guint8 *code, int sreg, int imm)
+-{
+-	if (imm == 0) {
+-		arm_cmpx (code, sreg, ARMREG_RZR);
+-	} else {
+-		// FIXME:
+-		code = emit_imm (code, ARMREG_LR, imm);
+-		arm_cmpx (code, sreg, ARMREG_LR);
+-	}
+-
+-	return code;
+-}
+-
+ static __attribute__ ((__warn_unused_result__)) guint8*
+ emit_strb (guint8 *code, int rt, int rn, int imm)
+ {
+-- 
+2.51.0
+

recipes-mono/mono/mono-6.14.1/0002-arm64-Fix-an-invalid-stack-read.patch

@@ -0,0 +1,36 @@
+From 637c318471f7fef325ac2f1858edcf66df3b81e0 Mon Sep 17 00:00:00 2001
+From: Esme Povirk <esme@codeweavers.com>
+Date: Sat, 12 Apr 2025 20:31:05 +0000
+Subject: [PATCH 2/3] arm64: Fix an invalid stack read.
+
+Upstream-Status: Backport
+---
+ mono/mini/mini-arm64.c | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/mono/mini/mini-arm64.c b/mono/mini/mini-arm64.c
+index 9b32f424199..aba6ca3a41e 100644
+--- a/mono/mini/mini-arm64.c
++++ b/mono/mini/mini-arm64.c
+@@ -1737,9 +1737,15 @@ mono_arch_dyn_call_get_buf_size (MonoDynCallInfo *info)
+ static double
+ bitcast_r4_to_r8 (float f)
+ {
+-	float *p = &f;
+-
+-	return *(double*)p;
++	union {
++		float f;
++		double d;
++		guint64 i;
++	} u;
++	u.i = 0;
++	u.f = f;
++
++	return u.d;
+ }
+ 
+ static float
+-- 
+2.51.0
+

recipes-mono/mono/mono-6.14.1/0003-arm64-Fix-a-pointer-to-int-cast-size-mismatch.patch

@@ -0,0 +1,30 @@
+From 2224c6915a98f870cc9a3a9f9e3698e7b20e3d27 Mon Sep 17 00:00:00 2001
+From: Esme Povirk <esme@codeweavers.com>
+Date: Sat, 12 Apr 2025 20:31:54 +0000
+Subject: [PATCH 3/3] arm64: Fix a pointer-to-int cast size mismatch.
+
+Upstream-Status: Backport
+---
+ mono/utils/mono-sigcontext.h | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/mono/utils/mono-sigcontext.h b/mono/utils/mono-sigcontext.h
+index 2153c1cad57..6426f44b7c7 100644
+--- a/mono/utils/mono-sigcontext.h
++++ b/mono/utils/mono-sigcontext.h
+@@ -492,6 +492,12 @@ typedef struct ucontext {
+ 	#define UCONTEXT_REG_SP(ctx) (((ucontext_t*)(ctx))->uc_mcontext.sp)
+ 	#define UCONTEXT_REG_R0(ctx) (((ucontext_t*)(ctx))->uc_mcontext.regs [ARMREG_R0])
+ 	#define UCONTEXT_GREGS(ctx) (&(((ucontext_t*)(ctx))->uc_mcontext.regs))
++	#define UCONTEXT_REG_SET_PC(ctx, val) do { \
++		UCONTEXT_REG_PC (ctx) = (gsize)(val); \
++		 } while (0)
++	#define UCONTEXT_REG_SET_SP(ctx, val) do { \
++		UCONTEXT_REG_SP (ctx) = (val); \
++		 } while (0)
+ #endif
+ 
+ #ifndef UCONTEXT_REG_SET_PC
+-- 
+2.51.0
+

recipes-mono/mono/mono-native_6.14.1.bb

@@ -7,6 +7,9 @@ SRC_URI = "https://dl.winehq.org/mono/sources/mono/mono-6.14.1.tar.xz \
            file://0001-patch-XplatUIX11-cursor.diff \
            file://shm_open-test-crosscompile.diff \
            file://0001-Allow-passing-external-mapfile-C-build-options.patch \
+           file://0001-arm64-Remove-an-unused-function.patch \
+           file://0002-arm64-Fix-an-invalid-stack-read.patch \
+           file://0003-arm64-Fix-a-pointer-to-int-cast-size-mismatch.patch
 "
 
 addtask fixup_config after do_patch before do_configure

recipes-mono/mono/mono_6.14.1.bb

@@ -9,6 +9,9 @@ SRC_URI = "https://dl.winehq.org/mono/sources/mono/mono-6.14.1.tar.xz \
            file://shm_open-test-crosscompile.diff \
            file://0001-Allow-passing-external-mapfile-C-build-options.patch \
            file://0001-Add-libusb-1.0-mapping.patch \
+           file://0001-arm64-Remove-an-unused-function.patch \
+           file://0002-arm64-Fix-an-invalid-stack-read.patch \
+           file://0003-arm64-Fix-a-pointer-to-int-cast-size-mismatch.patch
 "