From nobody Wed Apr 17 04:44:45 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 4VK7cF68lcz5HpsH; Wed, 17 Apr 2024 04:44:45 +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 4VK7cF5dj1z4d3s; Wed, 17 Apr 2024 04:44:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713329085; 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=e/rERu2xHCU7aWxts2xB3GwJmItTyyPghnMkIo4A1oE=; b=k4PRiMtMTNFROTnoLRqmEtZOkESr1jkk7p/44iLU8pZ4JN1GkIWAW+YVB8srUn68YDEify ow/C7aydgE5YUYMaN4wO9RUXOhE2Z8NH23TXF+JdJfB5YQbR8FwNtj1gnLUf6GNy8aVJd6 cE1jMq2hZnunGhVJkhWjCEd0uTAA8VyBDOQgpehkqsAsJsXNFoCt082qlfWADRBhozQ3Vn +NRGG8ldIqnhJEcuxNy1umFyYZYUgWyoF9kOKu3+2gjhpLmBmqW882oTn8m5Djbua0dbD4 hG3MhUO70XpcE5QTauvegrHZYPfrowRPQfQqnE3nCiL+AYKN5tsOaKb8szKyrw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713329085; a=rsa-sha256; cv=none; b=xpFLQrktKFOjsKGrouSqGvsOlZhJMylb98eiMXigKNIH5aZVBH6VUhNyY3mIuzm0fJPLDf UWo747caqt10IPZooQlfsZvFhsNJFjQUpTa0iNkbFQoyVBivC7diQ0yPkm+DWsvJWY5tg4 pPMt6kpNhe4O9FK+M+eiwpkahPAkb7HPODkBUsjeYmsSW3QSq+C3d8xzP0o5n5SLJ+ae1t eY+9YucyHIbp9/C8baYj+UK68ReF4p4HpJIcSS1Mo6+LGy0ZIr0pmQGHSsWpaafkaCuqze CMZODpMb9UG4Jx1SjB3YH+iL0/biltO7hM+X5FjwF3lBK/kEwQoqqjO2F4U4uA== 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=1713329085; 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=e/rERu2xHCU7aWxts2xB3GwJmItTyyPghnMkIo4A1oE=; b=VK+fzrjzgKkXIFgizjPzDLs70MlwmAE/jMZxBJMscmMchIY04ycJFt7xX4IE7jmnJ8ReXh xL+Fu8WXTZuz1T7nh0UcekFAZXkvr6cXbhIA4NBguaScqNnVjvQoKa+zcrGZ8QXxiX+r4R AUeu6TR5rDTJqDQfJpV8PmoNxCI4pYqPG+3ZACSf8k5b34vOWfLVWhYije9uV0L7qtm2HE q4X3YDQsyARaljFNxi7R5NGLq2l4kyJiCFMj89XrL/mTRT+VWypJNsWEhzv/7u6KMbmFKp DQ4/cQ0b2sj5LoO+K5koaHb0MGWyf53J67WacKZ61skmCW8g+5g1UK4NGctMmg== 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 4VK7cF5FKgz1CHQ; Wed, 17 Apr 2024 04:44:45 +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 43H4ijEf004852; Wed, 17 Apr 2024 04:44:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43H4ij25004849; Wed, 17 Apr 2024 04:44:45 GMT (envelope-from git) Date: Wed, 17 Apr 2024 04:44:45 GMT Message-Id: <202404170444.43H4ij25004849@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: b9dee1dca2d7 - main - 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/main X-Git-Reftype: branch X-Git-Commit: b9dee1dca2d74e12e867fd29d2d584fc385078eb Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=b9dee1dca2d74e12e867fd29d2d584fc385078eb commit b9dee1dca2d74e12e867fd29d2d584fc385078eb Author: Martin Matuska AuthorDate: 2024-04-16 23:34:25 +0000 Commit: Martin Matuska CommitDate: 2024-04-17 04:44:12 +0000 zfs: unbreak aarch64 build with non-gcc compilers Workaround until a permanent fix comes from vendor --- 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