Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

wasm-micro-runtime: add latest version (2.2.0) #6283

Open
wants to merge 5 commits into
base: dev
Choose a base branch
from
+81 −0
Open

wasm-micro-runtime: add latest version (2.2.0) #6283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ed9553c
wasm-micro-runtime: add latest version (2.2.0)
ethindp Feb 4, 2025
dedb2cb
Pad operators to conform with coding style
ethindp Feb 4, 2025
ab1045e
Add patches to fix build failures on windows
ethindp Feb 6, 2025
5592329
Another attempt to fix build failures (only applying 2.2.0 patches fo…
ethindp Feb 8, 2025
6956e1c
Disable windows-x86 package due to build failures
ethindp Feb 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 67 additions & 0 deletions packages/w/wasm-micro-runtime/patches/2.2.0/8c2759c9d62a4e3203b4c7d210640cf2d031c388.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
diff --git a/core/shared/platform/windows/win_clock.c b/core/shared/platform/windows/win_clock.c
index c402330aad..1d618c8b67 100644
--- a/core/shared/platform/windows/win_clock.c
+++ b/core/shared/platform/windows/win_clock.c
@@ -11,9 +11,19 @@
#define NANOSECONDS_PER_TICK 100

#if WINAPI_PARTITION_DESKTOP
-extern NTSTATUS
-NtQueryTimerResolution(PULONG MinimumResolution, PULONG MaximumResolution,
- PULONG CurrentResolution);
+#ifndef __kernel_entry
+#define __kernel_entry
+#endif
+#ifndef NTAPI
+#define NTAPI
+#endif
+#ifndef _Out_
+#define _Out_
+#endif
+extern __kernel_entry NTSTATUS NTAPI
+NtQueryTimerResolution(_Out_ PULONG MinimumResolution,
+ _Out_ PULONG MaximumResolution,
+ _Out_ PULONG CurrentResolution);
#endif

static __wasi_errno_t
diff --git a/core/shared/platform/windows/win_thread.c b/core/shared/platform/windows/win_thread.c
index 438e160405..1f6a57ebbf 100644
--- a/core/shared/platform/windows/win_thread.c
+++ b/core/shared/platform/windows/win_thread.c
@@ -60,6 +60,17 @@ static DWORD thread_data_key;
static void(WINAPI *GetCurrentThreadStackLimits_Kernel32)(PULONG_PTR,
PULONG_PTR) = NULL;

+int
+os_sem_init(korp_sem *sem);
+int
+os_sem_destroy(korp_sem *sem);
+int
+os_sem_wait(korp_sem *sem);
+int
+os_sem_reltimed_wait(korp_sem *sem, uint64 useconds);
+int
+os_sem_signal(korp_sem *sem);
+
static void
thread_data_list_add(os_thread_data *thread_data)
{
@@ -117,17 +128,6 @@ thread_data_list_lookup(korp_tid tid)
return NULL;
}

-int
-os_sem_init(korp_sem *sem);
-int
-os_sem_destroy(korp_sem *sem);
-int
-os_sem_wait(korp_sem *sem);
-int
-os_sem_reltimed_wait(korp_sem *sem, uint64 useconds);
-int
-os_sem_signal(korp_sem *sem);
-
int
os_thread_sys_init()
{
14 changes: 14 additions & 0 deletions packages/w/wasm-micro-runtime/xmake.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,14 @@ package("wasm-micro-runtime")
add_urls("https://github.com/bytecodealliance/wasm-micro-runtime/archive/refs/tags/WAMR-$(version).tar.gz", {excludes = {"*/language-bindings/python/LICENSE"}})
add_urls("https://github.com/bytecodealliance/wasm-micro-runtime.git")

add_versions("2.2.0", "93b6ba03f681e061967106046b1908631ee705312b9a6410f3baee7af7c6aac9")
add_versions("1.3.2", "58961ba387ed66ace2dd903597f1670a42b8154a409757ae6f06f43fe867a98c")
add_versions("1.2.3", "85057f788630dc1b8c371f5443cc192627175003a8ea63c491beaff29a338346")

add_patches("1.3.2", path.join(os.scriptdir(), "patches", "1.3.2", "cmake.patch"), "cf0e992bdf3fe03f7dc03624fd757444291a5286b1ceef6532bbf3f9567f394b")
if is_plat("windows") then
add_patches("2.2.0", path.join(os.scriptdir(), "patches", "2.2.0", "8c2759c9d62a4e3203b4c7d210640cf2d031c388.patch"), "c13ce6f24922d6cb7f0f424f68d1a789b34d1e85273e6b2c420a9a11995fcf89")
end
add_patches("1.2.3", path.join(os.scriptdir(), "patches", "1.2.3", "cmake.patch"), "97d99509997b86d24a84cd1b2eca0d4dace7b460d5cb85bc23881d02e7ef08ed")

add_patches("1.3.2", path.join(os.scriptdir(), "patches", "libc_uvwasi.patch"), "e83ff42588cc112588c7fde48a1bd9df7ffa8fa41f70dd99af5d6b0325ce46f7")
Expand Down Expand Up @@ -39,6 +43,16 @@ package("wasm-micro-runtime")

add_deps("cmake")

if on_check then
on_check("windows", function (package)
if package:version() and package:version():eq("2.2.0") then
if package:is_arch("x86") then
raise("package(wasm-micro-runtime 2.2.0) unsupported arch.")
end
end
end)
end

on_load(function (package)
if package:is_plat("windows") and package:is_arch("x86") and winos.version():le("10.0.17763") then
package:add("patches", "1.3.2", path.join(os.scriptdir(), "patches", "ntapi.patch"), "436c3f6bbb536a362e277d654ef8dc74e0d757dd815de2d89209bd2a9ac2f114")
Expand Down
Loading