wamr: Use more solid wrapper for armasm64 executable

Signed-off-by: Hiroshi Hatake <[email protected]>

Author: cosmo0920

lib/wasm-micro-runtime-WAMR-2.4.1/core/iwasm/common/iwasm_common.cmake

@@ -6,23 +6,36 @@ set (IWASM_COMMON_DIR ${CMAKE_CURRENT_LIST_DIR})
 include_directories (${IWASM_COMMON_DIR})
 if (MSVC AND WAMR_BUILD_PLATFORM STREQUAL "windows" AND WAMR_BUILD_TARGET MATCHES "AARCH64.*")
   if (DEFINED ENV{VCToolsInstallDir})
+    # Detect host tool dir
+    set(_ARMASM64_CANDIDATES
+        "$ENV{VCToolsInstallDir}/bin/HostX64/ARM64/armasm64.exe"
+        "$ENV{VCToolsInstallDir}/bin/HostARM64/arm64/armasm64.exe")
+    set(_ARMASM64_EXE "")
+    foreach(_p IN LISTS _ARMASM64_CANDIDATES)
+      if (EXISTS "${_p}")
+        set(_ARMASM64_EXE "${_p}")
+        break()
+      endif()
+    endforeach()
+    if (_ARMASM64_EXE STREQUAL "")
+      message(FATAL_ERROR "armasm64.exe not found under VCToolsInstallDir")
+    endif()
+
+    # Wrapper without spaces to avoid quoting hell on NMake/cmd.exe
+    set(_WRAP "${CMAKE_BINARY_DIR}/armasm64_wrapper.bat")
+    file(WRITE "${_WRAP}"
+"@echo off\r\n\"${_ARMASM64_EXE}\" %*\r\n")
+
+    # Use wrapper as compiler (no spaces in path)
     set(CMAKE_ASM_MASM_COMPILER
-        "$ENV{VCToolsInstallDir}/bin/HostARM64/arm64/armasm64.exe"
+        "${_WRAP}"
         CACHE FILEPATH "" FORCE)
+
+    # Quote ONLY object and source (compiler path has no spaces now)
     set(CMAKE_ASM_MASM_COMPILE_OBJECT
-        "<CMAKE_ASM_MASM_COMPILER> /nologo -o <OBJECT> <SOURCE>"
+        "<CMAKE_ASM_MASM_COMPILER> /nologo -o \"<OBJECT>\" \"<SOURCE>\""
         CACHE STRING "" FORCE)
-    set(_WAMR_ARM64_MASM_SOURCES
-        ${IWASM_COMMON_DIR}/arch/invokeNative_armarm64.asm
-        ${IWASM_COMMON_DIR}/arch/invokeNative_armarm64_simd.asm)
-    foreach(_s IN LISTS _WAMR_ARM64_MASM_SOURCES)
-      if (EXISTS "${_s}")
-        set_source_files_properties("${_s}" PROPERTIES
-          LANGUAGE ASM_MASM
-          COMPILE_OPTIONS "/nologo"
-        )
-      endif()
-    endforeach()
+
   else()
     message(FATAL_ERROR "VCToolsInstallDir is not defined. Please run from a Developer Command Prompt or specify armasm64.exe manually.")
   endif()