diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2023-12-13 18:59:31 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2023-12-13 19:00:35 +0000 |
| commit | bc6051a060f7f39540e284f2934e61411590dbfd (patch) | |
| tree | b76efe04969b9364672a73a0cf683939955b7ef9 /cddl | |
| parent | fe84281803d62a6846ecab5f5a7c8b4e49b0f0e0 (diff) | |
| download | src-bc6051a060f7f39540e284f2934e61411590dbfd.tar.gz src-bc6051a060f7f39540e284f2934e61411590dbfd.zip | |
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
Diffstat (limited to 'cddl')
| -rw-r--r-- | cddl/lib/libicp/Makefile | 2 | ||||
| -rw-r--r-- | 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 \ |