From owner-dev-commits-src-all@freebsd.org Wed Jun 16 01:59:16 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 49BCC658D2B; Wed, 16 Jun 2021 01:59:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4G4SzS1Mn0z4TSZ; Wed, 16 Jun 2021 01:59:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 13733135E2; Wed, 16 Jun 2021 01:59:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 15G1xFrw046130; Wed, 16 Jun 2021 01:59:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15G1xFBw046129; Wed, 16 Jun 2021 01:59:15 GMT (envelope-from git) Date: Wed, 16 Jun 2021 01:59:15 GMT Message-Id: <202106160159.15G1xFBw046129@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: 014f9aa8218a - stable/13 - zfs: unbreak stable/13 build on i386 after b0c251b0d MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 014f9aa8218a66ef1e412ad37a75b8da5ab9d65e Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jun 2021 01:59:16 -0000 The branch stable/13 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=014f9aa8218a66ef1e412ad37a75b8da5ab9d65e commit 014f9aa8218a66ef1e412ad37a75b8da5ab9d65e Author: Martin Matuska AuthorDate: 2021-06-16 01:47:02 +0000 Commit: Martin Matuska 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