From nobody Sun Oct 20 19:33:17 2024 X-Original-To: dev-commits-src-branches@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 4XWpWd6x1bz5ZhLJ; Sun, 20 Oct 2024 19:33:17 +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 4XWpWd691bz4b4w; Sun, 20 Oct 2024 19:33:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729452797; 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=tcr1DDvXmCY0DewunpfZxAbhfduafA3a0oY+Zn4a6J4=; b=cVcjtYf5n30Hfq9bitbX4hIg9ykzCYL+513WaROK1zWpdRR0KUqGmtaOjtZNZhyRoBshDF UhPD0cZXmEi2vwm6N5rB7OUPeR0QRhA02UGMt7K4ax7EurHUI+FTdIGKsKQgh5ulezi2/9 uFn0A+ecl2tJiKGzj3QLlZJjHSprFEdG41LPwX8zW3DixKRyDUNZUDO4bLSxZzDqwAqQqL uLnaGs0YuKqpqDQ4+nHYAqiYKuIVv7begaiJv7K8wUY3sk7+SpYktnAfwpBOeEto3o+m+4 JD40PxguFmOlPU7w3z2KfFSojp2tOeXs7zcZQ3sBieHae3k/HWOcvrO3Lg6wJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729452797; 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=tcr1DDvXmCY0DewunpfZxAbhfduafA3a0oY+Zn4a6J4=; b=g8P/D1XhQgxZvtscIm4vicRrPZ7qkKPNhU1LMvFxmBgOzURamOm5bRPH05NM9hM0Un4ycB s9ybj/r5Qw0pqsdQJ54eWvEJ0n0l7xS4bu9ZMsSfmqtgnAwMtarEccFmEYrg18GYIzjapQ uLWlVQPgYCQc8irsvUJKhuETnxeaayJw46gpiP+BIwDA1T8NC7CWyzreT29VbKQhgQQNDP eqPlhGK2u3pJy9AsT11i05FRt+CbpCFfGLoX+oeqmdLQJknnXy8D70eGa6naNuumyptGQe MS7daHcQjdbwuLI5CjS54b1a6DZvMa9B5jQvZRWeLA+3ByZ7jXMsoWr+yM3M7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729452797; a=rsa-sha256; cv=none; b=AeXOHE/Te4tcfz37aBaTvyRgM/J5RsIfYTJv7AZFIoB7+bowHirvQJvfk2/NvrSobRZXeU btqOVWksIMIWqTYWIdswEJxsKBMRGfpHRlfsOiIQVrptygBlxHvir/5O8R0FpU+W72LBWL HWKEATvdn1xExdhlzbI5m9XuMk5Yl9h9/euakPHCGJ1fAnS4WofXVZedzuM5nkGhP/SeaA cY3I3DceuvD8PesZ+rkdTjbnzKGG098G5Q5CSk55cA/n9jMQvlxDFqRyRqMu8VIjvsybvw ERvcnfWxRQtEG7d9JVM7syjM1vbIVUhKh8qD6csBJAnzYkjsdl64QGYhy3RIaQ== 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 4XWpWd5Y6zz1DdH; Sun, 20 Oct 2024 19:33:17 +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 49KJXHT5073232; Sun, 20 Oct 2024 19:33:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49KJXHun073229; Sun, 20 Oct 2024 19:33:17 GMT (envelope-from git) Date: Sun, 20 Oct 2024 19:33:17 GMT Message-Id: <202410201933.49KJXHun073229@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: 052fe26f9c51 - stable/14 - libicp(_rescue)?: use asm versions for all 32-bit arm flavors List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 052fe26f9c512e1fb0cba3d82611ee2af568e523 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=052fe26f9c512e1fb0cba3d82611ee2af568e523 commit 052fe26f9c512e1fb0cba3d82611ee2af568e523 Author: Dimitry Andric AuthorDate: 2023-12-13 18:59:31 +0000 Commit: Mark Johnston CommitDate: 2024-10-20 19:17:43 +0000 libicp(_rescue)?: use asm versions for all 32-bit arm flavors OpenZFS upstream refactored the asm versions of sha2 to be usable on all 32-bit arm flavors, so it is not necessary to limit this to armv6 and armv7. Suggested by: jhb (cherry picked from commit bc6051a060f7f39540e284f2934e61411590dbfd) --- cddl/lib/libicp/Makefile | 2 +- cddl/lib/libicp_rescue/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cddl/lib/libicp/Makefile b/cddl/lib/libicp/Makefile index 085818f2371a..1dbe4ace88ed 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} == "armv6" || ${MACHINE_ARCH} == "armv7" +.elif ${MACHINE_CPUARCH} == "arm" ASM_SOURCES_C = ASM_SOURCES_AS = \ asm-arm/sha2/sha256-armv7.S \ diff --git a/cddl/lib/libicp_rescue/Makefile b/cddl/lib/libicp_rescue/Makefile index cb2c868e2bc1..196f96b1fcf8 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} == "armv6" || ${MACHINE_ARCH} == "armv7" +.elif ${MACHINE_CPUARCH} == "arm" ASM_SOURCES_C = ASM_SOURCES_AS = \ asm-arm/sha2/sha256-armv7.S \