summaryrefslogtreecommitdiff
path: root/libguile/vm.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2018-09-17 09:28:41 +0200
committerAndy Wingo <wingo@pobox.com>2018-09-17 09:28:41 +0200
commitce9169804e95e8156945c6ba9c2175565c3e52bb (patch)
tree9bd28b5df97afea13a6e557d53f242ab82354b32 /libguile/vm.c
parentf03ff5304a5804a5a83c37d6640b99e0d842dc15 (diff)
downloadguile-ce9169804e95e8156945c6ba9c2175565c3e52bb.tar.gz
Fix --disable-jit compilationlightning
* libguile/jit.c: Wrap the whole thing in ENABLE_JIT. * libguile/threads.c (on_thread_exit): * libguile/vm.c (scm_call_n): * libguile/init.c (scm_i_init_guile): * libguile/vm-engine.c (VM_NAME): Wrap calls into jit.c with ENABLE_JIT. * configure.ac: Move up AC_CANONICAL_TARGET, as autoconf was complaining about it coming after AC_ARG_PROGRAM. * acinclude.m4 (GUILE_ENABLE_JIT): Fix to honor --enable-jit arg.
Diffstat (limited to 'libguile/vm.c')
-rw-r--r--libguile/vm.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libguile/vm.c b/libguile/vm.c
index 10db757f1..db7816acb 100644
--- a/libguile/vm.c
+++ b/libguile/vm.c
@@ -1588,8 +1588,10 @@ scm_call_n (SCM proc, SCM *argv, size_t nargs)
/* Non-local return. */
if (vp->abort_hook_enabled)
invoke_abort_hook (thread);
+#if ENABLE_JIT
if (mcode && !vp->disable_mcode)
scm_jit_enter_mcode (thread, mcode);
+#endif
}
else
vp->ip = get_callee_vcode (thread);