diff options
| author | Takashi Kokubun <takashikkbn@gmail.com> | 2023-03-06 23:15:30 -0800 |
|---|---|---|
| committer | Takashi Kokubun <takashikkbn@gmail.com> | 2023-03-06 23:44:01 -0800 |
| commit | 2e875549a934fa04b7939810fa0d8a2762702aaa (patch) | |
| tree | 116b99056f810d48359ac6fa6a3b06e9ddc65c05 /win32 | |
| parent | eaccdc1941304d6273397b21c25213174d892185 (diff) | |
| download | ruby-2e875549a934fa04b7939810fa0d8a2762702aaa.tar.gz | |
s/MJIT/RJIT/
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile.sub | 8 | ||||
| -rw-r--r-- | win32/setup.mak | 4 | ||||
| -rw-r--r-- | win32/win32.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index ae97edcb8d..ea3b50c4ea 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -350,8 +350,8 @@ CPPFLAGS = $(DEFS) $(ARCHDEFS) $(CPPFLAGS) !if "$(USE_RUBYGEMS)" == "no" CPPFLAGS = -DDISABLE_RUBYGEMS $(CPPFLAGS) !endif -!ifndef MJIT_SUPPORT -MJIT_SUPPORT = no +!ifndef RJIT_SUPPORT +RJIT_SUPPORT = no !endif POSTLINK = @@ -930,7 +930,7 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub #define RUBY_COREDLL "$(RT)" #define RUBY_PLATFORM "$(arch)" #define RUBY_SITEARCH "$(sitearch)" -#define USE_MJIT 0 +#define USE_RJIT 0 #endif /* $(guard) */ << @@ -1123,7 +1123,7 @@ s,@srcdir@,$(srcdir),;t t s,@top_srcdir@,$(srcdir),;t t s,@try_header@,try_compile,;t t s,@ruby_pc@,$(ruby_pc),;t t -s,@MJIT_SUPPORT@,$(MJIT_SUPPORT),;t t +s,@RJIT_SUPPORT@,$(RJIT_SUPPORT),;t t <<KEEP !if "$(HAVE_BASERUBY)" != "yes" || "$(CROSS_COMPILING)" == "yes" diff --git a/win32/setup.mak b/win32/setup.mak index 71796eae9e..c0074bf963 100644 --- a/win32/setup.mak +++ b/win32/setup.mak @@ -59,8 +59,8 @@ USE_RUBYGEMS = $(USE_RUBYGEMS) !if defined(ENABLE_DEBUG_ENV) ENABLE_DEBUG_ENV = $(ENABLE_DEBUG_ENV) !endif -!if defined(MJIT_SUPPORT) -MJIT_SUPPORT = $(MJIT_SUPPORT) +!if defined(RJIT_SUPPORT) +RJIT_SUPPORT = $(RJIT_SUPPORT) !endif # TOOLS diff --git a/win32/win32.c b/win32/win32.c index b1d644929f..8c13ba7e07 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -1355,7 +1355,7 @@ is_batch(const char *cmd) HANDLE rb_w32_start_process(const char *abspath, char *const *argv, int out_fd) { - /* NOTE: This function is used by MJIT worker, so it can be used parallelly with + /* NOTE: This function is used by RJIT worker, so it can be used parallelly with Ruby's main thread. So functions touching things shared with main thread can't be used, like `ALLOCV` that may trigger GC or `FindFreeChildSlot` that finds a slot from shared memory without atomic locks. */ @@ -2222,7 +2222,7 @@ rb_w32_wstr_to_mbstr(UINT cp, const WCHAR *wstr, int clen, long *plen) WCHAR * rb_w32_mbstr_to_wstr(UINT cp, const char *str, int clen, long *plen) { - /* This is used by MJIT worker. Do not trigger GC or call Ruby method here. */ + /* This is used by RJIT worker. Do not trigger GC or call Ruby method here. */ WCHAR *ptr; int len = MultiByteToWideChar(cp, 0, str, clen, NULL, 0); if (!(ptr = malloc(sizeof(WCHAR) * len))) return 0; |