upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-04 06:15:33 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

libicp: unbreak for armv6 after recent OpenZFS import

Browse source 
The following upstream commit:
727497ccdf module/icp/asm-arm/sha2: enable non-SIMD asm kernels on armv5/6

does indeed enable sha2 asm for earlier arm CPUs, but since libicp's
Makefile was not updated, this leads to:

  ld: error: undefined reference due to --no-allow-shlib-undefined: zfs_sha256_block_armv7

Fix it by compiling sha256-armv7.S and sha512-armv7.S for armv6 too.

Fixes:		3494f7c019
(cherry picked from commit fb17dfa0c8)
This commit is contained in:
Dimitry Andric 2023-12-09 00:09:36 +01:00 committed by Mark Johnston
parent 6bd08ccc9b
commit 2e4b1bef56
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cddl/lib/libicp/Makefile
View file

@ -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} == "armv7"
.elif ${MACHINE_ARCH} == "armv6" || ${MACHINE_ARCH} == "armv7"
ASM_SOURCES_C =
ASM_SOURCES_AS = \
asm-arm/sha2/sha256-armv7.S \