From nobody Wed May 08 15:25:54 2024 X-Original-To: dev-commits-src-branches@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 4VZJrL2fkkz5JLy0; Wed, 08 May 2024 15:25:54 +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 4VZJrL27Dhz4jPP; Wed, 8 May 2024 15:25:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715181954; 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=lgPAgSmrQ5LmQqAL/wl5wyFy0Lhgr+fxEdElPx4m1uk=; b=JWe7+RX02WJI4ICsHjGKzPsXSbGVinoHMc37GhxHilxxN0aF57RjBHG75AOTQcmsl3VWNx VjbdXZrQJ4VKHVEsW+1wPw00EjtDbO6afynBbAh2shachTPyLeIgpNM4Rod06QWV/heydD ZCoZ/fqTvZ3+WA2c8BGx2C/+EaVygh9zZpZXnEU8waIOdNfMte1ed1sv4zdz0vytV0sx8p JpHFr2QLj1SCnYDPFn7BaA7bUxkvFLjEMGGvThQjt04zsKBoTGCLbwlH+DcHlXKLijjx/H m4GKiUEcyBVgMxBnieyHF4Fl2Jk0epKUmAtWz7g+IyzkKl8R1ckUsb6G335KcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715181954; a=rsa-sha256; cv=none; b=PY4ip3n+H3ulh8u2BF69G3+0Lrka5zey5MBx+PeYxt47hbRfmmBAONHrlP2Ra5+s6fEGo+ sDrOa4Lketly5C4RaMGaW6fHm+LAdaQ1Flk2uuOjE3SSDLVuwaazYECL+6FX3QEuKkCuaH gchkJ2zsB0g0QshVFRZz4it6O1F4Tks0WGUW6U0CcWzkYILzCTCQ7DGxzwykWjiI0YJPKy +1IkkM4X5TnnlORPQ5RCNS8cBhKPYPr889pZY2QHdB5QS/iTD6PSuvQbTCs0mVke4tgVFL xOMrJtMEyu8SCdxnYb29QKKGHgiCKcjg4LFNe33oe5jw6vxAvhDE90umplGyIg== 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=1715181954; 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=lgPAgSmrQ5LmQqAL/wl5wyFy0Lhgr+fxEdElPx4m1uk=; b=kocroqhkEgVmnr1VwtLYR894IA0ta33vRl7AT+/QKKBNXp/Txi3JEhKWOp5+YujD/oay/s iIz4ZQ3iw9SgKb1OLA2XYenWpgpS1Alr/6KajrQZoQqCcOFuYaEbX1ZfnvXJtqcNgpH+TU p79Zu+XnHLjxhYwRZrk0yvI2Oa8QAQA6F10po92Ftai+JgUshKESkCEWt7o36K2biXG+JB UVCDYc0fgCe7QwSkdYYnGA0HeJUOe8EZLpmFrWj9ecB8ITEHuERRJky4IXHiG/ZW8aqX1O fgEpCGxgHRym3kB9c+oRIgwOJT/kFEj8S1VEsxJQq+ROl5f6xEHZTQ8xLHNwmQ== 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 4VZJrL1lKjzWLX; Wed, 8 May 2024 15:25:54 +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 448FPssW016713; Wed, 8 May 2024 15:25:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 448FPs4J016710; Wed, 8 May 2024 15:25:54 GMT (envelope-from git) Date: Wed, 8 May 2024 15:25:54 GMT Message-Id: <202405081525.448FPs4J016710@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: 74b67dbc90c1 - releng/14.1 - zfs: unbreak aarch64 build with non-gcc compilers List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/releng/14.1 X-Git-Reftype: branch X-Git-Commit: 74b67dbc90c10d54f71aedbb7e1a39b14c8af628 Auto-Submitted: auto-generated The branch releng/14.1 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=74b67dbc90c10d54f71aedbb7e1a39b14c8af628 commit 74b67dbc90c10d54f71aedbb7e1a39b14c8af628 Author: Martin Matuska AuthorDate: 2024-04-16 23:34:25 +0000 Commit: Martin Matuska CommitDate: 2024-05-08 15:25:09 +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 Approved by: re (cperciva) (cherry picked from commit b9dee1dca2d74e12e867fd29d2d584fc385078eb) (cherry picked from commit 7e10c2d27a538aa3f5afcafe48801a9316e30027) --- 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