From nobody Tue Dec 12 16:01:42 2023 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 4SqNf06RFxz547Tg; Tue, 12 Dec 2023 16:01:44 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SqNf05FNtz4Z3p; Tue, 12 Dec 2023 16:01:44 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702396904; 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: in-reply-to:in-reply-to:references:references; bh=Q6sSLg13Hi13m3/sUTfOBPIs0R0Xk7Ws+PJ0moneXuM=; b=WLU1GxMk0bdZ6Ugdvq8zKuuZNLhbILeo5uTVA/jFmV9koJC7rzbAEwnGFo3eNLX01HZ+LB md/4DJRexIIbtItJGH1Fp37I0va+dbHE5MvkPAX2jTXWhcYQeILjvUiyXSXM9/nOxzWVLO gYX0lRTEKKTukf8lnxRukRcNVvA1lqhVcY1eboB13rYeyRNR97uW12TDZ7KYCX+E/wgnIu dMp+YzLz1nDKA4QaRCTEVDmCi8na90ZKGdLt+lac9RTPoTG/KnOfpDFtLNRbhgmxzHX80I s1fRySeJISbFv3e2h6QrhLWud2VeO21FRWPiBRsw5R1meqkoAOWNMJWpwSV0Og== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702396904; a=rsa-sha256; cv=none; b=rMlRRtGCBdswK2gqqQ5u0+0gBiO4/RP4tRmOmU8jH0e/puFTdOCroq1xxQtBPaM/vH3dWn QGLZynR9uq9+2JdE355yMVt4WueubSaUnyojN6Rit6oRNH0yZ8KeBZgQSXi5AVPa6souJb YjvtvlAf5xjlIwjaCigJ5c5hMKIcb0hEzqSQWDwbt+zvBUJ1fhfuWWUxFTak+zgBNiNod9 +rQgBIWxWLZ1qCOOD+CnahiinHos+7PlEa+wcQ4qe5dKHMrC/lkjYmyIuWr5jLTf49rwLS 3itq6bHb/qVBMFi4EznEwho8e8epvxO2nRFyreIThREbUIPJIMJrtEOY3NA0LA== 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=1702396904; 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: in-reply-to:in-reply-to:references:references; bh=Q6sSLg13Hi13m3/sUTfOBPIs0R0Xk7Ws+PJ0moneXuM=; b=s3O2M29MFEZcw+CboZ+qpKotnUbWT145os/XUnXomqKd6DtRpO8JGyYNQEp4bWsqv4h2ij /O4bRATUcrECOUjdQ/Qu+smgFvb81qFmd6Tni/reWMtIsdAluevK0Z1KF7rf1WkawnB5Iu KBBO0ui6fblXNu7G83bMY0f0s1BNQvTqE0WKzo7FnkQft8OGvcAly1o9Tf+6G+7xJtpCNH JJC5PegR/0XcO8mkjDTh3pchgcdTbfTqYQS5zfYA8yKdeWkov2UYU8PNUlb70HODhVciWe SD4qG+zOxVUy7T0avTiQM5hqxvWhpRU2TvVHJpGZh6tlJXiXoC5O6EpUJA2i8w== Received: from [IPV6:2601:648:8384:fd00:35e0:5001:6a3c:b8e6] (unknown [IPv6:2601:648:8384:fd00:35e0:5001:6a3c:b8e6]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4SqNf01Hg8zqnd; Tue, 12 Dec 2023 16:01:44 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <098c85ab-4210-455c-a3b9-773bf0ce87b7@FreeBSD.org> Date: Tue, 12 Dec 2023 08:01:42 -0800 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: fb17dfa0c83c - main - libicp: unbreak for armv6 after recent OpenZFS import Content-Language: en-US To: Dimitry Andric , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202312082310.3B8NA5cI026712@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <202312082310.3B8NA5cI026712@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 12/8/23 3:10 PM, Dimitry Andric wrote: > The branch main has been updated by dim: > > URL: https://cgit.FreeBSD.org/src/commit/?id=fb17dfa0c83cc213400fe7e1ed7a39253a4fcefa > > commit fb17dfa0c83cc213400fe7e1ed7a39253a4fcefa > Author: Dimitry Andric > AuthorDate: 2023-12-08 23:09:36 +0000 > Commit: Dimitry Andric > CommitDate: 2023-12-08 23:09:50 +0000 > > libicp: unbreak for armv6 after recent OpenZFS import > > The following upstream commit: > 727497ccdfcc module/icp/asm-arm/sha2: enable non-SIMD asm kernels on armv5/6 > > does indeed enable sha2 asm for earlier arm CPUs, but since libicp's > Makefile was not updated, this leads to: > > ld: error: undefined reference due to --no-allow-shlib-undefined: zfs_sha256_block_armv7 > > Fix it by compiling sha256-armv7.S and sha512-armv7.S for armv6 too. > > Fixes: 3494f7c019fc > --- > cddl/lib/libicp/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/cddl/lib/libicp/Makefile b/cddl/lib/libicp/Makefile > index 2d9bb3c67cb4..085818f2371a 100644 > --- a/cddl/lib/libicp/Makefile > +++ b/cddl/lib/libicp/Makefile > @@ -21,7 +21,7 @@ ASM_SOURCES_AS = \ > asm-x86_64/blake3/blake3_sse41.S > > CFLAGS+= -D__amd64 -D_SYS_STACK_H -UHAVE_AES > -.elif ${MACHINE_ARCH} == "armv7" > +.elif ${MACHINE_ARCH} == "armv6" || ${MACHINE_ARCH} == "armv7" Since this applies to all 32-bit arm flavors, should this be using ${MACHINE_CPUARCH} == "arm" instead? -- John Baldwin