wip

Author: alexcrichton

CMakeLists.txt

@@ -11,7 +11,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 project(wasi-sdk)
 include(ExternalProject)
 
-set(WASI_SDK_TARGETS "wasm32-wasi;wasm32-wasip1;wasm32-wasip2;wasm32-wasip1-threads;wasm32-wasi-threads"
+set(WASI_SDK_TARGETS "wasm32-wasi;wasm32-wasip1;wasm32-wasip2;wasm32-wasip3;wasm32-wasip1-threads;wasm32-wasi-threads"
   CACHE STRING "List of WASI targets to build")
 option(WASI_SDK_BUILD_TOOLCHAIN "Build a toolchain instead of the sysroot" OFF)
 

cmake/wasi-sdk-sysroot.cmake

@@ -186,6 +186,8 @@ function(define_wasi_libc_sub target target_suffix lto)
 
   if(${target} MATCHES threads)
     set(libcompiler_rt_a ${wasi_resource_dir}/lib/wasm32-unknown-wasip1-threads/libclang_rt.builtins.a)
+  elseif(${target} MATCHES wasip3)
+    set(libcompiler_rt_a ${wasi_resource_dir}/lib/wasm32-unknown-wasip3/libclang_rt.builtins.a)
   else()
     set(libcompiler_rt_a ${wasi_resource_dir}/lib/wasm32-unknown-wasip1/libclang_rt.builtins.a)
   endif()
@@ -375,7 +377,7 @@ function(define_libcxx_sub target target_suffix extra_target_flags extra_libdir_
         "git apply ${CMAKE_SOURCE_DIR}/src/llvm-pr-186054.patch || git apply ${CMAKE_SOURCE_DIR}/src/llvm-pr-186054.patch -R --check"
     COMMAND
       ${CMAKE_COMMAND} -E chdir .. bash -c
-        "git apply ${CMAKE_SOURCE_DIR}/src/llvm-pr-185770.patch || git apply ${CMAKE_SOURCE_DIR}/src/llvm-pr-185770.patch -R --check"
+        "git apply ${CMAKE_SOURCE_DIR}/src/llvm-undo-part-of-194317.patch || git apply ${CMAKE_SOURCE_DIR}/src/llvm-undo-part-of-194317.patch -R --check"
   )
   add_dependencies(libcxx-${target} libcxx-${target}${target_suffix}-build)
 endfunction()

cmake/wasi-sdk-toolchain.cmake

@@ -250,7 +250,7 @@ ExternalProject_Add(llvm-build
   USES_TERMINAL_INSTALL ON
   PATCH_COMMAND
     ${CMAKE_COMMAND} -E chdir .. bash -c
-      "git apply ${CMAKE_SOURCE_DIR}/src/llvm-pr-185775.patch || git apply ${CMAKE_SOURCE_DIR}/src/llvm-pr-185775.patch -R --check"
+      "git apply ${CMAKE_SOURCE_DIR}/src/llvm-pr-200855.patch || git apply ${CMAKE_SOURCE_DIR}/src/llvm-pr-200855.patch -R --check"
 )
 
 add_custom_target(build ALL DEPENDS llvm-build)
@@ -265,7 +265,7 @@ install(DIRECTORY ${wasi_tmp_install}/bin ${wasi_tmp_install}/lib ${wasi_tmp_ins
 # Build logic for `wasm-component-ld` installed from Rust code.
 set(wasm_component_ld_root ${CMAKE_CURRENT_BINARY_DIR}/wasm-component-ld)
 set(wasm_component_ld ${wasm_component_ld_root}/bin/wasm-component-ld${CMAKE_EXECUTABLE_SUFFIX})
-set(wasm_component_ld_version 0.5.22)
+set(wasm_component_ld_version 0.5.24)
 if(RUST_TARGET)
   set(rust_target_flag --target=${RUST_TARGET})
 endif()

src/llvm-pr-185770.patch

@@ -1,8 +1,8 @@
-From f71fdfcbd6fcc7b521c74b5856ebeacdd6cf55d9 Mon Sep 17 00:00:00 2001
+From 46301f073b8cc85ad0d2f1dcdda923209bff173b Mon Sep 17 00:00:00 2001
 From: Catherine <whitequark@whitequark.org>
 Date: Thu, 12 Mar 2026 08:19:49 +0000
 Subject: [PATCH] [libc++abi] Revert gating of `__cxa_thread_atexit` on
- Linux||Fuchsia
+ Wasm/WASI
 
 This was done in the commit 3c100d5d548d with the description
 "Enable -Wmissing-prototypes" which seems incongruent to me.
@@ -23,26 +23,28 @@ wasm-ld: error: /tmp/repro-dd1ad7.o: undefined symbol: __cxa_thread_atexit
 clang++: error: linker command failed with exit code 1 (use -v to see invocation)
 ```
 ---
- libcxxabi/src/cxa_thread_atexit.cpp | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
+ libcxxabi/src/cxa_thread_atexit.cpp | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/libcxxabi/src/cxa_thread_atexit.cpp b/libcxxabi/src/cxa_thread_atexit.cpp
-index 402a52c741012..1bdcb4ef192b4 100644
+index 402a52c741012..099be242c6dc6 100644
 --- a/libcxxabi/src/cxa_thread_atexit.cpp
 +++ b/libcxxabi/src/cxa_thread_atexit.cpp
-@@ -106,7 +106,6 @@ namespace {
+@@ -106,7 +106,7 @@ namespace {
 
  #endif // HAVE___CXA_THREAD_ATEXIT_IMPL
 
 -#if defined(__linux__) || defined(__Fuchsia__)
++#if defined(__linux__) || defined(__Fuchsia__) || defined(__wasm__)
  extern "C" {
 
    _LIBCXXABI_FUNC_VIS int __cxa_thread_atexit(Dtor dtor, void* obj, void* dso_symbol) throw() {
-@@ -141,6 +140,5 @@ extern "C" {
+@@ -141,6 +141,7 @@ extern "C" {
      }
  #endif // HAVE___CXA_THREAD_ATEXIT_IMPL
    }
--} // extern "C"
++
+ } // extern "C"
 -#endif // defined(__linux__) || defined(__Fuchsia__)
-+  } // extern "C"
++#endif // defined(__linux__) || defined(__Fuchsia__) || defined(__wasm__)
  } // namespace __cxxabiv1