From b85f40ba88657a7d059513827c26f1db02437a09 Mon Sep 17 00:00:00 2001 From: Rodrigo Kumpera Date: Tue, 22 Aug 2017 16:23:50 -0700 Subject: [PATCH] [wasm] Add MONO_AOT_MODE_INTERP_LLVMONLY to MonoAotMode. This is what wasm+interpreter uses. --- mono/mini/driver.c | 5 +++++ mono/mini/jit.h | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/mono/mini/driver.c b/mono/mini/driver.c index 297179bf86c..f293f7c6803 100644 --- a/mono/mini/driver.c +++ b/mono/mini/driver.c @@ -2376,6 +2376,11 @@ mono_jit_set_aot_mode (MonoAotMode mode) mono_aot_only = TRUE; mono_use_interpreter = TRUE; } + if (mono_aot_mode == MONO_AOT_MODE_INTERP_LLVMONLY) { + mono_aot_only = TRUE; + mono_use_interpreter = TRUE; + mono_llvm_only = TRUE; + } } mono_bool diff --git a/mono/mini/jit.h b/mono/mini/jit.h index 408fead304e..3a91c13f0d5 100644 --- a/mono/mini/jit.h +++ b/mono/mini/jit.h @@ -57,7 +57,9 @@ typedef enum { MONO_AOT_MODE_LLVMONLY, /* Uses Interpreter, JIT is disabled and not allowed, * equivalent to "--full-aot --interpreter" */ - MONO_AOT_MODE_INTERP + MONO_AOT_MODE_INTERP, + /* Same as INTERP, but use only llvm compiled code */ + MONO_AOT_MODE_INTERP_LLVMONLY, } MonoAotMode; MONO_API void -- 2.25.1