2010-05-27 Zoltan Varga <vargaz@gmail.com>

	* mini-s390x.c (mono_arch_get_delegate_invoke_impls): Fix the s390x build.

svn path=/trunk/mono/; revision=158044

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index ec8de553e0c58476ff7f35ec1d26215ae6cba1b1..6eeaf38326ae159e0f22c37ec19621c487f8f47b 100755 (executable)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-27  Zoltan Varga  <vargaz@gmail.com>
+
+       * mini-s390x.c (mono_arch_get_delegate_invoke_impls): Fix the s390x build.
+
 2010-05-26 Rodrigo Kumpera  <rkumpera@novell.com>
 
        * method-to-ir.c (mono_method_to_ir): Add missing write barrier to stobj.

diff --git a/mono/mini/mini-s390x.c b/mono/mini/mini-s390x.c
index 1c3d2fea5f414458887e4b7309022ecaf52257da..09e4fac36071e39ec6c9b33b98370be584841751 100644 (file)
--- a/mono/mini/mini-s390x.c
+++ b/mono/mini/mini-s390x.c
@@ -5699,11 +5699,11 @@ mono_arch_get_delegate_invoke_impls (void)
        int i;
 
        code = get_delegate_invoke_impl (TRUE, 0, &code_len, TRUE);
-       res = g_slist_prepend (res, mono_aot_tramp_info_create (g_strdup ("delegate_invoke_impl_has_target"), code, code_len));
+       res = g_slist_prepend (res, mono_tramp_info_create (g_strdup ("delegate_invoke_impl_has_target"), code, code_len, NULL, NULL));
 
        for (i = 0; i < MAX_ARCH_DELEGATE_PARAMS; ++i) {
                code = get_delegate_invoke_impl (FALSE, i, &code_len, TRUE);
-               res = g_slist_prepend (res, mono_aot_tramp_info_create (g_strdup_printf ("delegate_invoke_impl_target_%d", i), code, code_len));
+               res = g_slist_prepend (res, mono_tramp_info_create (g_strdup_printf ("delegate_invoke_impl_target_%d", i), code, code_len, NULL, NULL));
        }
 
        return res;