Patched from wrong branch.

This commit is contained in:
Jo Shields 2018-08-07 11:40:21 -04:00
parent 615b2e653b
commit b28e823592
No known key found for this signature in database
GPG Key ID: C90F9CB90E1FAD0C

View File

@ -1,11 +1,11 @@
diff --git a/mono/mini/aot-compiler.c b/mono/mini/aot-compiler.c
index 61becfed022..e04c9f0b7ae 100644
--- a/mono/mini/aot-compiler.c
+++ b/mono/mini/aot-compiler.c
@@ -12496,7 +12496,7 @@ mono_compile_assembly (MonoAssembly *ass, guint32 opts, const char *aot_options,
acfg->aot_opts.nimt_trampolines = 512;
acfg->aot_opts.nrgctx_fetch_trampolines = 128;
acfg->aot_opts.ngsharedvt_arg_trampolines = 512;
Index: xamarin-pkg-mono/mono/mini/aot-compiler.c
===================================================================
--- xamarin-pkg-mono.orig/mono/mini/aot-compiler.c
+++ xamarin-pkg-mono/mono/mini/aot-compiler.c
@@ -12559,7 +12559,7 @@ mono_compile_assembly (MonoAssembly *ass
#ifdef MONO_ARCH_HAVE_FTNPTR_ARG_TRAMPOLINE
acfg->aot_opts.nftnptr_arg_trampolines = 128;
#endif
- acfg->aot_opts.llvm_path = g_strdup ("");
+ acfg->aot_opts.llvm_path = g_strdup ("/usr/lib/mono/llvm/bin/");
acfg->aot_opts.temp_path = g_strdup ("");