summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--version.c34
1 files changed, 8 insertions, 26 deletions
diff --git a/version.c b/version.c
index 0a0bcc01cd..e52242ff86 100644
--- a/version.c
+++ b/version.c
@@ -42,9 +42,7 @@ const char ruby_release_date[] = RUBY_RELEASE_DATE;
const char ruby_platform[] = RUBY_PLATFORM;
const int ruby_patchlevel = RUBY_PATCHLEVEL;
const char ruby_description[] = RUBY_DESCRIPTION_WITH("");
-const char ruby_description_with_ujit[] = RUBY_DESCRIPTION_WITH(" +UJIT");
static const char ruby_description_with_jit[] = RUBY_DESCRIPTION_WITH(" +JIT");
-static const char ruby_description_with_both_jits[] = RUBY_DESCRIPTION_WITH(" +JIT +UJIT");
const char ruby_copyright[] = RUBY_COPYRIGHT;
const char ruby_engine[] = "ruby";
@@ -105,20 +103,10 @@ Init_ruby_description(void)
VALUE description;
if (MJIT_OPTS_ON) {
- if (rb_ujit_enabled_p()) {
- description = MKSTR(description_with_both_jits);
- }
- else {
- description = MKSTR(description_with_jit);
- }
+ description = MKSTR(description_with_jit);
}
else {
- if (rb_ujit_enabled_p()) {
- description = MKSTR(description_with_ujit);
- }
- else {
- description = MKSTR(description);
- }
+ description = MKSTR(description);
}
/*
@@ -131,20 +119,14 @@ void
ruby_show_version(void)
{
if (MJIT_OPTS_ON) {
- if (rb_ujit_enabled_p()) {
- PRINT(description_with_both_jits);
- }
- else {
- PRINT(description_with_jit);
- }
+ PRINT(description_with_jit);
}
else {
- if (rb_ujit_enabled_p()) {
- PRINT(description_with_ujit);
- }
- else {
- PRINT(description);
- }
+ PRINT(description);
+ }
+
+ if (rb_ujit_enabled_p()) {
+ fputs("MicroJIT is on\n", stdout);
}
#ifdef RUBY_LAST_COMMIT_TITLE
fputs("last_commit=" RUBY_LAST_COMMIT_TITLE, stdout);