Use Windows/ARM64 in interpreted mode only (II)

Author: FrancescAlted

CMakeLists.txt

@@ -334,7 +334,28 @@ function(miniexpr_setup_target target_name)
     target_link_libraries(${target_name} PRIVATE miniexpr_wasm_libtcc)
   endif()
   if(WIN32 AND CMAKE_C_COMPILER_ID STREQUAL "Clang")
-    target_link_libraries(${target_name} PUBLIC clang_rt.builtins-x86_64.lib)
+    set(_miniexpr_builtins_names)
+    if(CMAKE_VS_PLATFORM_NAME STREQUAL "ARM64"
+       OR CMAKE_SYSTEM_PROCESSOR MATCHES "^(ARM64|AARCH64|arm64|aarch64)$")
+      list(APPEND _miniexpr_builtins_names
+        clang_rt.builtins-aarch64
+        clang_rt.builtins-arm64)
+    elseif(CMAKE_VS_PLATFORM_NAME STREQUAL "x64"
+           OR CMAKE_SYSTEM_PROCESSOR MATCHES "^(AMD64|X86_64|amd64|x86_64)$")
+      list(APPEND _miniexpr_builtins_names clang_rt.builtins-x86_64)
+    endif()
+    if(_miniexpr_builtins_names)
+      unset(_miniexpr_builtins_lib CACHE)
+      find_library(_miniexpr_builtins_lib NAMES ${_miniexpr_builtins_names})
+      if(_miniexpr_builtins_lib)
+        target_link_libraries(${target_name} PUBLIC "${_miniexpr_builtins_lib}")
+      else()
+        message(STATUS
+          "MiniExpr: clang_rt builtins library not found for ${CMAKE_VS_PLATFORM_NAME}; using default toolchain runtime.")
+      endif()
+      unset(_miniexpr_builtins_lib CACHE)
+    endif()
+    unset(_miniexpr_builtins_names)
   endif()
   if(NOT WIN32)
     target_link_libraries(${target_name} PRIVATE m)

src/functions-simd.c

@@ -3801,6 +3801,7 @@ void vec_cos_f32_cached(const float* a, float* out, int n) {
     memcpy(out, cache->cos_buf, (size_t)n * sizeof(float));
 }
 
+#if ME_ENABLE_SLEEF_SIMD && (defined(__x86_64__) || defined(_M_X64) || defined(_M_AMD64))
 static int me_cpu_supports_avx2(void) {
 #if defined(__x86_64__) || defined(_M_X64) || defined(_M_AMD64)
 #if defined(_MSC_VER)
@@ -3847,6 +3848,7 @@ static int me_cpu_supports_avx2(void) {
     return 0;
 #endif
 }
+#endif
 
 #if ME_ENABLE_SLEEF_SIMD && (defined(__aarch64__) || defined(_M_ARM64))
 static int me_cpu_supports_advsimd(void) {