1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

YJIT: Make sure rustc's target matches before enabling (#6804)

Browse Source 
For people using Rosetta 2 on ARM Macs, it can happen that the
rustc in the PATH compiles for x86_64 while clang is targeting
ARM. We were enabling YJIT in these situations because the test
program compiled fine, but caused linking failure later due to
the architecture mismatch.

Adjust the test program to fail when rustc's target arch is different
from ruby's target arch.

[Bug #19146]
This commit is contained in:
Alan Wu 2022-11-24 14:58:41 -05:00 committed by GitHub
parent 656f25987c
commit a81c89b7c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
Notes: git 2022-11-24 19:59:10 +00:00 
Merged-By: maximecb <maximecb@ruby-lang.org>
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configure.ac
View File

@ -3744,8 +3744,16 @@ AC_CHECK_PROG(RUSTC, [rustc], [rustc], [no]) dnl no ac_tool_prefix
dnl check if rustc is recent enough to build YJIT (rustc >= 1.58.0) dnl check if rustc is recent enough to build YJIT (rustc >= 1.58.0)
YJIT_RUSTC_OK=no YJIT_RUSTC_OK=no
AS_IF([test "$RUSTC" != "no"], AS_IF([test "$RUSTC" != "no"],
AC_MSG_CHECKING([whether ${RUSTC} is new enough for YJIT]) AC_MSG_CHECKING([whether ${RUSTC} works for YJIT])
AS_IF([echo "fn main() { let x = 1; format!(\"{x}\"); }" | $RUSTC - --emit asm=/dev/null 2>/dev/null], YJIT_TARGET_ARCH=
AS_CASE(["$target_cpu"],
[arm64|aarch64], [YJIT_TARGET_ARCH=aarch64],
[x86_64], [YJIT_TARGET_ARCH=x86_64],
)
dnl Fails in case rustc target doesn't match ruby target.
dnl Can happen on Rosetta, for example.
AS_IF([echo "#[cfg(target_arch = \"$YJIT_TARGET_ARCH\")]\n fn main() { let x = 1; format!(\"{x}\"); }" |
$RUSTC - --emit asm=/dev/null 2>/dev/null],
[YJIT_RUSTC_OK=yes] [YJIT_RUSTC_OK=yes]
) )
AC_MSG_RESULT($YJIT_RUSTC_OK) AC_MSG_RESULT($YJIT_RUSTC_OK)