Merge pull request #5714 from alexischr/update_bockbuild

[mono.git] / mono / mini / tramp-arm64-gsharedvt.c

diff --git a/mono/mini/tramp-arm64-gsharedvt.c b/mono/mini/tramp-arm64-gsharedvt.c
index 13f73d9983b46ce0257f6f3b7c788866180425e3..1e35f6a8521b54dc7f78066cc8cf40dce6607c11 100644 (file)
--- a/mono/mini/tramp-arm64-gsharedvt.c
+++ b/mono/mini/tramp-arm64-gsharedvt.c
@@ -1,5 +1,6 @@
-/*
- * tramp-arm64-gsharedvt.c: gsharedvt support code for arm64
+/**
+ * \file
+ * gsharedvt support code for arm64
  *
  * Authors:
  *   Zoltan Varga <vargaz@gmail.com>
@@ -16,7 +17,7 @@
 /*
  * GSHAREDVT
  */
-#ifdef MONO_ARCH_GSHARED_SUPPORTED
+#ifdef MONO_ARCH_GSHAREDVT_SUPPORTED
 
 /*
  * mono_arch_get_gsharedvt_arg_trampoline:
@@ -93,7 +94,7 @@ mono_arm_start_gsharedvt_call (GSharedVtCallInfo *info, gpointer *caller, gpoint
                                break;
                        case GSHAREDVT_ARG_BYVAL_TO_BYREF:
                                src_slot = src & 0x3f;
-                               src_ptr = caller + src_slot + src_offset;
+                               src_ptr = (guint8*)(caller + src_slot) + src_offset;
                                callee [dst] = src_ptr;
                                break;
                        default:
@@ -562,21 +563,4 @@ mono_arch_get_gsharedvt_trampoline (MonoTrampInfo **info, gboolean aot)
 
 #endif
 
-#else
-
-gpointer
-mono_arch_get_gsharedvt_trampoline (MonoTrampInfo **info, gboolean aot)
-{
-       if (info)
-               *info = NULL;
-       return NULL;
-}
-
-gpointer
-mono_arch_get_gsharedvt_arg_trampoline (MonoDomain *domain, gpointer arg, gpointer addr)
-{
-       g_assert_not_reached ();
-       return NULL;
-}
-
-#endif /* MONO_ARCH_GSHARED_SUPPORTED */
\ No newline at end of file
+#endif /* MONO_ARCH_GSHAREDVT_SUPPORTED */