mirror of
https://github.com/veracrypt/VeraCrypt.git
synced 2026-10-21 22:02:37 +00:00
Fix FreeBSD ARM builds selecting x86 SIMD helpers
Select plain SHA, BLAKE2s and Argon2 helpers for non-x86 targets when SIMD_SUPPORTED is zero. Preserve flagged helpers for x86 NOSSE2 builds and the x86 slice of macOS universal builds, keeping SHA compilation and BLAKE2s linking valid. Normal and NOASM console tests passed on FreeBSD 15 amd64 and Linux x64. Checked 19 object-selection configurations and targeted Clang compilation/linking with SHA-256 and BLAKE2s vectors on Linux. ARM coverage is limited to makefile checks. Fixes #1934
This commit is contained in:
@@ -95,7 +95,9 @@ else
|
||||
OBJS += ../Crypto/Aescrypt.o
|
||||
endif
|
||||
|
||||
ifeq "$(PLATFORM):$(LOCAL_DEVELOPMENT_BUILD):$(CPU_ARCH)" "MacOSX:true:arm64"
|
||||
# Keep flagged helpers for x86 NOSSE2 builds; SIMD_SUPPORTED also covers
|
||||
# the x86 slice of macOS universal builds on ARM hosts.
|
||||
ifeq "$(filter x86 x64,$(CPU_ARCH)):$(SIMD_SUPPORTED)" ":0"
|
||||
OBJS += ../Crypto/blake2s_SSE41.o
|
||||
OBJS += ../Crypto/blake2s_SSSE3.o
|
||||
OBJS += ../Crypto/Sha2Intel.o
|
||||
|
||||
Reference in New Issue
Block a user