[前][次][番号順一覧][スレッド一覧]

ruby-changes:63699

From: Takashi <ko1@a...>
Date: Mon, 23 Nov 2020 13:56:34 +0900 (JST)
Subject: [ruby-changes:63699] 0a2b987696 (master): Make --disable-jit-support compile

https://git.ruby-lang.org/ruby.git/commit/?id=0a2b987696

From 0a2b9876968dcfd7015dff09d5e44dcbf5668244 Mon Sep 17 00:00:00 2001
From: Takashi Kokubun <takashikkbn@g...>
Date: Sun, 22 Nov 2020 20:54:32 -0800
Subject: 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.

diff --git a/common.mk b/common.mk
index 226400b..6120761 100644
--- a/common.mk
+++ b/common.mk
@@ -10020,6 +10020,7 @@ process.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h https://github.com/ruby/ruby/blob/trunk/common.mk#L10020
 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 e06ac08..b724024 100644
--- a/mjit.c
+++ b/mjit.c
@@ -11,10 +11,9 @@ https://github.com/ruby/ruby/blob/trunk/mjit.c#L11
 
 // 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 21767a6..63cd1d4 100644
--- a/mjit.h
+++ b/mjit.h
@@ -10,12 +10,12 @@ https://github.com/ruby/ruby/blob/trunk/mjit.h#L10
 
 #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:
-- 
cgit v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]