Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[runtime] always use mono_jit_set_aot_mode #4491

Merged
merged 2 commits into from
Jul 24, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions runtime/exports.t4
Original file line number Diff line number Diff line change
Expand Up @@ -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"
),
Expand Down
1 change: 0 additions & 1 deletion runtime/monotouch-main.m
Original file line number Diff line number Diff line change
Expand Up @@ -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");

Expand Down
3 changes: 2 additions & 1 deletion tools/mtouch/mtouch.cs
Original file line number Diff line number Diff line change
Expand Up @@ -663,7 +663,8 @@ public static string GenerateMain (Application app, IEnumerable<Assembly> 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 if (app.IsDeviceBuild)
sw.WriteLine ("\tmono_jit_set_aot_mode (MONO_AOT_MODE_FULL);");

if (assembly_location.Length > 0)
sw.WriteLine ("\txamarin_set_assembly_directories (&assembly_locations);");
Expand Down