From nobody Fri May 3 23:49:37 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VWSFs27y3z5JmjT; Fri, 3 May 2024 23:49:37 +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 4VWSFs1hZBz4m96; Fri, 3 May 2024 23:49:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714780177; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2HYb0QQsPL+bwTLeqSJ2nXIZZ+Tluv0Ws07acVibDog=; b=R3NrvLOWW5JTk56WYSov4dUIVi6Okzk26jk3I0Wuig8ii+VvZOHVPdlkxkCW8c8dxSkCAN Sq54XZluhky8eb2ltk2XTFk8MR0Iy3NJIo/hg2ShFVSGinTGb/0A7UoTh7BUpK8lyZyk5h kGDn3dhJOKkIroJ6plNUA0oG/MMrvvTleTk+1P3CbS8l3WsRyG9M3cZB+uDZsNneCNONl/ lvD9FFnL+v6nP4keqL87AUoVcBPv+xzGyBbz8PJQzJQ9NsGP1mCXOzK8c+h8dZAddVYzeg xwuk5pUd5gDf1iXYihgqzNH1iw8vjFt1Pc7UbG3L0pw1+u0QMqEBXOteQna2qg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714780177; a=rsa-sha256; cv=none; b=cqmem6T11MVVohn37deqS5GVFKQUdyrbmJ+8xYZcNZASpHYc36//Vbp0tjHKo0yTBsrW9Y UYVU6Y8D1FsO+3x9sQHqwEeQlL2idWoeGTNb4byvGaVweX8mLY2gTOa91XudvSgQsvpIb4 iJxU8ebUT/nYc5TR3z3hqMzmv01ahEUZmbw9lTIn8JD02zb3rqTvNZKODn6yAwUSZeGl6x yAvede0CeQUwUsyzcvPzPXprLzXxPOOVNlBqFm1ZXBMLcA+J05+4F4luGax7gbBRF2bByN rjkuT01xvd0iKyHyiUs6ZiQlehrGK1kFxEXmCqadZ/X1DHCfjPkDcJSrxUMjkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714780177; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2HYb0QQsPL+bwTLeqSJ2nXIZZ+Tluv0Ws07acVibDog=; b=Om2mLrnWPrauKNu80IVaiBFcx12oFaBoktD9Y2nHG1kcClXcWIqFwSNFlbusPJKeumzrZU cMsp8N7DQIe5oXw7WfDlJPGZXpfCTcRkr++L902PXO5ywlhOchTJfTiepQ9ZE8ldF+HxCP 7n/9WECop4ZU+qvu5JgiF2LW6ZGyeA6qeNwh9565XsED4kX7SRcv+/Tf2hT4TGkV9gs7NO Sad872LT06fhQJ/EJkPPMCSXqa2FL2nBzFHCTZd0pzbtMOitoAnd2o2WdFcBpKrDjDObYf dkXg32hluoVJu88MPdDshrnnXRXK7qOo7SAO3txIiCR71pQ8z81GVjNCfc3UFA== 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 4VWSFs1HT1z15YZ; Fri, 3 May 2024 23:49:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 443Nnb7W068822; Fri, 3 May 2024 23:49:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 443Nnbu1068819; Fri, 3 May 2024 23:49:37 GMT (envelope-from git) Date: Fri, 3 May 2024 23:49:37 GMT Message-Id: <202405032349.443Nnbu1068819@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: 7e10c2d27a53 - stable/14 - zfs: unbreak aarch64 build with non-gcc compilers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org 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/14 X-Git-Reftype: branch X-Git-Commit: 7e10c2d27a538aa3f5afcafe48801a9316e30027 Auto-Submitted: auto-generated The branch stable/14 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=7e10c2d27a538aa3f5afcafe48801a9316e30027 commit 7e10c2d27a538aa3f5afcafe48801a9316e30027 Author: Martin Matuska AuthorDate: 2024-04-16 23:34:25 +0000 Commit: Martin Matuska 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