Skip to content

Fix target detection for Windows ARM64EC #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
abdes merged 2 commits into from
Jan 6, 2024
Merged

Fix target detection for Windows ARM64EC #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c97250e
fix: do not try setting -march on MSVC ARM64
kobykahane Jan 5, 2024
b78dbfc
fix: detect ARM64EC as an ARM64 target
kobykahane Jan 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmake/TargetArch.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cryptopp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down