Skip to content

Commit f420453

Browse files
authored
add experimenal wasm32-wasi-threads support (#274)
* Add a variation of wasi-sdk.cmake for pthread-using apps * Install wasi-sdk-pthread.cmake * Build wasi-libc with THREAD_MODEL=posix as well * wasi-sdk-pthread.cmake: target rename to wasm32-wasi-threads after WebAssembly/wasi-libc#381
1 parent f4b77fe commit f420453

File tree

2 files changed

+38
-0
lines changed

2 files changed

+38
-0
lines changed

Makefile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,12 @@ build/wasi-libc.BUILT: build/llvm.BUILT
105105
AR=$(BUILD_PREFIX)/bin/llvm-ar \
106106
NM=$(BUILD_PREFIX)/bin/llvm-nm \
107107
SYSROOT=$(BUILD_PREFIX)/share/wasi-sysroot
108+
$(MAKE) -C $(ROOT_DIR)/src/wasi-libc \
109+
CC=$(BUILD_PREFIX)/bin/clang \
110+
AR=$(BUILD_PREFIX)/bin/llvm-ar \
111+
NM=$(BUILD_PREFIX)/bin/llvm-nm \
112+
SYSROOT=$(BUILD_PREFIX)/share/wasi-sysroot \
113+
THREAD_MODEL=posix
108114
touch build/wasi-libc.BUILT
109115

110116
build/compiler-rt.BUILT: build/llvm.BUILT build/wasi-libc.BUILT
@@ -196,6 +202,7 @@ build/config.BUILT:
196202
cp src/config/config.sub src/config/config.guess $(BUILD_PREFIX)/share/misc
197203
mkdir -p $(BUILD_PREFIX)/share/cmake
198204
cp wasi-sdk.cmake $(BUILD_PREFIX)/share/cmake
205+
cp wasi-sdk-pthread.cmake $(BUILD_PREFIX)/share/cmake
199206
touch build/config.BUILT
200207

201208
build: build/llvm.BUILT build/wasi-libc.BUILT build/compiler-rt.BUILT build/libcxx.BUILT build/config.BUILT

wasi-sdk-pthread.cmake

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# Cmake toolchain description file for the Makefile
2+
3+
# This is arbitrary, AFAIK, for now.
4+
cmake_minimum_required(VERSION 3.4.0)
5+
6+
set(CMAKE_SYSTEM_NAME WASI)
7+
set(CMAKE_SYSTEM_VERSION 1)
8+
set(CMAKE_SYSTEM_PROCESSOR wasm32)
9+
set(triple wasm32-wasi-threads)
10+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread")
11+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
12+
13+
if(WIN32)
14+
set(WASI_HOST_EXE_SUFFIX ".exe")
15+
else()
16+
set(WASI_HOST_EXE_SUFFIX "")
17+
endif()
18+
19+
set(CMAKE_C_COMPILER ${WASI_SDK_PREFIX}/bin/clang${WASI_HOST_EXE_SUFFIX})
20+
set(CMAKE_CXX_COMPILER ${WASI_SDK_PREFIX}/bin/clang++${WASI_HOST_EXE_SUFFIX})
21+
set(CMAKE_AR ${WASI_SDK_PREFIX}/bin/llvm-ar${WASI_HOST_EXE_SUFFIX})
22+
set(CMAKE_RANLIB ${WASI_SDK_PREFIX}/bin/llvm-ranlib${WASI_HOST_EXE_SUFFIX})
23+
set(CMAKE_C_COMPILER_TARGET ${triple})
24+
set(CMAKE_CXX_COMPILER_TARGET ${triple})
25+
26+
# Don't look in the sysroot for executables to run during the build
27+
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
28+
# Only look in the sysroot (not in the host paths) for the rest
29+
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
30+
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
31+
set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)

0 commit comments

Comments
 (0)