From 0a2b9876968dcfd7015dff09d5e44dcbf5668244 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Sun, 22 Nov 2020 20:54:32 -0800 Subject: [PATCH] Make --disable-jit-support compile vm_core.h needs to be included to know rb_execution_context_t, etc. I also added a trivial refactoring in mjit.c and missing dependency for process.c. --- common.mk | 1 + mjit.c | 3 +-- mjit.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common.mk b/common.mk index 226400bcf5..6120761cf2 100644 --- a/common.mk +++ b/common.mk @@ -10020,6 +10020,7 @@ process.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h process.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h process.$(OBJEXT): {$(VPATH)}config.h process.$(OBJEXT): {$(VPATH)}constant.h +process.$(OBJEXT): {$(VPATH)}debug_counter.h process.$(OBJEXT): {$(VPATH)}defines.h process.$(OBJEXT): {$(VPATH)}dln.h process.$(OBJEXT): {$(VPATH)}encoding.h diff --git a/mjit.c b/mjit.c index e06ac08252..b7240243f0 100644 --- a/mjit.c +++ b/mjit.c @@ -11,10 +11,9 @@ // To share variables privately, include mjit_worker.c instead of linking. -#include "ruby/internal/config.h" - #if USE_MJIT +#include "ruby/internal/config.h" #include "constant.h" #include "id_table.h" #include "internal.h" diff --git a/mjit.h b/mjit.h index 21767a67fc..63cd1d44e5 100644 --- a/mjit.h +++ b/mjit.h @@ -10,12 +10,12 @@ #include "ruby/internal/config.h" #include "ruby/internal/stdbool.h" +#include "vm_core.h" # if USE_MJIT #include "debug_counter.h" #include "ruby.h" -#include "vm_core.h" // Special address values of a function generated from the // corresponding iseq by MJIT: