kotovalexarian-likes-github
/
ruby--ruby
mirror of https://github.com/ruby/ruby.git
1
0
Fork 0
Code Releases Activity

YJIT: improve/fix code to automatically build YJIT when available (#6684) 

* YJIT: improve/fix code to automatically build YJIT when available

* Set YJIT_SUPPORT=no

* Fix rustc => $RUSTC
This commit is contained in:
Maxime Chevalier-Boisvert 2022-11-08 11:57:11 -05:00 committed by GitHub
parent eacedcfe44
commit 3703a81491
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
Notes: git 2022-11-08 16:57:42 +00:00 
Merged-By: maximecb <maximecb@ruby-lang.org>
1 changed files with 29 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
configure.ac
View File

@ -3735,29 +3735,32 @@ AC_SUBST(MJIT_SUPPORT)
AC_CHECK_PROG(RUSTC, [rustc], [rustc], [no]) dnl no ac_tool_prefix
dnl check if we can build YJIT on this target platform
AS_CASE(["$target_cpu"],
[arm64|aarch64], [
YJIT_TARGET=aarch64
],
[x86_64], [
YJIT_TARGET="$target_cpu"
],
[YJIT_TARGET=]
dnl check if rustc is recent enough to build YJIT (rustc >= 1.58.0)
YJIT_RUSTC_OK=no
AS_IF([test "$RUSTC" != "no"],
AS_IF([echo "fn main() { let x = 1; format!(\"{x}\"); }" | $RUSTC - --emit asm=/dev/null],
[YJIT_RUSTC_OK=yes]
)
)
AS_CASE(["$YJIT_TARGET:$target_os"],
[:*], [ # unsupported CPU
],
[darwin*], [
YJIT_TARGET=${YJIT_TARGET}-apple-darwin
],
[linux-android], [ # no target_vendor
YJIT_TARGET=${YJIT_TARGET}-${target_os}
],
[*linux*], [
YJIT_TARGET=${YJIT_TARGET}-${target_vendor}-${target_os}
],
[YJIT_TARGET=]
dnl check if we can build YJIT on this target platform
dnl we can't easily cross-compile with rustc so we don't support that
YJIT_TARGET_OK=no
AS_IF([test "$cross_compiling" = no],
AS_CASE(["$target_cpu-$target_os"],
[*android*], [
YJIT_TARGET_OK=no
],
[arm64-darwin*|aarch64-darwin*|x86_64-darwin*], [
YJIT_TARGET_OK=yes
],
[arm64-*linux*|aarch64-*linux*|x86_64-*linux*], [
YJIT_TARGET_OK=yes
],
[arm64-*bsd*|aarch64-*bsd*|x86_64-*bsd*], [
YJIT_TARGET_OK=yes
]
)
)
dnl build YJIT in release mode if rustc >= 1.58.0 is present and we are on a supported platform
@ -3765,18 +3768,11 @@ AC_ARG_ENABLE(yjit,
AS_HELP_STRING([--enable-yjit],
[enable experimental in-process JIT compiler that requires Rust build tools [default=no]]),
[YJIT_SUPPORT=$enableval],
[AS_CASE(["$enable_jit_support:$YJIT_TARGET:$RUSTC"],
[no:*|yes::*|yes:*:no], [
YJIT_SUPPORT=no
[AS_CASE(["$enable_jit_support:$YJIT_TARGET_OK:$YJIT_RUSTC_OK"],
[yes:yes:yes|:yes:yes], [
YJIT_SUPPORT=yes
],
[yes:yes:*], [
AS_IF([ echo "fn main() { let x = 1; format!(\"{x}\"); }" | $RUSTC - --target=$YJIT_TARGET --emit asm=/dev/null ],
[YJIT_SUPPORT=yes],
[YJIT_SUPPORT=no]
)
], [
[YJIT_SUPPORT=no]
]
[YJIT_SUPPORT=no]
)]
)