The branch stable/13 has been updated by mm:
URL:
https://cgit.FreeBSD.org/src/commit/?id=014f9aa8218a66ef1e412ad37a75b8da5ab9d65e
commit 014f9aa8218a66ef1e412ad37a75b8da5ab9d65e
Author: Martin Matuska <m...@freebsd.org>
AuthorDate: 2021-06-16 01:47:02 +0000
Commit: Martin Matuska <m...@freebsd.org>
CommitDate: 2021-06-16 01:56:19 +0000
zfs: unbreak stable/13 build on i386 after b0c251b0d
The build was broken because upstream merged e76373de7 (author: mav)
without fef8bd41f from openzfs/zfs/master into openzfs/zfs/zfs-2.1-release.
Temporary fix until upstream decides a way to solve this problem.
Patch by: mav
Differential Revision: https://reviews.freebsd.org/D30783
(direct commit)
---
sys/contrib/openzfs/lib/libspl/asm-i386/atomic.S | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/sys/contrib/openzfs/lib/libspl/asm-i386/atomic.S
b/sys/contrib/openzfs/lib/libspl/asm-i386/atomic.S
index 7a574b0d1729..c8a6c78b5fa8 100644
--- a/sys/contrib/openzfs/lib/libspl/asm-i386/atomic.S
+++ b/sys/contrib/openzfs/lib/libspl/asm-i386/atomic.S
@@ -762,6 +762,7 @@
SET_SIZE(atomic_swap_32)
ENTRY(atomic_swap_64)
+ ALTENTRY(atomic_store_64)
pushl %esi
pushl %ebx
movl 12(%esp), %esi
@@ -776,8 +777,20 @@
popl %ebx
popl %esi
ret
+ SET_SIZE(atomic_store_64)
SET_SIZE(atomic_swap_64)
+ ENTRY(atomic_load_64)
+ pushl %esi
+ movl 8(%esp), %esi
+ movl %ebx, %eax
+ movl %ecx, %edx
+ lock
+ cmpxchg8b (%esi)
+ popl %esi
+ ret
+ SET_SIZE(atomic_load_64)
+
ENTRY(atomic_set_long_excl)
movl 4(%esp), %edx
movl 8(%esp), %ecx
_______________________________________________
dev-commits-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all
To unsubscribe, send any mail to "dev-commits-src-all-unsubscr...@freebsd.org"
