From c97250e9c5015a3fe64e4a57bd328b310e7ad968 Mon Sep 17 00:00:00 2001 From: Koby Kahane Date: Fri, 5 Jan 2024 21:29:48 +0200 Subject: [PATCH 1/2] fix: do not try setting -march on MSVC ARM64 --- cryptopp/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cryptopp/CMakeLists.txt b/cryptopp/CMakeLists.txt index d97d33a..8f09caf 100644 --- a/cryptopp/CMakeLists.txt +++ b/cryptopp/CMakeLists.txt @@ -743,7 +743,7 @@ endif() # Aach32 and Aarch64 ##### # ############################################################################## -if(CRYPTOPP_ARMV8) +if(CRYPTOPP_ARMV8 AND NOT MSVC) check_compile_link_option( "-DCRYPTOPP_ARM_NEON_HEADER=1" CRYPTOPP_ARM_NEON_HEADER "${TEST_PROG_DIR}/test_arm_neon_header.cpp" From b78dbfccb9ecdeb2651f5abfd5bcc4d1cfd127f2 Mon Sep 17 00:00:00 2001 From: Koby Kahane Date: Fri, 5 Jan 2024 21:30:18 +0200 Subject: [PATCH 2/2] fix: detect ARM64EC as an ARM64 target --- cmake/TargetArch.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/TargetArch.cmake b/cmake/TargetArch.cmake index 750e884..69e8f22 100644 --- a/cmake/TargetArch.cmake +++ b/cmake/TargetArch.cmake @@ -10,8 +10,8 @@ set(archdetect_c_code /* ARM family, known revisions: V5, V6, V7, V8 */ -#if defined(__arm__) || defined(__TARGET_ARCH_ARM) || defined(_M_ARM) || defined(_M_ARM64) || defined(__aarch64__) || defined(__ARM64__) -# if defined(__aarch64__) || defined(__ARM64__) || defined(_M_ARM64) +#if defined(__arm__) || defined(__TARGET_ARCH_ARM) || defined(_M_ARM) || defined(_M_ARM64) || defined(_M_ARM64EC) || defined(__aarch64__) || defined(__ARM64__) +# if defined(__aarch64__) || defined(__ARM64__) || defined(_M_ARM64) || defined(_M_ARM64EC) # error cmake_ARCH arm64 # else # error cmake_ARCH arm