From nobody Thu Sep 22 10:04:39 2022 X-Original-To: dev-commits-src-main@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 4MY9qq6kGkz4cxh7; Thu, 22 Sep 2022 10:04:39 +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 4MY9qq4rPsz3mP3; Thu, 22 Sep 2022 10:04:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663841079; 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=Nfi1op+u4SHIPSwu6pZIQhecHbVHAyM7ut2UlWS5l9E=; b=uyMCaXHQ/J6/1aA2Oc76+M+42RfltHJXOgdpl6ND27R2wffO+CW/K3y5bz0GNzMZgQYaQa dLKBawubyZXQl8HwVOp5Ruk9WN+MzvH2hJ1fDQBuCmvd1vXoGWdR4RUHOUS56Uy3QgiNQV WtR7yb22pX/of72y9OmZ/5ArsU686qsrkjXdRR74vxX4m02GNkKYcG0DLTKmbe1v/QPUl9 GcVGvOyod9JV5sxPCBAEyiKOhG6fshDbPzl1BQkadumpFHA+j/hnJlDwW0U3JQ2weBB1hE QT2iI+jrydPpzV/6j2DpFblTwdfheVv57jKxB8eMF/dlm/bY3YcmUnIk1BW4rQ== 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 4MY9qq3f3YzMx6; Thu, 22 Sep 2022 10:04:39 +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 28MA4dCl090742; Thu, 22 Sep 2022 10:04:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28MA4ddc090741; Thu, 22 Sep 2022 10:04:39 GMT (envelope-from git) Date: Thu, 22 Sep 2022 10:04:39 GMT Message-Id: <202209221004.28MA4ddc090741@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: 1761afc50af7 - main - zfs: fix powerpc build broken in c7046f76c2 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 1761afc50af7f2fc6bff0924da0e5b02ec597141 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663841079; 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=Nfi1op+u4SHIPSwu6pZIQhecHbVHAyM7ut2UlWS5l9E=; b=MaFSDX1DXjRzK+VQfp/hdpqQzIkCk/nTXM3kmPdQc+0SqhaSjIgjTxrz16OwKaI0ojjhYv bAl2ijMrpUE3wUFJR8aO3x4eoYsJK1xP3LMwIurBUnR3tjRYucG+FbeI1pMOKN0Nxw39DV qU5ZBBJVCcpkA8Ess/Jx3o/27jrjNbz7+9I6cupxpiD/g9xFpkxG+qXp1q7w4oa/QONM97 +GMmolXKyrGnpE+6IDasx+P4Pg8umcm42Y9KshK/Si7WDfwTnhuWL8ctx+qv7O08lqJ1+2 MCeeXV0WaGQ7YSREm2US0x3yM4fnV5GDJSoJ/kVc7ixRdmwT55AVsJWWDKT8Lw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663841079; a=rsa-sha256; cv=none; b=QRJintlAtci8z45mLTqHjzWuGJ8ILPNPJqQky/2++YDIjlCBwbPqSGlZFhAtDMT7Hl+XdS DB/GCxdT/UZGtwO4/8aMpqSCN+39w+WkPBO2AD61R4A38CImrn3PO1r8Xei39AYFsSFQ91 VWglXDP6ZjintCkqvtJ5yjkCVWJ7y/Spj4s/aHczjPx/n7Gwo6QGgJfHbMkGGiNaYVDUNx 7ybfJcwuHFlZCMHzTnTADyriVbLQkJH3sdeYgW1z50R8cnsEkU1qVuDoWpBdBp1m915Vtp 9r66VXlW7tEqqW7kYjVacogpRpuDpHcVW0Fg+Vzfked1F+AVkvpsDMyFZlb1Og== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=1761afc50af7f2fc6bff0924da0e5b02ec597141 commit 1761afc50af7f2fc6bff0924da0e5b02ec597141 Author: Martin Matuska AuthorDate: 2022-09-22 09:59:31 +0000 Commit: Martin Matuska CommitDate: 2022-09-22 10:04:28 +0000 zfs: fix powerpc build broken in c7046f76c2 The breakage was introduced in OpenZFS commit 48cf170d5. When a (different) fix solving this issue gets upstreamed it will replace the current fix in the next merge from OpenZFS. --- sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_powerpc.h | 3 ++- sys/contrib/openzfs/lib/libspl/include/sys/simd.h | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_powerpc.h b/sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_powerpc.h index b90240580c7a..f101e3192fac 100644 --- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_powerpc.h +++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_powerpc.h @@ -53,7 +53,7 @@ #include #include -#include +#include #define kfpu_allowed() 1 #define kfpu_initialize(tsk) do {} while (0) @@ -88,3 +88,4 @@ zfs_isa207_available(void) { return ((cpu_features2 & PPC_FEATURE2_ARCH_2_07) != 0); } +#endif diff --git a/sys/contrib/openzfs/lib/libspl/include/sys/simd.h b/sys/contrib/openzfs/lib/libspl/include/sys/simd.h index c0099dd7919b..2be5173f317c 100644 --- a/sys/contrib/openzfs/lib/libspl/include/sys/simd.h +++ b/sys/contrib/openzfs/lib/libspl/include/sys/simd.h @@ -453,12 +453,12 @@ zfs_avx512vbmi_available(void) #elif defined(__powerpc__) /* including clashes with AT_UID and others */ -extern unsigned long getauxval(unsigned long type); #if defined(__FreeBSD__) #define AT_HWCAP 25 /* CPU feature flags. */ #define AT_HWCAP2 26 /* CPU feature flags 2. */ extern int elf_aux_info(int aux, void *buf, int buflen); -static unsigned long getauxval(unsigned long key) +static inline unsigned long +getauxval(unsigned long key) { unsigned long val = 0UL; @@ -470,6 +470,7 @@ static unsigned long getauxval(unsigned long key) #elif defined(__linux__) #define AT_HWCAP 16 /* CPU feature flags. */ #define AT_HWCAP2 26 /* CPU feature flags 2. */ +extern unsigned long getauxval(unsigned long type); #endif #define kfpu_allowed() 1