gnh1201/wasm-micro-runtime
1
0
Fork 0
mirror of https://github.com/bytecodealliance/wasm-micro-runtime.git synced 2025-05-08 12:46:14 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Rename thread_spawn import (#1907)

Browse Source 
Following the wit-defined ABI:
https://github.com/WebAssembly/wasi-threads/pull/26

cf. https://github.com/WebAssembly/wasi-libc/pull/387
This commit is contained in:
YAMAMOTO Takashi 2023-01-27 07:45:34 +09:00 committed by GitHub
parent 879563047f
commit 42f8fed20e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/compilation_on_android_ubuntu.yml vendored
View File

@ -326,8 +326,13 @@ jobs:
- name: build wasi-libc (needed for wasi-threads) - name: build wasi-libc (needed for wasi-threads)
run: | run: |
git clone --branch wasi-sdk-17 https://github.com/WebAssembly/wasi-libc mkdir wasi-libc
cd wasi-libc cd wasi-libc
git init
# "Rename thread_spawn import" commit on main branch
git fetch https://github.com/WebAssembly/wasi-libc \
8f5275796a82f8ecfd0833a4f3f444fa37ed4546
git checkout FETCH_HEAD
make \ make \
AR=/opt/wasi-sdk/bin/llvm-ar \ AR=/opt/wasi-sdk/bin/llvm-ar \
NM=/opt/wasi-sdk/bin/llvm-nm \ NM=/opt/wasi-sdk/bin/llvm-nm \

9
.github/workflows/compilation_on_macos.yml vendored
View File

@ -268,8 +268,13 @@ jobs:
- name: build wasi-libc (needed for wasi-threads) - name: build wasi-libc (needed for wasi-threads)
run: | run: |
git clone --branch wasi-sdk-17 https://github.com/WebAssembly/wasi-libc mkdir wasi-libc
cd wasi-libc cd wasi-libc
git init
# "Rename thread_spawn import" commit on main branch
git fetch https://github.com/WebAssembly/wasi-libc \
8f5275796a82f8ecfd0833a4f3f444fa37ed4546
git checkout FETCH_HEAD
make \ make \
AR=/opt/wasi-sdk/bin/llvm-ar \ AR=/opt/wasi-sdk/bin/llvm-ar \
NM=/opt/wasi-sdk/bin/llvm-nm \ NM=/opt/wasi-sdk/bin/llvm-nm \
@ -329,4 +334,4 @@ jobs:
mkdir build && cd build mkdir build && cd build
cmake -DWASI_SYSROOT=`pwd`/../../../core/deps/wasi-libc/sysroot .. cmake -DWASI_SYSROOT=`pwd`/../../../core/deps/wasi-libc/sysroot ..
cmake --build . --config Release --parallel 4 cmake --build . --config Release --parallel 4
./iwasm wasm-apps/no_pthread.wasm ./iwasm wasm-apps/no_pthread.wasm

7
.github/workflows/compilation_on_sgx.yml vendored
View File

@ -270,8 +270,13 @@ jobs:
- name: build wasi-libc (needed for wasi-threads) - name: build wasi-libc (needed for wasi-threads)
run: | run: |
git clone --branch wasi-sdk-17 https://github.com/WebAssembly/wasi-libc mkdir wasi-libc
cd wasi-libc cd wasi-libc
git init
# "Rename thread_spawn import" commit on main branch
git fetch https://github.com/WebAssembly/wasi-libc \
8f5275796a82f8ecfd0833a4f3f444fa37ed4546
git checkout FETCH_HEAD
make \ make \
AR=/opt/wasi-sdk/bin/llvm-ar \ AR=/opt/wasi-sdk/bin/llvm-ar \
NM=/opt/wasi-sdk/bin/llvm-nm \ NM=/opt/wasi-sdk/bin/llvm-nm \

6
core/iwasm/libraries/lib-wasi-threads/lib_wasi_threads_wrapper.c
View File

@ -148,12 +148,12 @@ thread_preparation_fail:
} }
/* clang-format off */ /* clang-format off */
#define REG_NATIVE_FUNC(func_name, signature) \ #define REG_NATIVE_FUNC(name, func_name, signature) \
{ #func_name, func_name##_wrapper, signature, NULL } { name, func_name##_wrapper, signature, NULL }
/* clang-format on */ /* clang-format on */
static NativeSymbol native_symbols_lib_wasi_threads[] = { REG_NATIVE_FUNC( static NativeSymbol native_symbols_lib_wasi_threads[] = { REG_NATIVE_FUNC(
thread_spawn, "(i)i") }; "thread-spawn", thread_spawn, "(i)i") };
uint32 uint32
get_lib_wasi_threads_export_apis(NativeSymbol **p_lib_wasi_threads_apis) get_lib_wasi_threads_export_apis(NativeSymbol **p_lib_wasi_threads_apis)

4
samples/wasi-threads/wasm-apps/CMakeLists.txt
View File

@ -14,7 +14,7 @@ endif ()
set (CMAKE_SYSROOT "${WASI_SYSROOT}") set (CMAKE_SYSROOT "${WASI_SYSROOT}")
set (CMAKE_C_COMPILER "${WASI_SDK_DIR}/bin/clang") set (CMAKE_C_COMPILER "${WASI_SDK_DIR}/bin/clang")
set (CMAKE_ASM_COMPILER "${WASI_SDK_DIR}/bin/clang") set (CMAKE_ASM_COMPILER "${WASI_SDK_DIR}/bin/clang")
set (CMAKE_C_COMPILER_TARGET "wasm32-wasi") set (CMAKE_EXE_LINKER_FLAGS "-target wasm32-wasi-threads")
function (compile_sample SOURCE_FILE) function (compile_sample SOURCE_FILE)
get_filename_component (FILE_NAME ${SOURCE_FILE} NAME_WLE) get_filename_component (FILE_NAME ${SOURCE_FILE} NAME_WLE)
@ -36,4 +36,4 @@ function (compile_sample SOURCE_FILE)
endfunction () endfunction ()
compile_sample(no_pthread.c wasi_thread_start.S) compile_sample(no_pthread.c wasi_thread_start.S)
compile_sample(thread_termination.c wasi_thread_start.S) compile_sample(thread_termination.c wasi_thread_start.S)