From 690b98fe39a05eb193a57ca45dbd72a2142a9fb4 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 7 Nov 2023 11:56:33 +0000 Subject: [PATCH] cmake: fix arm64 to not trigger armv4 ASM Reported here: https://github.com/libressl/portable/pull/935#issuecomment-1798345787 --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ec47fe8250..950a79ee17 100644 --- 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)