From nobody Sun Oct 20 19:33:16 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 4XWpWc5LGjz5ZhGF; Sun, 20 Oct 2024 19:33:16 +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 4XWpWc4c0lz4Zm4; Sun, 20 Oct 2024 19:33:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729452796; 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=nkJzM8OPp7vr/V2RvbWT2kTQJyNnGRx5tz8yFpDQyyY=; b=iMrichC4Ny/jt8oXxCbg+OMOcQU9pv787rluvzZS+D88TdbC5dXWm8K9YTaTnHo4RyRmkx Ml1aHyVmeCX22uFOxVo8C8SFKtNKgEfZMHfcHA1Pv0TPzk5omLqp7G434EeWKDgsKXIxb+ CI/eDO64cGTv3fm8XGdDDRPgPxlcI6anFEf3jk+9BqX50goW9fxqmTUlq1tbF3qO/fwe8M 1EWWPyzt40/54yHVXJtLlmzlsZSsxvYapdnafblKTm6s5nNDF9jyxR9l+e/8oJ9GE9vKmE XQXWAmlLri4SLoqh7ZeDXh6+FPV+qtZaQFu/Vyzp7/ruuhLShLgcZIUIqub2Gw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729452796; 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=nkJzM8OPp7vr/V2RvbWT2kTQJyNnGRx5tz8yFpDQyyY=; b=aLj9xnzQ7hTHXwuxGfd2vmzZUO1a/5xhudNhqF3+lb2HIs2bRFuu+ZY5BhqrUN+sBYhTHf htHyweSYMCbvmUa62h44hM7z3uZD8r2FR2CbxQiUiYg2Cx38AnOnD0H4Rv9w6wSEwUvPEu tJBMwxtOdezceXjfkkCT3wi/WKoTFUilLk3rYQw9jNRejPA9KQrf7rSQZJwpf+5uRlOZNG RBGjgbdx5R52RES19wLe1Je+ktWqjc5KPo/OlXd0nuWKjgmuUBi4tY1an80ZNTf6YY4Jv6 uh+fsM3YctWrJUe42sd7P2U/rCOZl6YUnNLMX8gnadKY38TCG6v2fRhfOlXMSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729452796; a=rsa-sha256; cv=none; b=pBo2vemkaueyEai0QCK/cODVq17OMriNYJUbE8t874nvwqkW1uzYyk0GjEeJM7XtV+cgmJ BuZwjp0XsT4S312h2Ym4OQ5Gk77Z+ZUqK6w3ufNAAK6qPZZMAqUq9yh7TMxcAZoYR6qv3c AKFZQEtY5Qgo/n/W/Zd5zZ7jGR+4fjVHH0ZBg5mNB/aPFIafpYRdY4X3snyZDDcE7U5375 Ur0Gpllq62jxE8vI/mAz0K8uaiG/LSpYvlOZ9AXoZqkJ/AUsQkXOgy6GyRC2aMUzTDEKTs YDppk5sl6C/dXDObvLVzvZFsBYZuJRc8ONSGHlWgHrmlHdPHHqGU78+AXRqwYA== 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 4XWpWc4CnTz1CyL; Sun, 20 Oct 2024 19:33:16 +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 49KJXG8N073178; Sun, 20 Oct 2024 19:33:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49KJXGJu073175; Sun, 20 Oct 2024 19:33:16 GMT (envelope-from git) Date: Sun, 20 Oct 2024 19:33:16 GMT Message-Id: <202410201933.49KJXGJu073175@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: 3176b94a480b - stable/14 - libicp_rescue: 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: 3176b94a480bd51eab2fc20a7051ff6b515f5d74 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3176b94a480bd51eab2fc20a7051ff6b515f5d74 commit 3176b94a480bd51eab2fc20a7051ff6b515f5d74 Author: Dimitry Andric AuthorDate: 2023-12-09 11:51:50 +0000 Commit: Mark Johnston CommitDate: 2024-10-20 19:17:38 +0000 libicp_rescue: unbreak for armv6 after recent OpenZFS import Similar to fb17dfa0c83c, fix libicp_rescue to include asm versions of sha2 on armv6, to unbreak the build of rescue. Fixes: 3494f7c019fc (cherry picked from commit 1a4a9a50574d9b4b4db90a85bc253d340c93a8a0) --- cddl/lib/libicp_rescue/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cddl/lib/libicp_rescue/Makefile b/cddl/lib/libicp_rescue/Makefile index e129a2f3e0f9..cb2c868e2bc1 100644 --- a/cddl/lib/libicp_rescue/Makefile +++ b/cddl/lib/libicp_rescue/Makefile @@ -20,7 +20,7 @@ ASM_SOURCES_AS = \ asm-x86_64/blake3/blake3_sse41.S CFLAGS+= -D__amd64 -D_SYS_STACK_H -.elif ${MACHINE_ARCH} == "armv7" +.elif ${MACHINE_ARCH} == "armv6" || ${MACHINE_ARCH} == "armv7" ASM_SOURCES_C = ASM_SOURCES_AS = \ asm-arm/sha2/sha256-armv7.S \