From 8be5f8e49c2d4ca6541c264df74f8f4693cbcc8a Mon Sep 17 00:00:00 2001 From: Bernhard Urban Date: Mon, 23 Jul 2018 12:10:43 +0200 Subject: [PATCH] [runtime] always use `mono_jit_set_aot_mode` `mono_jit_set_aot_only` is deprecated and accidently broke with https://github.com/mono/mono/pull/7887 --- runtime/exports.t4 | 4 ---- runtime/monotouch-main.m | 1 - tools/mtouch/mtouch.cs | 3 ++- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/runtime/exports.t4 b/runtime/exports.t4 index d145a311b82a..17a89b57f63d 100644 --- a/runtime/exports.t4 +++ b/runtime/exports.t4 @@ -537,10 +537,6 @@ "char**", "argv" ), - new Export ("void", "mono_jit_set_aot_only", - "mono_bool", "aot_only" - ), - new Export ("void", "mono_jit_set_aot_mode", "MonoAotMode", "mode" ), diff --git a/runtime/monotouch-main.m b/runtime/monotouch-main.m index 555181123696..76c068529ac2 100644 --- a/runtime/monotouch-main.m +++ b/runtime/monotouch-main.m @@ -393,7 +393,6 @@ - (void) memoryWarning: (NSNotification *) sender #if defined (__arm__) || defined(__aarch64__) xamarin_register_modules (); - mono_jit_set_aot_only (TRUE); #endif DEBUG_LAUNCH_TIME_PRINT ("\tAOT register time"); diff --git a/tools/mtouch/mtouch.cs b/tools/mtouch/mtouch.cs index 4d51b646ea5f..86ec1f824ac9 100644 --- a/tools/mtouch/mtouch.cs +++ b/tools/mtouch/mtouch.cs @@ -663,7 +663,8 @@ public static string GenerateMain (Application app, IEnumerable assemb sw.WriteLine ("\tmono_sgen_mono_ilgen_init ();"); sw.WriteLine ("\tmono_ee_interp_init (NULL);"); sw.WriteLine ("\tmono_jit_set_aot_mode (MONO_AOT_MODE_INTERP);"); - } + } else + sw.WriteLine ("\tmono_jit_set_aot_mode (MONO_AOT_MODE_FULL);"); if (assembly_location.Length > 0) sw.WriteLine ("\txamarin_set_assembly_directories (&assembly_locations);");