From nobody Fri Dec 8 23:10:05 2023 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 4Sn6L54CHlz53ZVW; Fri, 8 Dec 2023 23:10:05 +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 4Sn6L53jFNz4g3l; Fri, 8 Dec 2023 23:10:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702077005; 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=KXZMbh6T0hc7FOVaHFJ00YbWhrrIZbhH1LkW7aJBe7o=; b=d00H3IwReYld28yhY5JNXAxrB2f4wBLpC/3WIy8NJQYrt7o9YeZva0Zrj3l3TH7CNY83Sw rcZTczWxsS8yX7g1OAuESMjrrw6kui9Z2FUz39Tmxmaw4JzgjdsX+B1fuq6rxxLAgrFU5R sDYKEHCl99hjWZtZ+FzYJhJYg1gsgOQvYwzez2AjblCGgxlOno1uACgDrBiccku3DW0u6E mRMs3opL5BxGDTtGjifNHdDEhRm7LodVnSuAjtrmvKhfW7AKQf+kevcOZX7j2W1bsLL2e6 hXb+4FlA344A8nRLx1gRr6LkY9GvXlxstE8YRMsFtCVn7KHyER5zP4TaT9TbsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702077005; a=rsa-sha256; cv=none; b=DsSBapxlIOrc0LLLfsSTyEKUkhiHNi1NIldYcMMtvCooyQq/qk8IQGScjEW5ubxkjWanMu YRx71ZDfhhrrdJNLXzuqzleHkThvdb4L39MpaqkMgVE9Q8RZNOArfE7c/VdhMjgAgMy1qQ 7OYsR1e47jgw8/Q0y8BcPHrrjWbv1zeHu0CAx0Tv/y+1v+koZ7ERUPV77x5anFFjrKqMru xSoMOXpiZvTgawtbt3i0zbuB1QMxWL77+UGpj3oMrvh+qS6a0pOeO+Xnhk8D5pgnEQrqNH 1UtzhI5M2VdF9mgXxmLogyV2k9wniBhug6RqKvbfqPRBmBsPNJECRCS0/iUNsA== 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=1702077005; 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=KXZMbh6T0hc7FOVaHFJ00YbWhrrIZbhH1LkW7aJBe7o=; b=GaElOR2T2EmX+r2bBYD0LHl6yy2amDSUDYUiTZwEez+LPmC/nHTG+lixFTiMwvA1GDmslo mkHlJg4I4zJlMdomddtMgfatzda3O1imnMHBmXQbYSS5RSV0AaEblp3vg7F5gVSUNcwAz2 o05nk2tm3CwzqtNjrG5oYdkK8zSbT8j06fRG0Np4BlG2HxXiIFaJAJMBLvlAyzXo0hEH5E KnirHxLGozTh+p8V3jgQGi+MKisQg778O9c654nHzTpI+3sFIb3FxTEgfb83y/9yuXzr+J HmnWIPpI3hE0zYrKOZGfb4g11WjgcRaZssAtXlYFOD+l5xvjRkp3cbzZj26psA== 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 4Sn6L52lg4zg1S; Fri, 8 Dec 2023 23:10:05 +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 3B8NA5tO026717; Fri, 8 Dec 2023 23:10:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B8NA5cI026712; Fri, 8 Dec 2023 23:10:05 GMT (envelope-from git) Date: Fri, 8 Dec 2023 23:10:05 GMT Message-Id: <202312082310.3B8NA5cI026712@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: fb17dfa0c83c - main - libicp: unbreak for armv6 after recent OpenZFS import 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fb17dfa0c83cc213400fe7e1ed7a39253a4fcefa Auto-Submitted: auto-generated 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" ASM_SOURCES_C = ASM_SOURCES_AS = \ asm-arm/sha2/sha256-armv7.S \