git: 7e10c2d27a53 - stable/14 - zfs: unbreak aarch64 build with non-gcc compilers
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 03 May 2024 23:49:37 UTC
The branch stable/14 has been updated by mm:
URL: https://cgit.FreeBSD.org/src/commit/?id=7e10c2d27a538aa3f5afcafe48801a9316e30027
commit 7e10c2d27a538aa3f5afcafe48801a9316e30027
Author: Martin Matuska <mm@FreeBSD.org>
AuthorDate: 2024-04-16 23:34:25 +0000
Commit: Martin Matuska <mm@FreeBSD.org>
CommitDate: 2024-05-03 23:49:05 +0000
zfs: unbreak aarch64 build with non-gcc compilers
Vendor did not backport this fix into zfs-2.2-release yet.
OpenZFS PR: #16103 35bf25848 Fix: FreeBSD Arm64 does not build currently
(cherry picked from commit b9dee1dca2d74e12e867fd29d2d584fc385078eb)
---
sys/contrib/openzfs/module/icp/asm-aarch64/blake3/b3_aarch64_sse2.S | 4 ++--
sys/contrib/openzfs/module/icp/asm-aarch64/blake3/b3_aarch64_sse41.S | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys/contrib/openzfs/module/icp/asm-aarch64/blake3/b3_aarch64_sse2.S b/sys/contrib/openzfs/module/icp/asm-aarch64/blake3/b3_aarch64_sse2.S
index e66bb4bc7f26..b0af629066ea 100644
--- a/sys/contrib/openzfs/module/icp/asm-aarch64/blake3/b3_aarch64_sse2.S
+++ b/sys/contrib/openzfs/module/icp/asm-aarch64/blake3/b3_aarch64_sse2.S
@@ -34,7 +34,7 @@
#if defined(__aarch64__)
/* make gcc <= 9 happy */
-#if LD_VERSION >= 233010000
+#if !defined(LD_VERSION) || LD_VERSION >= 233010000
#define CFI_NEGATE_RA_STATE .cfi_negate_ra_state
#else
#define CFI_NEGATE_RA_STATE
@@ -2066,4 +2066,4 @@ zfs_blake3_hash_many_sse2:
.size zfs_blake3_hash_many_sse2, .Lfunc_end3-zfs_blake3_hash_many_sse2
.cfi_endproc
.section ".note.GNU-stack","",@progbits
-#endif
\ No newline at end of file
+#endif
diff --git a/sys/contrib/openzfs/module/icp/asm-aarch64/blake3/b3_aarch64_sse41.S b/sys/contrib/openzfs/module/icp/asm-aarch64/blake3/b3_aarch64_sse41.S
index b9fb28dfcf03..0b719761dd4c 100644
--- a/sys/contrib/openzfs/module/icp/asm-aarch64/blake3/b3_aarch64_sse41.S
+++ b/sys/contrib/openzfs/module/icp/asm-aarch64/blake3/b3_aarch64_sse41.S
@@ -34,7 +34,7 @@
#if defined(__aarch64__)
/* make gcc <= 9 happy */
-#if LD_VERSION >= 233010000
+#if !defined(LD_VERSION) || LD_VERSION >= 233010000
#define CFI_NEGATE_RA_STATE .cfi_negate_ra_state
#else
#define CFI_NEGATE_RA_STATE
@@ -2403,4 +2403,4 @@ zfs_blake3_hash_many_sse41:
.size zfs_blake3_hash_many_sse41, .Lfunc_end3-zfs_blake3_hash_many_sse41
.cfi_endproc
.section ".note.GNU-stack","",@progbits
-#endif
\ No newline at end of file
+#endif