diff options
| author | Bernhard Urban <bernhard.urban@xamarin.com> | 2017-11-08 03:03:19 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2017-11-08 03:03:19 +0300 |
| commit | 4e01b276ae02f07fa831282d7ebbfb130534cafe (patch) | |
| tree | 110e745edcfd16bad93586de5a45c2dfc11e2d56 /configure.ac | |
| parent | a62a7e7e9697a16c6c0fc2c2dc8e206e599e7e15 (diff) | |
[interp] enable it by default in configure (#5925)
* [interp] enable it by default in configure
can be disabled via --enable-minimal=interpreter, like other components in the
runtime.
* [interp] use DISABLE_INTERPRETER in Makefile.am.in so it is closer to what we had before
* [interp] improve handling of interpreter flag and also check if we are on a cross-compile runtime
* [configure] add interpreter to the list of --enable-minimal
* [ci] remove --enable-interpreter from script
* [windows] disable interpreter for now
* [driver] add output about availabilty of interpreter in --version
* [man] add entry to mono.1 about --interpreter
* [driver] update --interpreter handling
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index c48768b2df9..66ed8b5e5a3 100644 --- a/configure.ac +++ b/configure.ac @@ -1195,7 +1195,7 @@ fi AC_ARG_ENABLE(minimal, [ --enable-minimal=LIST drop support for LIST subsystems. LIST is a comma-separated list from: aot, profiler, decimal, pinvoke, debug, appdomains, verifier, - reflection_emit, reflection_emit_save, large_code, logging, com, ssa, generics, attach, jit, simd, soft_debug, perfcounters, normalization, desktop_loader, shared_perfcounters, remoting, + reflection_emit, reflection_emit_save, large_code, logging, com, ssa, generics, attach, jit, interpreter, simd, soft_debug, perfcounters, normalization, desktop_loader, shared_perfcounters, remoting, security, lldb, mdb, sgen_remset, sgen_marksweep_par, sgen_marksweep_fixed, sgen_marksweep_fixed_par, sgen_copying.], [ for feature in `echo "$enable_minimal" | sed -e "s/,/ /g"`; do @@ -1291,12 +1291,19 @@ if test "x$mono_feature_disable_verifier" = "xyes"; then fi if test "x$mono_feature_disable_jit" = "xyes"; then - AC_DEFINE(DISABLE_JIT, 1, [Disable the JIT, only full-aot mode will be supported by the runtime.]) - AC_MSG_NOTICE([Disabled the JIT engine, only full AOT will be supported]) + AC_DEFINE(DISABLE_JIT, 1, [Disable the JIT, only full-aot mode or interpreter will be supported by the runtime.]) + AC_MSG_NOTICE([Disabled the JIT engine, only full AOT or interpreter will be supported]) fi AM_CONDITIONAL(DISABLE_JIT, test x$mono_feature_disable_jit = xyes) +if test "x$mono_feature_disable_interpreter" = "xyes"; then + AC_DEFINE(DISABLE_INTERPRETER, 1, [Disable the interpreter.]) + AC_MSG_NOTICE([Disabled the interpreter]) +fi + +AM_CONDITIONAL(DISABLE_INTERPRETER, test x$mono_feature_disable_interpreter = xyes) + if test "x$mono_feature_disable_simd" = "xyes"; then AC_DEFINE(DISABLE_SIMD, 1, [Disable SIMD intrinsics related optimizations.]) AC_MSG_NOTICE([Disabled SIMD support]) @@ -3713,14 +3720,6 @@ if test "x$have_deprecated" = "xyes"; then AC_DEFINE(HAVE_DEPRECATED, 1, [Support for the deprecated attribute]) fi -AC_ARG_ENABLE(interpreter, [ --enable-interpreter Enable Interpreter], enable_interpreter=$enableval, enable_interpreter=no) - -if test "x$enable_interpreter" = "xyes"; then - AC_DEFINE(ENABLE_INTERPRETER, 1, [Enable Interpreter]) -fi - -AM_CONDITIONAL(ENABLE_INTERPRETER, [test x$enable_interpreter = xyes]) - dnl dnl Simple Generational checks (sgen) dnl @@ -4907,7 +4906,6 @@ echo " BigArrays: $enable_big_arrays DTrace: $enable_dtrace LLVM Back End: $enable_llvm (dynamically loaded: $enable_loadedllvm) - Interpreter: $enable_interpreter Libraries: .NET 4.x: $with_profile4_x |