summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authork0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-11-19 14:00:49 +0000
committerk0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-11-19 14:00:49 +0000
commitb756b25c60a887d5d073db7ccbb5e214b5cfd939 (patch)
tree38c24760be5fe81e725c66e2ebeb4df487c37d99
parent83aff333cdd1a36b8dbb6a3903e047b1304fa1ae (diff)
ruby.c: do not surface MJIT to user
In some places, both JIT and MJIT are being used, but it could be confusing for new comers. We're not explaining MJIT on NEWS file or release notes as well. So we consider MJIT as an internal term of implementation like YARV. configure.ac: ditto git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65810 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--configure.ac8
-rw-r--r--ruby.c16
2 files changed, 12 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac
index 2512e85..2c9b5de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3341,10 +3341,10 @@ AC_SUBST(CAPITARGET)
AS_CASE(["$RDOCTARGET:$CAPITARGET"],[nodoc:nodoc],[INSTALLDOC=nodoc],[INSTALLDOC=all])
AC_SUBST(INSTALLDOC)
-AC_ARG_ENABLE(mjit-support,
- AS_HELP_STRING([--disable-mjit-support], [disable MJIT features]),
+AC_ARG_ENABLE(jit-support,
+ AS_HELP_STRING([--disable-jit-support], [disable JIT features]),
[MJIT_SUPPORT=$enableval
- AS_IF([test x"$enable_mjit_support" = "xyes"],
+ AS_IF([test x"$enable_jit_support" = "xyes"],
[AC_DEFINE(USE_MJIT, 1)],
[AC_DEFINE(USE_MJIT, 0)])],
[MJIT_SUPPORT=yes
@@ -4016,7 +4016,7 @@ config_summary "debugflags" "$debugflags"
config_summary "warnflags" "$warnflags"
config_summary "strip command" "$STRIP"
config_summary "install doc" "$install_doc"
-config_summary "MJIT support" "$MJIT_SUPPORT"
+config_summary "JIT support" "$MJIT_SUPPORT"
config_summary "man page type" "$MANTYPE"
config_summary "search path" "$search_path"
config_summary "static-linked-ext" ${EXTSTATIC:+"yes"}
diff --git a/ruby.c b/ruby.c
index ec2282c..93298cb 100644
--- a/ruby.c
+++ b/ruby.c
@@ -252,8 +252,8 @@ usage(const char *name, int help)
M("-w", "", "turn warnings on for your script"),
M("-W[level=2]", "", "set warning level; 0=silence, 1=medium, 2=verbose"),
M("-x[directory]", "", "strip off text before #!ruby line and perhaps cd to directory"),
- M("--jit", "", "enable MJIT with default options (experimental)"),
- M("--jit-[option]","", "enable MJIT with an option (experimental)"),
+ M("--jit", "", "enable JIT with default options (experimental)"),
+ M("--jit-[option]","", "enable JIT with an option (experimental)"),
M("-h", "", "show this message, --help for more info"),
};
static const struct message help_msg[] = {
@@ -279,14 +279,14 @@ usage(const char *name, int help)
M("did_you_mean", "", "did_you_mean (default: "DEFAULT_RUBYGEMS_ENABLED")"),
M("rubyopt", "", "RUBYOPT environment variable (default: enabled)"),
M("frozen-string-literal", "", "freeze all string literals (default: disabled)"),
- M("jit", "", "MJIT (default: disabled)"),
+ M("jit", "", "JIT compiler (default: disabled)"),
};
static const struct message mjit_options[] = {
- M("--jit-warnings", "", "Enable printing MJIT warnings"),
- M("--jit-debug", "", "Enable MJIT debugging (very slow)"),
+ M("--jit-warnings", "", "Enable printing JIT warnings"),
+ M("--jit-debug", "", "Enable JIT debugging (very slow)"),
M("--jit-wait", "", "Wait until JIT compilation is finished everytime (for testing)"),
- M("--jit-save-temps", "", "Save MJIT temporary files in $TMP or /tmp (for testing)"),
- M("--jit-verbose=num", "", "Print MJIT logs of level num or less to stderr (default: 0)"),
+ M("--jit-save-temps", "", "Save JIT temporary files in $TMP or /tmp (for testing)"),
+ M("--jit-verbose=num", "", "Print JIT logs of level num or less to stderr (default: 0)"),
M("--jit-max-cache=num", "", "Max number of methods to be JIT-ed in a cache (default: 1000)"),
M("--jit-min-calls=num", "", "Number of calls to trigger JIT (for testing, default: 5)"),
};
@@ -308,7 +308,7 @@ usage(const char *name, int help)
puts("Features:");
for (i = 0; i < numberof(features); ++i)
SHOW(features[i]);
- puts("MJIT options (experimental):");
+ puts("JIT options (experimental):");
for (i = 0; i < numberof(mjit_options); ++i)
SHOW(mjit_options[i]);
}