Merge pull request #4851 from kumpera/handle_eloop_errno

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

diff --git a/mono/mini/tramp-ia64.c b/mono/mini/tramp-ia64.c
index 2b4af7f8fe2ac613acd6667519fa76134d17d8a0..4c2a4ee80ff498ebab969fad4eb41ca7456ab135 100644 (file)
--- a/mono/mini/tramp-ia64.c
+++ b/mono/mini/tramp-ia64.c
@@ -1,5 +1,6 @@
-/*
- * tramp-ia64.c: JIT trampoline code for ia64
+/**
+ * \file
+ * JIT trampoline code for ia64
  *
  * Authors:
  *   Zoltan Varga (vargaz@gmail.com)
@@ -13,11 +14,11 @@
 #include <mono/metadata/appdomain.h>
 #include <mono/metadata/marshal.h>
 #include <mono/metadata/tabledefs.h>
-#include <mono/metadata/mono-debug-debugger.h>
 #include <mono/arch/ia64/ia64-codegen.h>
 
 #include "mini.h"
 #include "mini-ia64.h"
+#include "jit-icalls.h"
 
 #define GP_SCRATCH_REG 31
 #define GP_SCRATCH_REG2 30
@@ -256,7 +257,7 @@ mono_arch_create_generic_trampoline (MonoTrampolineType tramp_type, MonoTrampInf
        /* This is not perf critical code so no need to check the interrupt flag */
        ia64_mov (code, l2, IA64_R8);
 
-       tramp = (guint8*)mono_thread_force_interruption_checkpoint;
+       tramp = (guint8*)mono_interruption_checkpoint_from_trampoline;
        ia64_movl (code, l0, tramp);
        ia64_ld8_inc_imm (code, l1, l0, 8);
        ia64_mov_to_br (code, IA64_B6, l1);