Merge pull request #4453 from lambdageek/bug-49721

[mono.git] / mono / mini / tramp-sparc.c

diff --git a/mono/mini/tramp-sparc.c b/mono/mini/tramp-sparc.c
index d390ed4dcc6be5714d2e07d9d5d8db6b61b9c53e..ad7bcddbe85dac3c3c7f030c61bb19ea07bcafab 100644 (file)
--- a/mono/mini/tramp-sparc.c
+++ b/mono/mini/tramp-sparc.c
@@ -18,6 +18,7 @@
 
 #include "mini.h"
 #include "mini-sparc.h"
+#include "jit-icalls.h"
 
 /*
  * mono_arch_get_unbox_trampoline:
@@ -51,6 +52,8 @@ mono_arch_get_unbox_trampoline (MonoMethod *m, gpointer addr)
 
        mono_arch_flush_icache (start, code - start);
 
+       mono_tramp_info_register (mono_tramp_info_create (NULL, start, code - start, NULL, NULL), NULL);
+
        return start;
 }
 
@@ -168,7 +171,7 @@ mono_arch_create_generic_trampoline (MonoTrampolineType tramp_type, MonoTrampInf
        sparc_sti_imm (code, sparc_o0, sparc_sp, MONO_SPARC_STACK_BIAS + 304);
 
        /* Check for thread interruption */
-       sparc_set (code, (guint8*)mono_thread_force_interruption_checkpoint, sparc_o7);
+       sparc_set (code, (guint8*)mono_interruption_checkpoint_from_trampoline, sparc_o7);
        sparc_jmpl (code, sparc_o7, sparc_g0, sparc_o7);
        sparc_nop (code);