From 341e1d1eb7dde838814a6bc9c8806c26724ec912 Mon Sep 17 00:00:00 2001 From: TL Date: Tue, 15 Oct 2024 13:59:07 +0800 Subject: [PATCH] cr suggestions --- build-scripts/config_common.cmake | 12 ++++++++++-- product-mini/platforms/windows/CMakeLists.txt | 5 ----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/build-scripts/config_common.cmake b/build-scripts/config_common.cmake index 64b5a70442..30d1bcfa47 100644 --- a/build-scripts/config_common.cmake +++ b/build-scripts/config_common.cmake @@ -88,7 +88,10 @@ endif () endif () if (WAMR_BUILD_FAST_JIT EQUAL 1) - if (NOT WAMR_BUILD_LAZY_JIT EQUAL 0) + if (WAMR_BUILD_PLATFORM STREQUAL "windows") + message ("Fast JIT currently not supported on Windows") + set (WAMR_BUILD_FAST_JIT 0) + elseif (NOT WAMR_BUILD_LAZY_JIT EQUAL 0) # Enable Lazy JIT by default set (WAMR_BUILD_LAZY_JIT 1) endif () @@ -274,7 +277,12 @@ if (WAMR_BUILD_LIB_PTHREAD EQUAL 1) message (" Lib pthread enabled") endif () if (WAMR_BUILD_LIB_PTHREAD_SEMAPHORE EQUAL 1) - message (" Lib pthread semaphore enabled") + if (WAMR_BUILD_PLATFORM STREQUAL "windows") + set (WAMR_BUILD_LIB_PTHREAD_SEMAPHORE 0) + message (" Lib pthread semaphore currently not supported on Windows") + else () + message (" Lib pthread semaphore enabled") + endif () endif () if (WAMR_BUILD_LIB_WASI_THREADS EQUAL 1) message (" Lib wasi-threads enabled") diff --git a/product-mini/platforms/windows/CMakeLists.txt b/product-mini/platforms/windows/CMakeLists.txt index ab3256532e..40e925b16a 100644 --- a/product-mini/platforms/windows/CMakeLists.txt +++ b/product-mini/platforms/windows/CMakeLists.txt @@ -47,11 +47,6 @@ if (NOT DEFINED WAMR_BUILD_JIT) set (WAMR_BUILD_JIT 0) endif () -# Disable Fast JIT on Windows for now -set (WAMR_BUILD_FAST_JIT 0) -# Disable Pthreads semaphore on Windows -set (WAMR_BUILD_LIB_PTHREAD_SEMAPHORE 0) - if (NOT DEFINED WAMR_BUILD_LIBC_BUILTIN) # Enable libc builtin support by default set (WAMR_BUILD_LIBC_BUILTIN 1)