From nobody Wed Dec 13 19:00:45 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 4Sr4Z60n3Qz54B0L; Wed, 13 Dec 2023 19:00:46 +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 4Sr4Z60CLBz4QlP; Wed, 13 Dec 2023 19:00:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702494046; 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=KUBSv9PwRM4rjJe5rpa2qw6Bv0J+nEAVpB9i/H3qhSw=; b=Q6MKU2vV990HOoKF0Y332BwVPf52yK0qOBWYx7an6/9kRXEi9tGMpfNnKOmq1eCr3emQox Tit/exvnqJwavXcFdL3tFXER1IhbKmqmr1c2iYq2SRioICTDiE+b9AFfZd2+5kdLg4Gbq9 3OkwEBiJigW7ncgLzzrCICfTHsnWz3A6sTT8ywnl59ApuoFzXDN5lz32tBD7FOegDi5YyQ mJnYsmWHVgNSQd4jHlFSJFKfqXy3zLOy7ZhbkRAY/u5ythQomM8LVXBvJoiztVCogr5YDj HvzWVeoj0qlhzs6YsPa64Dgm2wfgcmuraV0uocGbbgdFW9Xdidin+cc2WBzjKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702494046; a=rsa-sha256; cv=none; b=VZ1CTr674CsEyQh8Pr/DtcYBkJg+N/SkCSlaqwWGlm3zTvXfqKJHXxHirDeZ9IO1a/3sE6 jtpuoMYphkELhoAWsPCapgT3DpgedENGHIJb0EF3gN0i7hvbTli22fSUKrcRKIln4QF8wU 5jyvU6TD+JWmUGDUIYO6F3O1H94g+YY/y4UAPoDZDgZY5MFObIVX4n9F4+60QJwBtD9S8r UwQB/OyLIU+4B+LvaNSpEDlyqxgqrqnNZqxWgiJ2kHkC/GGCaTS/DS0+OYW+aArI1CEErG 6vO4WUSUrAr2c0HwDlLi7Yz/VLtjmkf/C90y4kxxMD4ja6oMv2OyITf5VIXYUw== 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=1702494046; 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=KUBSv9PwRM4rjJe5rpa2qw6Bv0J+nEAVpB9i/H3qhSw=; b=Q/6T7TNJyXsweqKvn4AiXgyFHD4sgA2fYjFhMX3/m4PWW8YulSRlGEY4B1IE+hGpeT8bLl KmEk854VoBn/QuIV3C/DMY0xaKLREXMtZvv+n0xh3kM7nvEmxtVNAXFo1rUeUOOXhoeef1 3Th7QqTXjATjFtyzb9QXYs+4GaslE7uMYaGO8RCY6ryNHihPdXPDXQ0pPtHKv5/B0ySNvb twoLfC+qiBO/ir4L40MGNf+kHQxC0boBvdxLdSAhpS354PhxkEt5HvBnnzLqL3Ybg/NQb7 6MTuZbMRowB+UvYTLJbH20VB8/hkwMw1zKoV4Xs3vQvK8tU1Fb0QZDeLphnSrQ== 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 4Sr4Z56NySz18sG; Wed, 13 Dec 2023 19:00:45 +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 3BDJ0jkq078842; Wed, 13 Dec 2023 19:00:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BDJ0jPP078839; Wed, 13 Dec 2023 19:00:45 GMT (envelope-from git) Date: Wed, 13 Dec 2023 19:00:45 GMT Message-Id: <202312131900.3BDJ0jPP078839@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: bc6051a060f7 - main - libicp(_rescue)?: use asm versions for all 32-bit arm flavors 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: bc6051a060f7f39540e284f2934e61411590dbfd Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=bc6051a060f7f39540e284f2934e61411590dbfd commit bc6051a060f7f39540e284f2934e61411590dbfd Author: Dimitry Andric AuthorDate: 2023-12-13 18:59:31 +0000 Commit: Dimitry Andric CommitDate: 2023-12-13 19:00:35 +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 --- 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 \