[Pkg-mono-svn-commits] [mono] 04/04: Fix the generation of static rgctx trampolines when using aot on linux.

[Jo Shields]

This is an automated email from the git hooks/post-receive script.

directhex pushed a commit to branch master-patches/arm64_port
in repository mono.

commit 9414811ca3a3afb00122304f11f5bc640a993fca
Author: Zoltan Varga <vargaz at gmail.com>
Date:   Sat Apr 2 01:38:43 2016 -0400

    Fix the generation of static rgctx trampolines when using aot on linux.
    
    (cherry picked from commit 455d2b81e2e662569b9654c79b5e1763bf133fa0)
---
 mono/mini/aot-compiler.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/mono/mini/aot-compiler.c b/mono/mini/aot-compiler.c
index 864359b..a2b4461 100644
--- a/mono/mini/aot-compiler.c
+++ b/mono/mini/aot-compiler.c
@@ -1098,8 +1098,7 @@ arm64_emit_static_rgctx_trampoline (MonoAotCompile *acfg, int offset, int *tramp
 	/* Similar to the specific trampolines, but use the rgctx reg instead of ip1 */
 
 	/* Load argument from first GOT slot */
-	g_assert (MONO_ARCH_RGCTX_REG == 27);
-	arm64_emit_load_got_slot (acfg, ARMREG_R27, offset);
+	arm64_emit_load_got_slot (acfg, MONO_ARCH_RGCTX_REG, offset);
 	/* Load generic trampoline address from second GOT slot */
 	arm64_emit_load_got_slot (acfg, ARMREG_R16, offset + 1);
 	fprintf (acfg->fp, "br x16\n");

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mono/packages/mono.git