From df5b5bf321d9aa5bb3ee7c3e430ddfca852fde90 Mon Sep 17 00:00:00 2001 From: Christoph Gohlke Date: Sun, 27 Nov 2022 19:46:13 -0500 Subject: [PATCH 1/2] Fix unresolved external symbol __popcnt on win-arm64 (cherry picked from commit 92a7bfc680a6d2cd62c6a40c628e72d77c5af26e) --- vtkm/Math.h.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vtkm/Math.h.in b/vtkm/Math.h.in index 65125c6db..a5bd61837 100644 --- a/vtkm/Math.h.in +++ b/vtkm/Math.h.in @@ -1492,7 +1492,7 @@ vtkm::Int32 CountSetBits(vtkm::UInt32 word) return __builtin_popcount(word); -# elif defined(VTKM_MSVC) +# elif defined(VTKM_MSVC) && !defined(_M_ARM64) return static_cast(__popcnt(word)); @@ -1534,7 +1534,7 @@ vtkm::Int32 CountSetBits(vtkm::UInt64 word) return __builtin_popcountll(word); -# elif defined(VTKM_MSVC) +# elif defined(VTKM_MSVC) && !defined(_M_ARM64) return static_cast(__popcnt64(word)); From 70728978deaa6e40cf98a7437f494d41e79b54e2 Mon Sep 17 00:00:00 2001 From: Christoph Gohlke Date: Sun, 27 Nov 2022 19:51:17 -0500 Subject: [PATCH 2/2] Fix unresolved external symbol __popcnt on win-arm64 (cherry picked from commit 0575e036d9fc0ea2dabb1cba07d2bcd9a5b5f750) --- vtkm/Math.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vtkm/Math.h b/vtkm/Math.h index ed22ace2f..79cfd3709 100644 --- a/vtkm/Math.h +++ b/vtkm/Math.h @@ -2890,7 +2890,7 @@ vtkm::Int32 CountSetBits(vtkm::UInt32 word) return __builtin_popcount(word); -# elif defined(VTKM_MSVC) +# elif defined(VTKM_MSVC) && !defined(_M_ARM64) return static_cast(__popcnt(word)); @@ -2932,7 +2932,7 @@ vtkm::Int32 CountSetBits(vtkm::UInt64 word) return __builtin_popcountll(word); -# elif defined(VTKM_MSVC) +# elif defined(VTKM_MSVC) && !defined(_M_ARM64) return static_cast(__popcnt64(word));