From nobody Sat Dec 9 11:52:12 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 4SnRFT0f7gz53sr9; Sat, 9 Dec 2023 11:52:13 +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 4SnRFT09Mgz3DB5; Sat, 9 Dec 2023 11:52:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702122733; 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=WlQnxmUrUC1QrFCtk4CbVvdEReJblbWZrL5dh/T4hrA=; b=m2ElHEsEKUdOHPw/D+MpjifPnlBNR+BkgpWHkZ3MNNBsnMnCMwIVM7u5Ez2WKSp9jJDttX c1jHCPO9QtOcnH+QIcX+Sr4EG+dWxLfMKPgwA8zzduqSvCd74bublXl0z5C8tMkbIwwF/7 fJHY7TO1XrSMpqbzzaCimkMlxGjLdTl97jZUylox7Zvj4XvbrX1AUjTsh8k8aJPXVfbPmT Vk9xEXtFjWrP7GQw9usZhFWfDlliIIUDVV8b84aEAmJ5gwvHT6+zE7yigb6Vzi7If2FLvb 90E7JoJXX3KhRcskXyfgzP/vwgcsxxEA3tO4kiBn0jzJLsroU8WTYYo/hhAVXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702122733; a=rsa-sha256; cv=none; b=jOCzY04f5kV4ePaCKBk3Zv8veijuTdBSbgvEadmZq7xFCMM1c7E/pKVrakNMSULXGFWXsF 5aaflsHjvTZidP+EJsYtUOfa0PDuWjoL3ZhxbyxAbrl7SO6GhdFrdYvPlh30VTguXhm34W ZMvCb7ruV3p0/POtghr207y6XQB2XvaXkai7WUzucK9olJBEztl0PKKgwesKU0VFBa91EL 1Lou1VNJqo/krBvCg1fkEsZmrCpG8yed+Hkojv8s1qbYbsqpNM5ZbhaHQYZEF/zm9wfJsy Yv/ZydAD7232PKZBOZqFPxIb3HBgFtrRZKMr8vuVZuVvXNIvVY8HvWiKQA7obQ== 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=1702122733; 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=WlQnxmUrUC1QrFCtk4CbVvdEReJblbWZrL5dh/T4hrA=; b=k4uOHdO3LZGYlj7J47KYN86qw/d4XH2aJhMN6r82Ec/eAdDVH20xoj4vaakje+aF3Qvdu4 9lIiNTX9UlLK657KI9eSbCLzZuN7qzJlgaPTyTT/faBGlZtOm1u7YJxvaoAXF1UkH10ymk sv/8HTnKixqWmE3r58R38qj1jxjgVjIyKEs/32j+QjS2H5O1ggNhkGXoWmBMW0izh8eZB+ 1TJYaR/BvXRRx4af5XA+MRKtHdZG18x8/whzyQ0TzMzqE3dj+JkQaz2z1MMbIb7kZs66S+ mpykvVJ5sP2EVBwuUxVjSa6pWKwrF2EbAXVuOfJ+Ur6arVMuwVtquPihJjffUg== 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 4SnRFS6LVMz13lW; Sat, 9 Dec 2023 11:52:12 +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 3B9BqCuI012817; Sat, 9 Dec 2023 11:52:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B9BqCjR012814; Sat, 9 Dec 2023 11:52:12 GMT (envelope-from git) Date: Sat, 9 Dec 2023 11:52:12 GMT Message-Id: <202312091152.3B9BqCjR012814@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: 1a4a9a50574d - main - libicp_rescue: 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: 1a4a9a50574d9b4b4db90a85bc253d340c93a8a0 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=1a4a9a50574d9b4b4db90a85bc253d340c93a8a0 commit 1a4a9a50574d9b4b4db90a85bc253d340c93a8a0 Author: Dimitry Andric AuthorDate: 2023-12-09 11:51:50 +0000 Commit: Dimitry Andric CommitDate: 2023-12-09 11:51:50 +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 --- 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 \