Merge pull request #787 from directhex/master

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

diff --git a/mono/mini/tramp-arm.c b/mono/mini/tramp-arm.c
index 39070e676082c334b01c9a290e9878c65d48eca0..225ef9f4e7cb10e2ad870b7c7728a11b39d72557 100644 (file)
--- a/mono/mini/tramp-arm.c
+++ b/mono/mini/tramp-arm.c
@@ -22,9 +22,6 @@
 
 #define ALIGN_TO(val,align) ((((guint64)val) + ((align) - 1)) & ~((align) - 1))
 
-static guint8* nullified_class_init_trampoline;
-
-
 #ifdef USE_JUMP_TABLES
 
 static guint16
@@ -131,16 +128,13 @@ mono_arch_patch_plt_entry (guint8 *code, gpointer *got, mgreg_t *regs, guint8 *a
 void
 mono_arch_nullify_class_init_trampoline (guint8 *code, mgreg_t *regs)
 {
-       mono_arch_patch_callsite (NULL, code, nullified_class_init_trampoline);
+       mono_arch_patch_callsite (NULL, code, mini_get_nullified_class_init_trampoline ());
 }
 
 void
 mono_arch_nullify_plt_entry (guint8 *code, mgreg_t *regs)
 {
-       if (mono_aot_only && !nullified_class_init_trampoline)
-               nullified_class_init_trampoline = mono_aot_get_trampoline ("nullified_class_init_trampoline");
-
-       mono_arch_patch_plt_entry (code, NULL, regs, nullified_class_init_trampoline);
+       mono_arch_patch_plt_entry (code, NULL, regs, mini_get_nullified_class_init_trampoline ());
 }
 
 #ifndef DISABLE_JIT
@@ -452,10 +446,6 @@ mono_arch_create_generic_trampoline (MonoTrampolineType tramp_type, MonoTrampInf
        /* Sanity check */
        g_assert ((code - buf) <= buf_len);
 
-       if (tramp_type == MONO_TRAMPOLINE_CLASS_INIT)
-               /* Initialize the nullified class init trampoline used in the AOT case */
-               nullified_class_init_trampoline = mono_arch_get_nullified_class_init_trampoline (NULL);
-
        if (info) {
                tramp_name = mono_get_generic_trampoline_name (tramp_type);
                *info = mono_tramp_info_create (tramp_name, buf, code - buf, ji, unwind_ops);
@@ -928,6 +918,13 @@ mono_arch_create_generic_class_init_trampoline (MonoTrampInfo **info, gboolean a
        g_assert_not_reached ();
        return NULL;
 }
+
+gpointer
+mono_arch_get_nullified_class_init_trampoline (MonoTrampInfo **info)
+{
+       g_assert_not_reached ();
+       return NULL;
+}
        
 #endif /* DISABLE_JIT */