From a48d1d799185e6abfc8cf306eed7a7a24d42911c Mon Sep 17 00:00:00 2001 From: k0kubun Date: Sat, 11 Aug 2018 09:37:14 +0000 Subject: mjit.c: include mjit_worker.c instead of linking functions with mjit_worker.o. In the r64285's structure, we needed to publish some variables with mjit_ prefix. But ideally those variables should be completely private in mjit.o (or old mjit_worker.o), and it was hard. So I chose an approach similar to vm*.c for mjit.c and mjit_worker.c. I believe mjit_compile.c is still nice to be separated. After this commit, I'll remove the mjit_ prefix again... git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64289 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- common.mk | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'common.mk') diff --git a/common.mk b/common.mk index 59ffb8bba6..bfd542cb35 100644 --- a/common.mk +++ b/common.mk @@ -100,7 +100,6 @@ COMMONOBJS = array.$(OBJEXT) \ math.$(OBJEXT) \ mjit.$(OBJEXT) \ mjit_compile.$(OBJEXT) \ - mjit_worker.$(OBJEXT) \ node.$(OBJEXT) \ numeric.$(OBJEXT) \ object.$(OBJEXT) \ @@ -2216,7 +2215,7 @@ mjit.$(OBJEXT): {$(VPATH)}missing.h mjit.$(OBJEXT): {$(VPATH)}mjit.c mjit.$(OBJEXT): {$(VPATH)}mjit.h mjit.$(OBJEXT): {$(VPATH)}mjit_config.h -mjit.$(OBJEXT): {$(VPATH)}mjit_internal.h +mjit.$(OBJEXT): {$(VPATH)}mjit_worker.c mjit.$(OBJEXT): {$(VPATH)}node.h mjit.$(OBJEXT): {$(VPATH)}ruby_assert.h mjit.$(OBJEXT): {$(VPATH)}ruby_atomic.h @@ -2258,9 +2257,6 @@ mjit_compile.$(OBJEXT): {$(VPATH)}vm_core.h mjit_compile.$(OBJEXT): {$(VPATH)}vm_exec.h mjit_compile.$(OBJEXT): {$(VPATH)}vm_insnhelper.h mjit_compile.$(OBJEXT): {$(VPATH)}vm_opts.h -mjit_worker.$(OBJEXT): {$(VPATH)}mjit.h -mjit_worker.$(OBJEXT): {$(VPATH)}mjit_internal.h -mjit_worker.$(OBJEXT): {$(VPATH)}mjit_worker.c node.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h node.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h node.$(OBJEXT): $(CCAN_DIR)/list/list.h -- cgit v1.2.3