git: bc6051a060f7 - main - libicp(_rescue)?: use asm versions for all 32-bit arm flavors

From: Dimitry Andric <dim_at_FreeBSD.org>
Date: Wed, 13 Dec 2023 19:00:45 UTC 
The branch main has been updated by dim:

URL: https://cgit.FreeBSD.org/src/commit/?id=bc6051a060f7f39540e284f2934e61411590dbfd

commit bc6051a060f7f39540e284f2934e61411590dbfd
Author:     Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2023-12-13 18:59:31 +0000
Commit:     Dimitry Andric <dim@FreeBSD.org>
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 \