Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Köplinger <alex.koeplinger@outlook.com>2016-10-17 18:56:03 +0300
committerGitHub <noreply@github.com>2016-10-17 18:56:03 +0300
commit297c25787be0a333254683e7e7fa23255243a674 (patch)
tree49b92afd4ce61ccbb0ba71dca7053944c93b008f
parent0701399a88d478528048087c869453e4d8358e33 (diff)
parent524d79758ad8554b960797007efcf46320e7539d (diff)
Merge pull request #3779 from akoeplinger/fix-aot-only-referenceatkcocoa
[mini] Fix mention of --aot-only option, it no longer exists
-rw-r--r--mono/mini/mini-runtime.c2
-rw-r--r--mono/mini/mini.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/mono/mini/mini-runtime.c b/mono/mini/mini-runtime.c
index 231b44d65ec..617682fcec3 100644
--- a/mono/mini/mini-runtime.c
+++ b/mono/mini/mini-runtime.c
@@ -341,7 +341,7 @@ void *mono_global_codeman_reserve (int size)
void *ptr;
if (mono_aot_only)
- g_error ("Attempting to allocate from the global code manager while running with --aot-only.\n");
+ g_error ("Attempting to allocate from the global code manager while running in aot-only mode.\n");
if (!global_codeman) {
/* This can happen during startup */
diff --git a/mono/mini/mini.c b/mono/mini/mini.c
index 51ca3d5c79c..815c59042eb 100644
--- a/mono/mini/mini.c
+++ b/mono/mini/mini.c
@@ -4244,7 +4244,7 @@ mono_jit_compile_method_inner (MonoMethod *method, MonoDomain *target_domain, in
if (mono_aot_only) {
char *fullname = mono_method_full_name (method, TRUE);
- mono_error_set_execution_engine (error, "Attempting to JIT compile method '%s' while running with --aot-only. See http://docs.xamarin.com/ios/about/limitations for more information.\n", fullname);
+ mono_error_set_execution_engine (error, "Attempting to JIT compile method '%s' while running in aot-only mode. See https://developer.xamarin.com/guides/ios/advanced_topics/limitations/ for more information.\n", fullname);
g_free (fullname);
return NULL;