From nobody Sun Oct 20 19:33:15 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 4XWpWb4V9dz5ZhG9; Sun, 20 Oct 2024 19:33:15 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XWpWb40lxz4b9M; Sun, 20 Oct 2024 19:33:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729452795; 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=tfUCt6NRNDsGcDz53a1hkKWCbwRhyvVMkCyI8SX0y18=; b=VkCN3OsDzqUDYy3riBxlpTgPrc8BHnfq4uupuMQkXBX2A2149t2YNZgks2NkWD7fAgiD8e pxiGgbpF0uDb/Rcip2uMURkIubYk6SF1LnGJWVi733H/06s4qGfMQOpg3+Kn+n7OtW+pZ+ gqQkYAjzE4Uyf3tjyNccvVJRrfOPAnjYY8sELuCIZnWNnLbtSDZMKQhDrQCwvb3vTVp+Po xtahrHXICP3vmQbCTxbVkON0bR1Okvvpx8P22oxkDapqQKBT3WCzvmq6FpN8WJt7GW2/sV rHLyMNk+NYlVBz0e0HrtOQ/nisEilWUILCrVbuCELGIIxA7JVYPzL9kmy/FYsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729452795; 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=tfUCt6NRNDsGcDz53a1hkKWCbwRhyvVMkCyI8SX0y18=; b=wuHgItlL36kRsunRM6kQ/RjJh9jG/VtJhzeSyGPUS0hnk4xDXjuRE4I6Ky15VakGyycIeb ZbylIfp041mPUG54O/H+krF5HHh41JhB7duusP3q0PDruwSi9MgFC8M3+cIoNYgM7EUJ9b e6jItQz3ROpOBQSqv0PPPOMihGrOZD1EM4p69+DtoFvtyrwCFteUaeBgZ3aAJ9K6SZ5DPq TT49A/dd8f4+VwxhrdbT7BfEbES9ZU702BiTNHJRFTCP5naXA8d8O+xio3Jwg+1NPndvWM HprCqgfoED7y37/Pzdw5BIuPQaFygPNp/IJB44j7G0kuI4MwkraPPQ9ymygTrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729452795; a=rsa-sha256; cv=none; b=aFQOclcfl6RU1jEjR1E2OOHGh6JpXwSpAw9+muv2U8GbkKnFX6rzOUVGKVbEPAs03R09Nf 4zaxhIOF1s+gKTrD564kpFrqh1mEjsXncNOFp6TiK/kC9oGC7skndmz3JuAFGsfBcf67h4 df019BUG2RBICup1KYE5TBFaZznXFEk5e4bSmGaYK61DNFObVCBRTZGDMGwx/lmCsmNVJw Gk3qVmgMzbi26KST3IhHwXFQvh61TMezPIcNpbs3nM4w1FIbLSUz5TKIPHnHh1YyjgnlJ1 06r25KqOvDDICg7wqYv5Hd0/e4e9h0J7nYkT/3UZk5SToUabv/leN/ERjQXFhg== 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 4XWpWb3ZJkz1DvS; Sun, 20 Oct 2024 19:33:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49KJXFEI073122; Sun, 20 Oct 2024 19:33:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49KJXFWH073119; Sun, 20 Oct 2024 19:33:15 GMT (envelope-from git) Date: Sun, 20 Oct 2024 19:33:15 GMT Message-Id: <202410201933.49KJXFWH073119@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 2e4b1bef561d - stable/14 - libicp: unbreak for armv6 after recent OpenZFS import 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2e4b1bef561d6c5b0ffa64ba2e789cbd60b2fa4e Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2e4b1bef561d6c5b0ffa64ba2e789cbd60b2fa4e commit 2e4b1bef561d6c5b0ffa64ba2e789cbd60b2fa4e Author: Dimitry Andric AuthorDate: 2023-12-08 23:09:36 +0000 Commit: Mark Johnston CommitDate: 2024-10-20 19:16:53 +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 (cherry picked from commit fb17dfa0c83cc213400fe7e1ed7a39253a4fcefa) --- 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" ASM_SOURCES_C = ASM_SOURCES_AS = \ asm-arm/sha2/sha256-armv7.S \