mono: update to 6.12.0.90.
This commit is contained in:
parent
3cb1898416
commit
a78feebb60
2 changed files with 2 additions and 33 deletions
|
@ -1,30 +0,0 @@
|
|||
From 121928d29ac1e0aebb80531b3ebcca1a9ffcd618 Mon Sep 17 00:00:00 2001
|
||||
From: Bernhard Urban-Forster <lewurm@gmail.com>
|
||||
Date: Fri, 6 Dec 2019 11:35:11 +0100
|
||||
Subject: [PATCH] [ppc32] delete leftover code from pre-monoctx area (#18072)
|
||||
|
||||
Also update assert which doesn't make sense since we have moved over to MonoContext
|
||||
|
||||
Some context: e7011c780f676914f559f14f25e76c192bb2b0b2
|
||||
|
||||
Fixes: https://github.com/mono/mono/issues/18064
|
||||
---
|
||||
mono/mini/exceptions-ppc.c | 5 +----
|
||||
1 file changed, 1 insertion(+), 4 deletions(-)
|
||||
|
||||
diff --git a/mono/mini/exceptions-ppc.c b/mono/mini/exceptions-ppc.c
|
||||
index 44d09bcaba1d..d14f8383eba9 100644
|
||||
--- mono/mini/exceptions-ppc.c
|
||||
+++ mono/mini/exceptions-ppc.c
|
||||
@@ -692,10 +692,7 @@ mono_arch_handle_altstack_exception (void *sigctx, MONO_SIG_HANDLER_INFO_TYPE *s
|
||||
/* may need to adjust pointers in the new struct copy, depending on the OS */
|
||||
uc_copy = (MonoContext*)(sp + 16);
|
||||
mono_sigctx_to_monoctx (uc, uc_copy);
|
||||
-#if defined(__linux__) && !defined(__mono_ppc64__)
|
||||
- uc_copy->uc_mcontext.uc_regs = (gpointer)((char*)uc_copy + ((char*)uc->uc_mcontext.uc_regs - (char*)uc));
|
||||
-#endif
|
||||
- g_assert (mono_arch_ip_from_context (uc) == mono_arch_ip_from_context (uc_copy));
|
||||
+ g_assert (mono_arch_ip_from_context (uc) == MONO_CONTEXT_GET_IP (uc_copy));
|
||||
/* at the return form the signal handler execution starts in altstack_handle_and_restore() */
|
||||
UCONTEXT_REG_LNK(uc) = UCONTEXT_REG_NIP(uc);
|
||||
#ifdef PPC_USES_FUNCTION_DESCRIPTOR
|
|
@ -1,10 +1,9 @@
|
|||
# Template file for 'mono'
|
||||
pkgname=mono
|
||||
version=6.10.0.104
|
||||
version=6.12.0.90
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="--disable-system-aot"
|
||||
# XXX: figure out how to split this up into subpkgs.
|
||||
hostmakedepends="perl python3 cmake which"
|
||||
makedepends="zlib-devel libX11-devel libgdiplus-devel"
|
||||
depends="ca-certificates python3-Pillow"
|
||||
|
@ -13,7 +12,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
|
|||
license="MIT, BSD-3-Clause, GPL-2.0-or-later, LGPL-2.0-or-later, MPL-1.1"
|
||||
homepage="https://www.mono-project.com"
|
||||
distfiles="https://download.mono-project.com/sources/mono/${pkgname}-${version}.tar.xz"
|
||||
checksum=b8d6eb70a252d2efad8384d66b529883dc59e581565d617fa57f8e79317e332c
|
||||
checksum=51de5c02ad511333f93ff585bca54c8784de35af4ff27b759d16b46c4402cdac
|
||||
lib32disabled=yes
|
||||
python_version="3"
|
||||
|
||||
|
|
Loading…
Reference in a new issue