summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@ruby-lang.org>2023-07-16 11:36:59 +0900
committernagachika <nagachika@ruby-lang.org>2023-07-16 11:36:59 +0900
commiteeb4fc2cf837fd59a70a8f6336674694d15060cd (patch)
tree224a3b45a0eee69df467f822172f571d589ddf41
parent293a00e622da077cd6fad2e4055eb15b081fc2a6 (diff)
merge revision(s) dd7c590f8a4dafbc0d659d07645aea59586b0f70,6a871baa3cd759c0eba361b4937eeca531513a09:
disable yjit when for non-flonum YJIT does not interface with this flag. --- .github/workflows/compilers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Note that YJIT requires FLONUM [ci skip] --- .github/workflows/compilers.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
-rw-r--r--.github/workflows/compilers.yml6
-rw-r--r--version.h2
2 files changed, 6 insertions, 2 deletions
diff --git a/.github/workflows/compilers.yml b/.github/workflows/compilers.yml
index 82171c16a3..221a4b02dd 100644
--- a/.github/workflows/compilers.yml
+++ b/.github/workflows/compilers.yml
@@ -184,7 +184,11 @@ jobs:
# - { name: VM_CHECK_MODE, env: { cppflags: '-DVM_CHECK_MODE' } }
- { name: USE_EMBED_CI=0, env: { cppflags: '-DUSE_EMBED_CI=0' } }
- - { name: USE_FLONUM=0, env: { cppflags: '-DUSE_FLONUM=0' } }
+ - name: USE_FLONUM=0,
+ env:
+ cppflags: '-DUSE_FLONUM=0'
+ # yjit requires FLONUM for the pointer tagging scheme
+ append_configure: '--disable-yjit'
# - { name: USE_GC_MALLOC_OBJ_INFO_DETAILS, env: { cppflags: '-DUSE_GC_MALLOC_OBJ_INFO_DETAILS' } }
- { name: USE_LAZY_LOAD, env: { cppflags: '-DUSE_LAZY_LOAD' } }
# - { name: USE_RINCGC=0, env: { cppflags: '-DUSE_RINCGC=0' } }
diff --git a/version.h b/version.h
index 7a1c331020..e2502db855 100644
--- a/version.h
+++ b/version.h
@@ -11,7 +11,7 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 2
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 63
+#define RUBY_PATCHLEVEL 64
#include "ruby/version.h"
#include "ruby/internal/abi.h"