summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-02-12 03:39:18 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-02-12 03:39:18 +0000
commit9dc2d2855ec6196e97e9693c25e9833b7a117284 (patch)
tree9e8de0f046c3dca43e812b7fa294eea55dcd8a52
parent30bcbfd339d0b7176cc00a044d4682a300510ff3 (diff)
no --jit-cc
* ruby.c (setup_mjit_options): removed --jit-cc option, since mjit header is affected by generated config.h which depends on the given compiler, so it cannot work with different compilers. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62379 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--mjit.h12
-rw-r--r--ruby.c18
2 files changed, 0 insertions, 30 deletions
diff --git a/mjit.h b/mjit.h
index 223b8e5d6f..1a9f0ec6c7 100644
--- a/mjit.h
+++ b/mjit.h
@@ -25,21 +25,9 @@ enum rb_mjit_iseq_func {
LAST_JIT_ISEQ_FUNC = 3
};
-/* C compiler used to generate native code. */
-enum rb_mjit_cc {
- /* Not selected */
- MJIT_CC_DEFAULT = 0,
- /* GNU Compiler Collection */
- MJIT_CC_GCC = 1,
- /* LLVM/Clang */
- MJIT_CC_CLANG = 2
-};
-
/* MJIT options which can be defined on the MRI command line. */
struct mjit_options {
char on; /* flag of MJIT usage */
- /* Default: clang for macOS, cl for Windows, gcc for others. */
- enum rb_mjit_cc cc;
/* Save temporary files after MRI finish. The temporary files
include the pre-compiled header, C code file generated for ISEQ,
and the corresponding object file. */
diff --git a/ruby.c b/ruby.c
index 1fd2bd715a..46451bf727 100644
--- a/ruby.c
+++ b/ruby.c
@@ -270,7 +270,6 @@ usage(const char *name, int help)
M("frozen-string-literal", "", "freeze all string literals (default: disabled)"),
};
static const struct message mjit_options[] = {
- M("--jit-cc=cc", "", "C compiler to generate native code (gcc, clang)"),
M("--jit-warnings", "", "Enable printing MJIT warnings"),
M("--jit-debug", "", "Enable MJIT debugging (very slow)"),
M("--jit-wait", "", "Wait until JIT compilation is finished everytime (for testing)"),
@@ -912,28 +911,11 @@ set_option_encoding_once(const char *type, VALUE *name, const char *e, long elen
#define set_source_encoding_once(opt, e, elen) \
set_option_encoding_once("source", &(opt)->src.enc.name, (e), (elen))
-static enum rb_mjit_cc
-parse_mjit_cc(const char *s)
-{
- if (strcmp(s, "gcc") == 0) {
- return MJIT_CC_GCC;
- }
- else if (strcmp(s, "clang") == 0) {
- return MJIT_CC_CLANG;
- }
- else {
- rb_raise(rb_eRuntimeError, "invalid C compiler `%s' (available C compilers: gcc, clang)", s);
- }
-}
-
static void
setup_mjit_options(const char *s, struct mjit_options *mjit_opt)
{
mjit_opt->on = 1;
if (*s == 0) return;
- if (strncmp(s, "-cc=", 4) == 0) {
- mjit_opt->cc = parse_mjit_cc(s + 4);
- }
else if (strcmp(s, "-warnings") == 0) {
mjit_opt->warnings = 1;
}