c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-04-17 00:45:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix check for .cfi_negate_ra_state on aarch64

Browse Source 
Checking for LD_VERSION in unreliable as not all distros define it on
the compiler's preprocessor.

Explicitly check it via autoconf.

This fixes support for Ubuntu 18.04 on arm64.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Juhyung Park <qkrwngud825@gmail.com>
Closes #18262
This commit is contained in:
Juhyung Park 2026-03-07 04:04:37 +09:00 committed by GitHub
parent e73ada771d
commit c58b8b7dc2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 38 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
config/toolchain-cfi.m4 Normal file
View File

@ -0,0 +1,33 @@
dnl # SPDX-License-Identifier: CDDL-1.0
dnl #
dnl # Check whether assembler supports .cfi_negate_ra_state on AArch64.
dnl #
AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_TOOLCHAIN_CFI_PSEUDO_OP], [
case "$host_cpu" in
aarch64*)
AC_CACHE_CHECK([whether assembler supports .cfi_negate_ra_state],
[zfs_cv_as_cfi_pseudo_op], [
cat > conftest.S <<_ACEOF
.text
conftest:
.cfi_startproc
.cfi_negate_ra_state
ret
.cfi_endproc
_ACEOF
if AC_TRY_COMMAND([$CC -c $CFLAGS $CPPFLAGS conftest.S -o conftest.o]) >/dev/null 2>&1; then
zfs_cv_as_cfi_pseudo_op=yes
else
zfs_cv_as_cfi_pseudo_op=no
fi
rm -f conftest.S conftest.o
])
AS_IF([test "x$zfs_cv_as_cfi_pseudo_op" = xyes], [
AC_DEFINE([HAVE_AS_CFI_PSEUDO_OP], 1,
[Define if your assembler supports .cfi_negate_ra_state.])
])
;;
esac
])

1
config/zfs-build.m4
View File

@ -266,6 +266,7 @@ AC_DEFUN([ZFS_AC_CONFIG_ALWAYS], [
ZFS_AC_CONFIG_ALWAYS_CC_ASAN ZFS_AC_CONFIG_ALWAYS_CC_ASAN
ZFS_AC_CONFIG_ALWAYS_CC_UBSAN ZFS_AC_CONFIG_ALWAYS_CC_UBSAN
ZFS_AC_TOOLCHAIN_SIMD ZFS_AC_TOOLCHAIN_SIMD
ZFS_AC_CONFIG_ALWAYS_TOOLCHAIN_CFI_PSEUDO_OP
ZFS_AC_CONFIG_ALWAYS_SYSTEM ZFS_AC_CONFIG_ALWAYS_SYSTEM
ZFS_AC_CONFIG_ALWAYS_ARCH ZFS_AC_CONFIG_ALWAYS_ARCH
ZFS_AC_CONFIG_CHECK_ARCH_VAR ZFS_AC_CONFIG_CHECK_ARCH_VAR

4
module/icp/asm-aarch64/blake3/b3_aarch64_sse2.S
View File

@ -34,8 +34,8 @@
#if defined(__aarch64__) #if defined(__aarch64__)
/* make gcc <= 9 happy */ /* check for .cfi_negate_ra_state assembler support */
#if !defined(LD_VERSION) || LD_VERSION >= 233010000 #if defined(HAVE_AS_CFI_PSEUDO_OP)
#define CFI_NEGATE_RA_STATE .cfi_negate_ra_state #define CFI_NEGATE_RA_STATE .cfi_negate_ra_state
#else #else
#define CFI_NEGATE_RA_STATE #define CFI_NEGATE_RA_STATE

4
module/icp/asm-aarch64/blake3/b3_aarch64_sse41.S
View File

@ -34,8 +34,8 @@
#if defined(__aarch64__) #if defined(__aarch64__)
/* make gcc <= 9 happy */ /* check for .cfi_negate_ra_state assembler support */
#if !defined(LD_VERSION) || LD_VERSION >= 233010000 #if defined(HAVE_AS_CFI_PSEUDO_OP)
#define CFI_NEGATE_RA_STATE .cfi_negate_ra_state #define CFI_NEGATE_RA_STATE .cfi_negate_ra_state
#else #else
#define CFI_NEGATE_RA_STATE #define CFI_NEGATE_RA_STATE