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:
authorZoltan Varga <vargaz@gmail.com>2016-07-06 07:19:45 +0300
committerZoltan Varga <vargaz@gmail.com>2016-07-06 07:19:50 +0300
commit4261bb66964a26f73b26a086ea0145ab10784077 (patch)
tree8329989aaa22e04ac1c03e6d06c7c0edd2f8d82c
parent9ae0c7f0996129ac69685640a34dcdba892df440 (diff)
[llvm] Fix aot when using llvm master.
-rw-r--r--mono/mini/mini-llvm.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/mono/mini/mini-llvm.c b/mono/mini/mini-llvm.c
index 90f9a49ba8a..101676a973f 100644
--- a/mono/mini/mini-llvm.c
+++ b/mono/mini/mini-llvm.c
@@ -6694,7 +6694,10 @@ mono_llvm_emit_method (MonoCompile *cfg)
ctx->is_linkonce = is_linkonce;
#if LLVM_API_VERSION > 100
- ctx->lmodule = LLVMModuleCreateWithName ("jit-module");
+ if (cfg->compile_aot)
+ ctx->lmodule = ctx->module->lmodule;
+ else
+ ctx->lmodule = LLVMModuleCreateWithName ("jit-module");
#else
ctx->lmodule = ctx->module->lmodule;
#endif