Land #936, fix arm64 builds to not trigger armv4 asm

libressl · Nov 7, 2023 · b845c08 · b845c08
2 parents 7a3d827 + 690b98f
commit b845c08
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -364,7 +364,8 @@ if(ENABLE_ASM)
 	if("${CMAKE_C_COMPILER_ABI}" STREQUAL "ELF")
 		if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "(x86_64|amd64)")
 			set(HOST_ASM_ELF_X86_64 true)
-		elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "arm")
+		elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "arm" AND
+		       NOT "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "arm64")
 			set(HOST_ASM_ELF_ARMV4 true)
 		elseif(CMAKE_SYSTEM_NAME STREQUAL "SunOS" AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i386")
 			set(HOST_ASM_ELF_X86_64 true)