[pfeerick]

Fixes #7660

Problem

The macOS Companion CI job runs on macos-15-arm64 with CMAKE_OSX_ARCHITECTURES=x86_64;arm64. WAMR derives a single WAMR_BUILD_TARGET from CMAKE_SYSTEM_PROCESSOR, so it picks AARCH64 and adds -DBUILD_TARGET_AARCH64 to both slices.

WAMR's assembly is universal-aware (invokeNative_osx_universal.s picks em64 or aarch64 via __aarch64__), but its C side is not. In wasm_runtime_common.c, MAX_REG_INTS is 8 under BUILD_TARGET_AARCH64, so the x86_64 slice packs native-call argv with 8 integer slots. invokeNative_em64.s expects 6 and reads stack args from argv + 64+48. Any host or WASI call that passes arguments on the stack (e.g. path_open, 9 args) gets garbage. The simulator then stalls after edgeTxInit, and a reload shows out of bounds memory access.

Arm64 is unaffected, and local Intel builds work because they aren't universal and detect x86_64.

Fix

For universal macOS builds, override the target define per slice on vmlib with -Xarch_x86_64 / -Xarch_arm64 -U/-D flags. Compile options come after the directory -D definitions on the command line, so the overrides win.

Also: the WAMR win_file.c patch is now idempotent and skipped when already applied (git apply --reverse --check), so repeat configures no longer print a "patch does not apply" error and warning.

Also fixes the v16 simulator link failure introduced by #7496 (getSystemCurrent, getIntModuleCurrent, getExtModuleVoltage, getExtModuleCurrent undefined in the WASM build), by adding zero-value CSD203 stubs to targets/simu/adc_driver.cpp. And adds cmake/FetchWamr.cmake / cmake/wamr-*.patch to the Companion workflow path filters.

Testing

• Local universal build of vmlib on Apple Silicon: the compile line shows the overrides after -DBUILD_TARGET_AARCH64, and libiwasm.a is x86_64 arm64.
• Probe compile with the same flags: x86_64 slice sees only BUILD_TARGET_X86_64, arm64 only BUILD_TARGET_AARCH64. Without the flags, the x86_64 slice has BUILD_TARGET_AARCH64.
• Linux build in the edgetx-dev docker image: unaffected (no -Xarch flags emitted).
• Docker: fresh clone applies the patch once; two further configures print no patch error/warning, source stays patched.
• Docker: FLAVOR=v16 tools/build-wasm-modules.sh now links edgetx-v16-simulator.wasm.
• Run the CI macOS artifact on an Intel Mac and start the Simulator.
• Run the CI macOS artifact on an Apple Silicon Mac and start the Simulator.

🤖 Generated with Claude Code