From 7cfecf383f26c4c1306a8ce0c1e9cd7b0a62be58 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Thu, 21 Mar 2024 01:46:36 +0000 Subject: [PATCH] build: Rename wasi-threads to wasip1-threads The WASI community is transitioning to a new naming for the "preview" version in the target triple: wasm32-wasi -> wasm32-wasip1. At this moment, we keep the old triple wasm32-wasi because it's already widely used, but we should start using the new triple threaded target. LLVM checks only if the OS field *starts* with "wasi", so "wasip1" is still considered a valid `isOSWASI()` target. See: https://github.com/WebAssembly/wasi-libc/pull/478 --- cmake/modules/SwiftConfigureSDK.cmake | 2 +- .../swift_build_support/products/wasisysroot.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/modules/SwiftConfigureSDK.cmake b/cmake/modules/SwiftConfigureSDK.cmake index f2923d7c371c3..e18dd0b7524a9 100644 --- a/cmake/modules/SwiftConfigureSDK.cmake +++ b/cmake/modules/SwiftConfigureSDK.cmake @@ -423,7 +423,7 @@ macro(configure_sdk_unix name architectures) endif() set(SWIFT_SDK_WASI_ARCH_wasm32_PATH "${SWIFT_WASI_SYSROOT_PATH}") if(SWIFT_ENABLE_WASI_THREADS) - set(SWIFT_SDK_WASI_ARCH_wasm32_TRIPLE "wasm32-unknown-wasi-threads") + set(SWIFT_SDK_WASI_ARCH_wasm32_TRIPLE "wasm32-unknown-wasip1-threads") else() set(SWIFT_SDK_WASI_ARCH_wasm32_TRIPLE "wasm32-unknown-wasi") endif() diff --git a/utils/swift_build_support/swift_build_support/products/wasisysroot.py b/utils/swift_build_support/swift_build_support/products/wasisysroot.py index f2124a47777be..4eaa4c9daadeb 100644 --- a/utils/swift_build_support/swift_build_support/products/wasisysroot.py +++ b/utils/swift_build_support/swift_build_support/products/wasisysroot.py @@ -143,7 +143,7 @@ def _build(self, host_target, enable_wasi_threads=False): 'libcxx;libcxxabi;compiler-rt') libdir_suffix = '/wasm32-wasi' if enable_wasi_threads: - libdir_suffix = '/wasm32-wasi-threads' + libdir_suffix = '/wasm32-wasip1-threads' self.cmake_options.define('LIBCXX_LIBDIR_SUFFIX:STRING', libdir_suffix) self.cmake_options.define('LIBCXXABI_LIBDIR_SUFFIX:STRING', libdir_suffix) self.cmake_options.define('CMAKE_STAGING_PREFIX:PATH', '/') @@ -183,7 +183,7 @@ def _build(self, host_target, enable_wasi_threads=False): self.cmake_options.define('CMAKE_C_FLAGS:STRING', ' '.join(c_flags)) self.cmake_options.define('CMAKE_CXX_FLAGS:STRING', ' '.join(cxx_flags)) - target_triple = 'wasm32-wasi-threads' if enable_wasi_threads else 'wasm32-wasi' + target_triple = 'wasm32-wasip1-threads' if enable_wasi_threads else 'wasm32-wasi' self.cmake_options.define('CMAKE_C_COMPILER_TARGET:STRING', target_triple) self.cmake_options.define('CMAKE_CXX_COMPILER_TARGET:STRING', target_triple)