From f4fe55a8515ecb2da9e585d979516df2cc716c7c Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Mon, 26 Dec 2022 11:02:49 +0900 Subject: [PATCH 1/4] Add a variation of wasi-sdk.cmake for pthread-using apps --- wasi-sdk-pthread.cmake | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 wasi-sdk-pthread.cmake diff --git a/wasi-sdk-pthread.cmake b/wasi-sdk-pthread.cmake new file mode 100644 index 000000000..f596e8ead --- /dev/null +++ b/wasi-sdk-pthread.cmake @@ -0,0 +1,31 @@ +# Cmake toolchain description file for the Makefile + +# This is arbitrary, AFAIK, for now. +cmake_minimum_required(VERSION 3.4.0) + +set(CMAKE_SYSTEM_NAME WASI) +set(CMAKE_SYSTEM_VERSION 1) +set(CMAKE_SYSTEM_PROCESSOR wasm32) +set(triple wasm32-wasi-pthread) +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread") + +if(WIN32) + set(WASI_HOST_EXE_SUFFIX ".exe") +else() + set(WASI_HOST_EXE_SUFFIX "") +endif() + +set(CMAKE_C_COMPILER ${WASI_SDK_PREFIX}/bin/clang${WASI_HOST_EXE_SUFFIX}) +set(CMAKE_CXX_COMPILER ${WASI_SDK_PREFIX}/bin/clang++${WASI_HOST_EXE_SUFFIX}) +set(CMAKE_AR ${WASI_SDK_PREFIX}/bin/llvm-ar${WASI_HOST_EXE_SUFFIX}) +set(CMAKE_RANLIB ${WASI_SDK_PREFIX}/bin/llvm-ranlib${WASI_HOST_EXE_SUFFIX}) +set(CMAKE_C_COMPILER_TARGET ${triple}) +set(CMAKE_CXX_COMPILER_TARGET ${triple}) + +# Don't look in the sysroot for executables to run during the build +set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) +# Only look in the sysroot (not in the host paths) for the rest +set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) +set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) From a3136f7641500ab077e51bec9eecd9081707a30f Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Mon, 26 Dec 2022 13:26:47 +0900 Subject: [PATCH 2/4] Install wasi-sdk-pthread.cmake --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 8e78a092b..6939e66a1 100644 --- a/Makefile +++ b/Makefile @@ -196,6 +196,7 @@ build/config.BUILT: cp src/config/config.sub src/config/config.guess $(BUILD_PREFIX)/share/misc mkdir -p $(BUILD_PREFIX)/share/cmake cp wasi-sdk.cmake $(BUILD_PREFIX)/share/cmake + cp wasi-sdk-pthread.cmake $(BUILD_PREFIX)/share/cmake touch build/config.BUILT build: build/llvm.BUILT build/wasi-libc.BUILT build/compiler-rt.BUILT build/libcxx.BUILT build/config.BUILT From 2d008b87053c598f047528c8e395838680a3f4df Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Mon, 26 Dec 2022 13:32:25 +0900 Subject: [PATCH 3/4] Build wasi-libc with THREAD_MODEL=posix as well --- Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Makefile b/Makefile index 6939e66a1..761ccbb8e 100644 --- a/Makefile +++ b/Makefile @@ -105,6 +105,12 @@ build/wasi-libc.BUILT: build/llvm.BUILT AR=$(BUILD_PREFIX)/bin/llvm-ar \ NM=$(BUILD_PREFIX)/bin/llvm-nm \ SYSROOT=$(BUILD_PREFIX)/share/wasi-sysroot + $(MAKE) -C $(ROOT_DIR)/src/wasi-libc \ + CC=$(BUILD_PREFIX)/bin/clang \ + AR=$(BUILD_PREFIX)/bin/llvm-ar \ + NM=$(BUILD_PREFIX)/bin/llvm-nm \ + SYSROOT=$(BUILD_PREFIX)/share/wasi-sysroot \ + THREAD_MODEL=posix touch build/wasi-libc.BUILT build/compiler-rt.BUILT: build/llvm.BUILT build/wasi-libc.BUILT From bab491d7dae4759eef9e970bd49580bef505314d Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Fri, 13 Jan 2023 14:17:42 +0900 Subject: [PATCH 4/4] wasi-sdk-pthread.cmake: target rename to wasm32-wasi-threads after https://github.com/WebAssembly/wasi-libc/pull/381 --- wasi-sdk-pthread.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wasi-sdk-pthread.cmake b/wasi-sdk-pthread.cmake index f596e8ead..e82622f97 100644 --- a/wasi-sdk-pthread.cmake +++ b/wasi-sdk-pthread.cmake @@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.4.0) set(CMAKE_SYSTEM_NAME WASI) set(CMAKE_SYSTEM_VERSION 1) set(CMAKE_SYSTEM_PROCESSOR wasm32) -set(triple wasm32-wasi-pthread) +set(triple wasm32-wasi-threads) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")