pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

llvm: updated to 21.1.8



Module Name:	pkgsrc-wip
Committed By:	Adam Ciarciński <adam%defguard.net@localhost>
Pushed By:	adam
Date:		Sat Dec 27 21:51:28 2025 +0100
Changeset:	ff9332c5373bb5d6077a61dee86b5f6b78ea8a7c

Modified Files:
	clang-tools-extra/distinfo
	clang/distinfo
	compiler-rt/distinfo
	flang/distinfo
	libcxx/distinfo
	libcxxabi/distinfo
	libunwind/distinfo
	lld/distinfo
	lldb/distinfo
	llvm/distinfo
	llvm/version.mk
	mlir/distinfo
	openmp/distinfo
	polly/distinfo
	wasi-libc/Makefile
	wasi-libc/PLIST
	wasi-libc/distinfo
	wasi-libc/patches/patch-Makefile
	wasi-libcxx/Makefile
	wasi-libcxx/PLIST
	wasi-libcxx/distinfo
	wasi-libcxx/patches/patch-libcxx_include_CMakeLists.txt
	wasi-libcxx/patches/patch-libcxx_src_CMakeLists.txt
	wasi-libcxx/patches/patch-libcxxabi_src_CMakeLists.txt
Added Files:
	wasi-libc/patches/patch-scripts_install-include-headers.sh

Log Message:
llvm: updated to 21.1.8

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=ff9332c5373bb5d6077a61dee86b5f6b78ea8a7c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 clang-tools-extra/distinfo                         |   6 +-
 clang/distinfo                                     |   6 +-
 compiler-rt/distinfo                               |   6 +-
 flang/distinfo                                     |   6 +-
 libcxx/distinfo                                    |   6 +-
 libcxxabi/distinfo                                 |   6 +-
 libunwind/distinfo                                 |   6 +-
 lld/distinfo                                       |   6 +-
 lldb/distinfo                                      |   6 +-
 llvm/distinfo                                      |   6 +-
 llvm/version.mk                                    |   2 +-
 mlir/distinfo                                      |   6 +-
 openmp/distinfo                                    |   6 +-
 polly/distinfo                                     |   6 +-
 wasi-libc/Makefile                                 |  43 +-
 wasi-libc/PLIST                                    | 407 ++++-----
 wasi-libc/distinfo                                 |  18 +-
 wasi-libc/patches/patch-Makefile                   |  40 +-
 .../patch-scripts_install-include-headers.sh       |  18 +
 wasi-libcxx/Makefile                               |  15 +-
 wasi-libcxx/PLIST                                  | 969 +++++++++++++++++++--
 wasi-libcxx/distinfo                               |  12 +-
 .../patches/patch-libcxx_include_CMakeLists.txt    |  18 +-
 .../patches/patch-libcxx_src_CMakeLists.txt        |  18 +-
 .../patches/patch-libcxxabi_src_CMakeLists.txt     |  10 +-
 25 files changed, 1252 insertions(+), 396 deletions(-)

diffs:
diff --git a/clang-tools-extra/distinfo b/clang-tools-extra/distinfo
index 7b7bf143f1..c24148f1d4 100644
--- a/clang-tools-extra/distinfo
+++ b/clang-tools-extra/distinfo
@@ -1,5 +1,5 @@
 $NetBSD: distinfo,v 1.17 2023/01/12 19:32:53 adam Exp $
 
-BLAKE2s (llvm-project-21.1.7.src.tar.xz) = 28c3b235070e74f525e7d7be33de0c5e2a3ad5e5a5673d5320e726a532f0139c
-SHA512 (llvm-project-21.1.7.src.tar.xz) = ae30a53ed929df979849f7433bf705bc3d540aa9e12a02a175eb2483d1a56f9ca1203c9b67795f6e84cf2407c28d46d5d5351b290d8735adb5206103fee6f379
-Size (llvm-project-21.1.7.src.tar.xz) = 158956584 bytes
+BLAKE2s (llvm-project-21.1.8.src.tar.xz) = e6db98fed167ddd56b49c7eb46c4de7e7e8e08158e9c99ae79806983bcb60ae9
+SHA512 (llvm-project-21.1.8.src.tar.xz) = cae4c44e7bf678071723da63ad5839491d717a7233e7f4791aa408207f3ea42f52de939ad15189b112c02a0770f1bb8d59bae6ad31ef53417a6eea7770fe52ab
+Size (llvm-project-21.1.8.src.tar.xz) = 158958576 bytes
diff --git a/clang/distinfo b/clang/distinfo
index 54ffc51e84..dd59c9e8db 100644
--- a/clang/distinfo
+++ b/clang/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-BLAKE2s (llvm-project-21.1.7.src.tar.xz) = 28c3b235070e74f525e7d7be33de0c5e2a3ad5e5a5673d5320e726a532f0139c
-SHA512 (llvm-project-21.1.7.src.tar.xz) = ae30a53ed929df979849f7433bf705bc3d540aa9e12a02a175eb2483d1a56f9ca1203c9b67795f6e84cf2407c28d46d5d5351b290d8735adb5206103fee6f379
-Size (llvm-project-21.1.7.src.tar.xz) = 158956584 bytes
+BLAKE2s (llvm-project-21.1.8.src.tar.xz) = e6db98fed167ddd56b49c7eb46c4de7e7e8e08158e9c99ae79806983bcb60ae9
+SHA512 (llvm-project-21.1.8.src.tar.xz) = cae4c44e7bf678071723da63ad5839491d717a7233e7f4791aa408207f3ea42f52de939ad15189b112c02a0770f1bb8d59bae6ad31ef53417a6eea7770fe52ab
+Size (llvm-project-21.1.8.src.tar.xz) = 158958576 bytes
 SHA1 (patch-lib_Driver_ToolChain.cpp) = 33a8e346a72893140fde42245e4b108f3a9b9e3e
diff --git a/compiler-rt/distinfo b/compiler-rt/distinfo
index 214c1f60d8..8b14641975 100644
--- a/compiler-rt/distinfo
+++ b/compiler-rt/distinfo
@@ -1,7 +1,7 @@
 $NetBSD: distinfo,v 1.23 2023/03/03 09:53:14 wiz Exp $
 
-BLAKE2s (llvm-project-21.1.7.src.tar.xz) = 28c3b235070e74f525e7d7be33de0c5e2a3ad5e5a5673d5320e726a532f0139c
-SHA512 (llvm-project-21.1.7.src.tar.xz) = ae30a53ed929df979849f7433bf705bc3d540aa9e12a02a175eb2483d1a56f9ca1203c9b67795f6e84cf2407c28d46d5d5351b290d8735adb5206103fee6f379
-Size (llvm-project-21.1.7.src.tar.xz) = 158956584 bytes
+BLAKE2s (llvm-project-21.1.8.src.tar.xz) = e6db98fed167ddd56b49c7eb46c4de7e7e8e08158e9c99ae79806983bcb60ae9
+SHA512 (llvm-project-21.1.8.src.tar.xz) = cae4c44e7bf678071723da63ad5839491d717a7233e7f4791aa408207f3ea42f52de939ad15189b112c02a0770f1bb8d59bae6ad31ef53417a6eea7770fe52ab
+Size (llvm-project-21.1.8.src.tar.xz) = 158958576 bytes
 SHA1 (patch-CMakeLists.txt) = f8b0a0ad43481ec0c2923ec19c3c4f2ce81a4c82
 SHA1 (patch-cmake_config-ix.cmake) = 1a67378de34b048477ef80237ab8a76272288a55
diff --git a/flang/distinfo b/flang/distinfo
index ae68dbf96e..1bce846d84 100644
--- a/flang/distinfo
+++ b/flang/distinfo
@@ -1,5 +1,5 @@
 $NetBSD: distinfo,v 1.35 2015/09/11 01:21:57 tnn Exp $
 
-BLAKE2s (llvm-project-21.1.7.src.tar.xz) = 28c3b235070e74f525e7d7be33de0c5e2a3ad5e5a5673d5320e726a532f0139c
-SHA512 (llvm-project-21.1.7.src.tar.xz) = ae30a53ed929df979849f7433bf705bc3d540aa9e12a02a175eb2483d1a56f9ca1203c9b67795f6e84cf2407c28d46d5d5351b290d8735adb5206103fee6f379
-Size (llvm-project-21.1.7.src.tar.xz) = 158956584 bytes
+BLAKE2s (llvm-project-21.1.8.src.tar.xz) = e6db98fed167ddd56b49c7eb46c4de7e7e8e08158e9c99ae79806983bcb60ae9
+SHA512 (llvm-project-21.1.8.src.tar.xz) = cae4c44e7bf678071723da63ad5839491d717a7233e7f4791aa408207f3ea42f52de939ad15189b112c02a0770f1bb8d59bae6ad31ef53417a6eea7770fe52ab
+Size (llvm-project-21.1.8.src.tar.xz) = 158958576 bytes
diff --git a/libcxx/distinfo b/libcxx/distinfo
index df748ca902..9ea55b358d 100644
--- a/libcxx/distinfo
+++ b/libcxx/distinfo
@@ -1,8 +1,8 @@
 $NetBSD: distinfo,v 1.25 2023/01/12 19:32:54 adam Exp $
 
-BLAKE2s (llvm-project-21.1.7.src.tar.xz) = 28c3b235070e74f525e7d7be33de0c5e2a3ad5e5a5673d5320e726a532f0139c
-SHA512 (llvm-project-21.1.7.src.tar.xz) = ae30a53ed929df979849f7433bf705bc3d540aa9e12a02a175eb2483d1a56f9ca1203c9b67795f6e84cf2407c28d46d5d5351b290d8735adb5206103fee6f379
-Size (llvm-project-21.1.7.src.tar.xz) = 158956584 bytes
+BLAKE2s (llvm-project-21.1.8.src.tar.xz) = e6db98fed167ddd56b49c7eb46c4de7e7e8e08158e9c99ae79806983bcb60ae9
+SHA512 (llvm-project-21.1.8.src.tar.xz) = cae4c44e7bf678071723da63ad5839491d717a7233e7f4791aa408207f3ea42f52de939ad15189b112c02a0770f1bb8d59bae6ad31ef53417a6eea7770fe52ab
+Size (llvm-project-21.1.8.src.tar.xz) = 158958576 bytes
 SHA1 (patch-src_CMakeLists.txt) = 4554c675b778d8d631f2fc664364f0d3ffc3ed5e
 SHA1 (patch-src_charconv.cpp) = 658a0727c6e2ddc051fbd22a536033bae19a22ba
 SHA1 (patch-src_filesystem_file__descriptor.h) = 44a64cb3eac4e94abb54170c355639642b8246c2
diff --git a/libcxxabi/distinfo b/libcxxabi/distinfo
index 00ba9730db..13235533ff 100644
--- a/libcxxabi/distinfo
+++ b/libcxxabi/distinfo
@@ -1,7 +1,7 @@
 $NetBSD: distinfo,v 1.21 2023/01/12 19:32:54 adam Exp $
 
-BLAKE2s (llvm-project-21.1.7.src.tar.xz) = 28c3b235070e74f525e7d7be33de0c5e2a3ad5e5a5673d5320e726a532f0139c
-SHA512 (llvm-project-21.1.7.src.tar.xz) = ae30a53ed929df979849f7433bf705bc3d540aa9e12a02a175eb2483d1a56f9ca1203c9b67795f6e84cf2407c28d46d5d5351b290d8735adb5206103fee6f379
-Size (llvm-project-21.1.7.src.tar.xz) = 158956584 bytes
+BLAKE2s (llvm-project-21.1.8.src.tar.xz) = e6db98fed167ddd56b49c7eb46c4de7e7e8e08158e9c99ae79806983bcb60ae9
+SHA512 (llvm-project-21.1.8.src.tar.xz) = cae4c44e7bf678071723da63ad5839491d717a7233e7f4791aa408207f3ea42f52de939ad15189b112c02a0770f1bb8d59bae6ad31ef53417a6eea7770fe52ab
+Size (llvm-project-21.1.8.src.tar.xz) = 158958576 bytes
 SHA1 (patch-src_CMakeLists.txt) = 4824994ca6f2f4f0ebc154fff7a17418660e5959
 SHA1 (patch-src_demangle_Utility.h) = 7a4850869f9f4ce858d2cceeb999934c28292a95
diff --git a/libunwind/distinfo b/libunwind/distinfo
index 2f7bee4e95..3d8a5ecab0 100644
--- a/libunwind/distinfo
+++ b/libunwind/distinfo
@@ -1,6 +1,6 @@
 $NetBSD: distinfo,v 1.32 2023/01/12 22:47:25 wiz Exp $
 
-BLAKE2s (llvm-project-21.1.7.src.tar.xz) = 28c3b235070e74f525e7d7be33de0c5e2a3ad5e5a5673d5320e726a532f0139c
-SHA512 (llvm-project-21.1.7.src.tar.xz) = ae30a53ed929df979849f7433bf705bc3d540aa9e12a02a175eb2483d1a56f9ca1203c9b67795f6e84cf2407c28d46d5d5351b290d8735adb5206103fee6f379
-Size (llvm-project-21.1.7.src.tar.xz) = 158956584 bytes
+BLAKE2s (llvm-project-21.1.8.src.tar.xz) = e6db98fed167ddd56b49c7eb46c4de7e7e8e08158e9c99ae79806983bcb60ae9
+SHA512 (llvm-project-21.1.8.src.tar.xz) = cae4c44e7bf678071723da63ad5839491d717a7233e7f4791aa408207f3ea42f52de939ad15189b112c02a0770f1bb8d59bae6ad31ef53417a6eea7770fe52ab
+Size (llvm-project-21.1.8.src.tar.xz) = 158958576 bytes
 SHA1 (patch-src_CMakeLists.txt) = a9a226497831d5ed54e2b61956f143943d9aa3f4
diff --git a/lld/distinfo b/lld/distinfo
index fb3570f1af..e8925e8681 100644
--- a/lld/distinfo
+++ b/lld/distinfo
@@ -1,7 +1,7 @@
 $NetBSD: distinfo,v 1.21 2023/01/12 19:32:53 adam Exp $
 
-BLAKE2s (llvm-project-21.1.7.src.tar.xz) = 28c3b235070e74f525e7d7be33de0c5e2a3ad5e5a5673d5320e726a532f0139c
-SHA512 (llvm-project-21.1.7.src.tar.xz) = ae30a53ed929df979849f7433bf705bc3d540aa9e12a02a175eb2483d1a56f9ca1203c9b67795f6e84cf2407c28d46d5d5351b290d8735adb5206103fee6f379
-Size (llvm-project-21.1.7.src.tar.xz) = 158956584 bytes
+BLAKE2s (llvm-project-21.1.8.src.tar.xz) = e6db98fed167ddd56b49c7eb46c4de7e7e8e08158e9c99ae79806983bcb60ae9
+SHA512 (llvm-project-21.1.8.src.tar.xz) = cae4c44e7bf678071723da63ad5839491d717a7233e7f4791aa408207f3ea42f52de939ad15189b112c02a0770f1bb8d59bae6ad31ef53417a6eea7770fe52ab
+Size (llvm-project-21.1.8.src.tar.xz) = 158958576 bytes
 SHA1 (patch-ELF_Config.h) = 484d0818bd4a92f2faafa1337d3f2f08cab4c0fc
 SHA1 (patch-ELF_Options.td) = c81907d6e5e099ed2c26de972c6744b7197de3d3
diff --git a/lldb/distinfo b/lldb/distinfo
index f101673bd1..ffbec3219c 100644
--- a/lldb/distinfo
+++ b/lldb/distinfo
@@ -1,6 +1,6 @@
 $NetBSD: distinfo,v 1.35 2023/01/12 19:32:53 adam Exp $
 
-BLAKE2s (llvm-project-21.1.7.src.tar.xz) = 28c3b235070e74f525e7d7be33de0c5e2a3ad5e5a5673d5320e726a532f0139c
-SHA512 (llvm-project-21.1.7.src.tar.xz) = ae30a53ed929df979849f7433bf705bc3d540aa9e12a02a175eb2483d1a56f9ca1203c9b67795f6e84cf2407c28d46d5d5351b290d8735adb5206103fee6f379
-Size (llvm-project-21.1.7.src.tar.xz) = 158956584 bytes
+BLAKE2s (llvm-project-21.1.8.src.tar.xz) = e6db98fed167ddd56b49c7eb46c4de7e7e8e08158e9c99ae79806983bcb60ae9
+SHA512 (llvm-project-21.1.8.src.tar.xz) = cae4c44e7bf678071723da63ad5839491d717a7233e7f4791aa408207f3ea42f52de939ad15189b112c02a0770f1bb8d59bae6ad31ef53417a6eea7770fe52ab
+Size (llvm-project-21.1.8.src.tar.xz) = 158958576 bytes
 SHA1 (patch-source_API_CMakeLists.txt) = 32840580507b3a7d05e76485da5830e92a76bb06
diff --git a/llvm/distinfo b/llvm/distinfo
index 694cb9a85f..e41117e843 100644
--- a/llvm/distinfo
+++ b/llvm/distinfo
@@ -1,8 +1,8 @@
 $NetBSD: distinfo,v 1.41 2023/03/05 17:26:09 he Exp $
 
-BLAKE2s (llvm-project-21.1.7.src.tar.xz) = 28c3b235070e74f525e7d7be33de0c5e2a3ad5e5a5673d5320e726a532f0139c
-SHA512 (llvm-project-21.1.7.src.tar.xz) = ae30a53ed929df979849f7433bf705bc3d540aa9e12a02a175eb2483d1a56f9ca1203c9b67795f6e84cf2407c28d46d5d5351b290d8735adb5206103fee6f379
-Size (llvm-project-21.1.7.src.tar.xz) = 158956584 bytes
+BLAKE2s (llvm-project-21.1.8.src.tar.xz) = e6db98fed167ddd56b49c7eb46c4de7e7e8e08158e9c99ae79806983bcb60ae9
+SHA512 (llvm-project-21.1.8.src.tar.xz) = cae4c44e7bf678071723da63ad5839491d717a7233e7f4791aa408207f3ea42f52de939ad15189b112c02a0770f1bb8d59bae6ad31ef53417a6eea7770fe52ab
+Size (llvm-project-21.1.8.src.tar.xz) = 158958576 bytes
 SHA1 (patch-CMakeLists.txt) = c53cef61bdaeaf5216b78330992357a632a2b0b2
 SHA1 (patch-cmake_config-ix.cmake) = f5cd0c949d35020d1051f95417e7944aa71a3d54
 SHA1 (patch-cmake_modules_AddLLVM.cmake) = 4e6668e0c3e13423ce3e19304f4ad60f66d41562
diff --git a/llvm/version.mk b/llvm/version.mk
index c280aafe1b..7425e7a576 100644
--- a/llvm/version.mk
+++ b/llvm/version.mk
@@ -14,7 +14,7 @@
 # used by lang/wasi-libcxx
 # used by parallel/openmp
 
-LLVM_VERSION=	21.1.7
+LLVM_VERSION=	21.1.8
 
 DISTNAME=	llvm-project-${LLVM_VERSION}.src
 MASTER_SITES=	${MASTER_SITE_GITHUB:=llvm/}
diff --git a/mlir/distinfo b/mlir/distinfo
index d2ebabeb43..5bf81d5926 100644
--- a/mlir/distinfo
+++ b/mlir/distinfo
@@ -1,6 +1,6 @@
 $NetBSD: distinfo,v 1.35 2015/09/11 01:21:57 tnn Exp $
 
-BLAKE2s (llvm-project-21.1.7.src.tar.xz) = 28c3b235070e74f525e7d7be33de0c5e2a3ad5e5a5673d5320e726a532f0139c
-SHA512 (llvm-project-21.1.7.src.tar.xz) = ae30a53ed929df979849f7433bf705bc3d540aa9e12a02a175eb2483d1a56f9ca1203c9b67795f6e84cf2407c28d46d5d5351b290d8735adb5206103fee6f379
-Size (llvm-project-21.1.7.src.tar.xz) = 158956584 bytes
+BLAKE2s (llvm-project-21.1.8.src.tar.xz) = e6db98fed167ddd56b49c7eb46c4de7e7e8e08158e9c99ae79806983bcb60ae9
+SHA512 (llvm-project-21.1.8.src.tar.xz) = cae4c44e7bf678071723da63ad5839491d717a7233e7f4791aa408207f3ea42f52de939ad15189b112c02a0770f1bb8d59bae6ad31ef53417a6eea7770fe52ab
+Size (llvm-project-21.1.8.src.tar.xz) = 158958576 bytes
 SHA1 (patch-tools_mlir-tblgen_CMakeLists.txt) = 7b78acbf8a85443f2cc3f13786bbbda25b0b8d74
diff --git a/openmp/distinfo b/openmp/distinfo
index 884973301e..502d9690f4 100644
--- a/openmp/distinfo
+++ b/openmp/distinfo
@@ -1,5 +1,5 @@
 $NetBSD: distinfo,v 1.17 2023/01/12 19:32:54 adam Exp $
 
-BLAKE2s (llvm-project-21.1.7.src.tar.xz) = 28c3b235070e74f525e7d7be33de0c5e2a3ad5e5a5673d5320e726a532f0139c
-SHA512 (llvm-project-21.1.7.src.tar.xz) = ae30a53ed929df979849f7433bf705bc3d540aa9e12a02a175eb2483d1a56f9ca1203c9b67795f6e84cf2407c28d46d5d5351b290d8735adb5206103fee6f379
-Size (llvm-project-21.1.7.src.tar.xz) = 158956584 bytes
+BLAKE2s (llvm-project-21.1.8.src.tar.xz) = e6db98fed167ddd56b49c7eb46c4de7e7e8e08158e9c99ae79806983bcb60ae9
+SHA512 (llvm-project-21.1.8.src.tar.xz) = cae4c44e7bf678071723da63ad5839491d717a7233e7f4791aa408207f3ea42f52de939ad15189b112c02a0770f1bb8d59bae6ad31ef53417a6eea7770fe52ab
+Size (llvm-project-21.1.8.src.tar.xz) = 158958576 bytes
diff --git a/polly/distinfo b/polly/distinfo
index 60c616c868..9a7156e7ec 100644
--- a/polly/distinfo
+++ b/polly/distinfo
@@ -1,5 +1,5 @@
 $NetBSD: distinfo,v 1.29 2023/01/12 19:32:53 adam Exp $
 
-BLAKE2s (llvm-project-21.1.7.src.tar.xz) = 28c3b235070e74f525e7d7be33de0c5e2a3ad5e5a5673d5320e726a532f0139c
-SHA512 (llvm-project-21.1.7.src.tar.xz) = ae30a53ed929df979849f7433bf705bc3d540aa9e12a02a175eb2483d1a56f9ca1203c9b67795f6e84cf2407c28d46d5d5351b290d8735adb5206103fee6f379
-Size (llvm-project-21.1.7.src.tar.xz) = 158956584 bytes
+BLAKE2s (llvm-project-21.1.8.src.tar.xz) = e6db98fed167ddd56b49c7eb46c4de7e7e8e08158e9c99ae79806983bcb60ae9
+SHA512 (llvm-project-21.1.8.src.tar.xz) = cae4c44e7bf678071723da63ad5839491d717a7233e7f4791aa408207f3ea42f52de939ad15189b112c02a0770f1bb8d59bae6ad31ef53417a6eea7770fe52ab
+Size (llvm-project-21.1.8.src.tar.xz) = 158958576 bytes
diff --git a/wasi-libc/Makefile b/wasi-libc/Makefile
index 708859fa53..9ce1d7e8c0 100644
--- a/wasi-libc/Makefile
+++ b/wasi-libc/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.11 2023/04/19 08:10:36 adam Exp $
+# $NetBSD: Makefile,v 1.24 2025/08/26 07:53:56 ryoon Exp $
 
-GITHUB_PROJECT=	wasi-libc
-GITHUB_TAG=	079adff840032c3455eb1cb34dc9ceaa0b2bfc0c
-DISTNAME=	wasi-libc-0.0.0pre20220311
-PKGREVISION=	3
+DISTNAME=	wasi-libc-0.0.0pre20250809
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GITHUB:=WebAssembly/}
+GITHUB_PROJECT=	wasi-libc
+GITHUB_TAG=	08799da37ae52955427ebec1336b49d6a8eb5051
 
-GITHUB_SUBMODULES+=	WebAssembly WASI 3423c9c83c7219095d6e67faaf62598ad370064c wasi/tools/wasi-headers/WASI
+GITHUB_SUBMODULES+=	WebAssembly WASI 59cbe140561db52fc505555e859de884e0ee7f00 tools/wasi-headers/WASI
 EXTRACT_USING=		bsdtar
 
 MAINTAINER=	ryoon%NetBSD.org@localhost
@@ -15,10 +14,17 @@ HOMEPAGE=	https://github.com/WebAssembly/wasi-libc/
 COMMENT=	libc for WebAssembly programs built on top of WASI
 LICENSE=	mit AND apache-2.0 # apache-2.0-with-LLVM-exception
 
+BUILTINSFILE=		libclang_rt.builtins-wasm32-wasi-25.0.tar.gz
+DISTFILES=		${DEFAULT_DISTFILES} ${BUILTINSFILE}
+SITES.${BUILTINSFILE}=	https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-25/
+
 # Do not fail tests and compile time error (undefined symbols) in www/firefox.
 SSP_SUPPORTED=		no
 PKGSRC_USE_STACK_CHECK=	no
 
+# clang/wasm does not accept RELRO flags.
+RELRO_SUPPORTED=	no
+
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == "NetBSD"
 .  if ${OPSYS_VERSION} < 099900
@@ -27,32 +33,39 @@ TOOLS_PLATFORM.find=	# empty
 .  endif
 .endif
 
-USE_TOOLS+=	gmake
+USE_TOOLS+=	bash gmake
+REPLACE_BASH+=	scripts/install-include-headers.sh
 
 # Do not crush clang-13
 BUILDLINK_TRANSFORM+=	rm:-fcommon
+BUILDLINK_TRANSFORM+=	rm:-Werror
 
-MAKE_FLAGS+=	WASM_CC=clang
-MAKE_FLAGS+=	WASM_AR=${PREFIX}/bin/llvm-ar
-MAKE_FLAGS+=	WASM_NM=${PREFIX}/bin/llvm-nm
+MAKE_FLAGS+=	CC=clang
+MAKE_FLAGS+=	AR=${PREFIX}/bin/llvm-ar
+MAKE_FLAGS+=	NM=${PREFIX}/bin/llvm-nm
 MAKE_FLAGS+=	INSTALL_DIR=${DESTDIR}${PREFIX}/wasi
-BUILD_TARGET=	finish
+#BUILD_TARGET=	finish
+BUILD_TARGET=	no-check-symbols
 
 # iconv.h from libiconv get pulled in on SunOS (via clang)
 # It conflicts with musl libc so must be removed.
 pre-configure:
 	rm -f ${BUILDLINK_DIR}/include/iconv.h
+	${MKDIR} ${WRKSRC}/build/wasm32-wasi/resource-dir/lib/wasi
+	${MV} ${WRKDIR}/libclang_rt.builtins-wasm32-wasi-25.0/*.a \
+		${WRKSRC}/build/wasm32-wasi/resource-dir/lib/wasi
 
 ABI=			# 32
-CFLAGS=			-O2
-CXXFLAGS=		-O2
+CFLAGS+=		-O2
+CXXFLAGS+=		-O2
 PKGSRC_COMPILER=	clang
 CLANGBASE=		${PREFIX}
 BUILDLINK_DEPMETHOD.clang=	build
-.include "../../wip/clang/buildlink3.mk"
+.include "../../lang/clang/buildlink3.mk"
 BUILDLINK_DEPMETHOD.llvm=	build
-.include "../../wip/llvm/buildlink3.mk"
+.include "../../lang/llvm/buildlink3.mk"
 .if empty(PKG_BUILD_OPTIONS.llvm:Mllvm-target-webassembly)
 PKG_FAIL_REASON+=	"llvm-target-webassembly PKG_OPTION must be enabled in lang/llvm"
 .endif
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/wasi-libc/PLIST b/wasi-libc/PLIST
index 76609acab5..0dbe7d1fbe 100644
--- a/wasi-libc/PLIST
+++ b/wasi-libc/PLIST
@@ -1,219 +1,224 @@
-@comment $NetBSD: PLIST,v 1.1 2021/12/19 13:38:56 ryoon Exp $
-wasi/include/__errno.h
-wasi/include/__errno_values.h
-wasi/include/__fd_set.h
-wasi/include/__function___isatty.h
-wasi/include/__functions_malloc.h
-wasi/include/__functions_memcpy.h
-wasi/include/__header_dirent.h
-wasi/include/__header_fcntl.h
-wasi/include/__header_inttypes.h
-wasi/include/__header_netinet_in.h
-wasi/include/__header_poll.h
-wasi/include/__header_stdlib.h
-wasi/include/__header_string.h
-wasi/include/__header_sys_ioctl.h
-wasi/include/__header_sys_resource.h
-wasi/include/__header_sys_socket.h
-wasi/include/__header_sys_stat.h
-wasi/include/__header_time.h
-wasi/include/__header_unistd.h
-wasi/include/__macro_FD_SETSIZE.h
-wasi/include/__macro_PAGESIZE.h
-wasi/include/__mode_t.h
-wasi/include/__seek.h
-wasi/include/__struct_dirent.h
-wasi/include/__struct_in6_addr.h
-wasi/include/__struct_in_addr.h
-wasi/include/__struct_iovec.h
-wasi/include/__struct_msghdr.h
-wasi/include/__struct_pollfd.h
-wasi/include/__struct_rusage.h
-wasi/include/__struct_sockaddr.h
-wasi/include/__struct_sockaddr_in.h
-wasi/include/__struct_sockaddr_in6.h
-wasi/include/__struct_sockaddr_storage.h
-wasi/include/__struct_sockaddr_un.h
-wasi/include/__struct_stat.h
-wasi/include/__struct_timespec.h
-wasi/include/__struct_timeval.h
-wasi/include/__struct_tm.h
-wasi/include/__struct_tms.h
-wasi/include/__typedef_DIR.h
-wasi/include/__typedef_blkcnt_t.h
-wasi/include/__typedef_blksize_t.h
-wasi/include/__typedef_clock_t.h
-wasi/include/__typedef_clockid_t.h
-wasi/include/__typedef_dev_t.h
-wasi/include/__typedef_fd_set.h
-wasi/include/__typedef_gid_t.h
-wasi/include/__typedef_in_addr_t.h
-wasi/include/__typedef_in_port_t.h
-wasi/include/__typedef_ino_t.h
-wasi/include/__typedef_mode_t.h
-wasi/include/__typedef_nfds_t.h
-wasi/include/__typedef_nlink_t.h
-wasi/include/__typedef_off_t.h
-wasi/include/__typedef_sa_family_t.h
-wasi/include/__typedef_sigset_t.h
-wasi/include/__typedef_socklen_t.h
-wasi/include/__typedef_ssize_t.h
-wasi/include/__typedef_suseconds_t.h
-wasi/include/__typedef_time_t.h
-wasi/include/__typedef_uid_t.h
-wasi/include/alloca.h
-wasi/include/ar.h
-wasi/include/arpa/ftp.h
-wasi/include/arpa/inet.h
-wasi/include/arpa/nameser.h
-wasi/include/arpa/nameser_compat.h
-wasi/include/arpa/telnet.h
-wasi/include/arpa/tftp.h
-wasi/include/assert.h
-wasi/include/bits/alltypes.h
-wasi/include/bits/dirent.h
-wasi/include/bits/fcntl.h
-wasi/include/bits/fenv.h
-wasi/include/bits/float.h
-wasi/include/bits/hwcap.h
-wasi/include/bits/io.h
-wasi/include/bits/ioctl.h
-wasi/include/bits/ioctl_fix.h
-wasi/include/bits/ipcstat.h
-wasi/include/bits/limits.h
-wasi/include/bits/mman.h
-wasi/include/bits/poll.h
-wasi/include/bits/posix.h
-wasi/include/bits/reg.h
-wasi/include/bits/resource.h
-wasi/include/bits/signal.h
-wasi/include/bits/socket.h
-wasi/include/bits/stat.h
-wasi/include/bits/stdint.h
-wasi/include/byteswap.h
-wasi/include/complex.h
-wasi/include/cpio.h
-wasi/include/crypt.h
-wasi/include/ctype.h
-wasi/include/dirent.h
-wasi/include/endian.h
-wasi/include/err.h
-wasi/include/errno.h
-wasi/include/fcntl.h
-wasi/include/features.h
-wasi/include/fenv.h
-wasi/include/float.h
-wasi/include/fmtmsg.h
-wasi/include/fnmatch.h
-wasi/include/ftw.h
-wasi/include/getopt.h
-wasi/include/glob.h
-wasi/include/iconv.h
-wasi/include/ifaddrs.h
-wasi/include/inttypes.h
-wasi/include/iso646.h
-wasi/include/langinfo.h
-wasi/include/libgen.h
-wasi/include/limits.h
-wasi/include/locale.h
-wasi/include/malloc.h
-wasi/include/math.h
-wasi/include/memory.h
-wasi/include/monetary.h
-wasi/include/mqueue.h
-wasi/include/netinet/icmp6.h
-wasi/include/netinet/igmp.h
-wasi/include/netinet/in.h
-wasi/include/netinet/in_systm.h
-wasi/include/netinet/ip.h
-wasi/include/netinet/ip6.h
-wasi/include/netinet/ip_icmp.h
-wasi/include/netinet/tcp.h
-wasi/include/netinet/udp.h
-wasi/include/netpacket/packet.h
-wasi/include/nl_types.h
-wasi/include/poll.h
-wasi/include/regex.h
-wasi/include/sched.h
-wasi/include/search.h
-wasi/include/semaphore.h
-wasi/include/signal.h
-wasi/include/stdalign.h
-wasi/include/stdbool.h
-wasi/include/stdc-predef.h
-wasi/include/stdint.h
-wasi/include/stdio.h
-wasi/include/stdio_ext.h
-wasi/include/stdlib.h
-wasi/include/stdnoreturn.h
-wasi/include/string.h
-wasi/include/strings.h
-wasi/include/stropts.h
-wasi/include/sys/dir.h
-wasi/include/sys/errno.h
-wasi/include/sys/eventfd.h
-wasi/include/sys/fcntl.h
-wasi/include/sys/file.h
-wasi/include/sys/ioctl.h
-wasi/include/sys/mman.h
-wasi/include/sys/param.h
-wasi/include/sys/poll.h
-wasi/include/sys/random.h
-wasi/include/sys/reg.h
-wasi/include/sys/resource.h
-wasi/include/sys/select.h
-wasi/include/sys/signal.h
-wasi/include/sys/socket.h
-wasi/include/sys/stat.h
-wasi/include/sys/stropts.h
-wasi/include/sys/syscall.h
-wasi/include/sys/sysinfo.h
-wasi/include/sys/time.h
-wasi/include/sys/timeb.h
-wasi/include/sys/times.h
-wasi/include/sys/timex.h
-wasi/include/sys/ttydefaults.h
-wasi/include/sys/types.h
-wasi/include/sys/uio.h
-wasi/include/sys/un.h
-wasi/include/sys/utsname.h
-wasi/include/syscall.h
-wasi/include/sysexits.h
-wasi/include/tar.h
-wasi/include/tgmath.h
-wasi/include/threads.h
-wasi/include/time.h
-wasi/include/uchar.h
-wasi/include/unistd.h
-wasi/include/utime.h
-wasi/include/values.h
-wasi/include/wasi/api.h
-wasi/include/wasi/libc-environ.h
-wasi/include/wasi/libc-find-relpath.h
-wasi/include/wasi/libc-nocwd.h
-wasi/include/wasi/libc.h
-wasi/include/wchar.h
-wasi/include/wctype.h
+@comment $NetBSD: PLIST,v 1.2 2025/08/16 01:20:27 ryoon Exp $
+wasi/include/wasm32-wasi/__errno.h
+wasi/include/wasm32-wasi/__errno_values.h
+wasi/include/wasm32-wasi/__fd_set.h
+wasi/include/wasm32-wasi/__function___isatty.h
+wasi/include/wasm32-wasi/__functions_malloc.h
+wasi/include/wasm32-wasi/__functions_memcpy.h
+wasi/include/wasm32-wasi/__header_dirent.h
+wasi/include/wasm32-wasi/__header_fcntl.h
+wasi/include/wasm32-wasi/__header_inttypes.h
+wasi/include/wasm32-wasi/__header_netinet_in.h
+wasi/include/wasm32-wasi/__header_poll.h
+wasi/include/wasm32-wasi/__header_stdlib.h
+wasi/include/wasm32-wasi/__header_string.h
+wasi/include/wasm32-wasi/__header_sys_ioctl.h
+wasi/include/wasm32-wasi/__header_sys_resource.h
+wasi/include/wasm32-wasi/__header_sys_socket.h
+wasi/include/wasm32-wasi/__header_sys_stat.h
+wasi/include/wasm32-wasi/__header_time.h
+wasi/include/wasm32-wasi/__header_unistd.h
+wasi/include/wasm32-wasi/__macro_FD_SETSIZE.h
+wasi/include/wasm32-wasi/__macro_PAGESIZE.h
+wasi/include/wasm32-wasi/__mode_t.h
+wasi/include/wasm32-wasi/__seek.h
+wasi/include/wasm32-wasi/__struct_dirent.h
+wasi/include/wasm32-wasi/__struct_in6_addr.h
+wasi/include/wasm32-wasi/__struct_in_addr.h
+wasi/include/wasm32-wasi/__struct_iovec.h
+wasi/include/wasm32-wasi/__struct_msghdr.h
+wasi/include/wasm32-wasi/__struct_pollfd.h
+wasi/include/wasm32-wasi/__struct_rusage.h
+wasi/include/wasm32-wasi/__struct_sockaddr.h
+wasi/include/wasm32-wasi/__struct_sockaddr_in.h
+wasi/include/wasm32-wasi/__struct_sockaddr_in6.h
+wasi/include/wasm32-wasi/__struct_sockaddr_storage.h
+wasi/include/wasm32-wasi/__struct_sockaddr_un.h
+wasi/include/wasm32-wasi/__struct_stat.h
+wasi/include/wasm32-wasi/__struct_timespec.h
+wasi/include/wasm32-wasi/__struct_timeval.h
+wasi/include/wasm32-wasi/__struct_tm.h
+wasi/include/wasm32-wasi/__struct_tms.h
+wasi/include/wasm32-wasi/__typedef_DIR.h
+wasi/include/wasm32-wasi/__typedef_blkcnt_t.h
+wasi/include/wasm32-wasi/__typedef_blksize_t.h
+wasi/include/wasm32-wasi/__typedef_clock_t.h
+wasi/include/wasm32-wasi/__typedef_clockid_t.h
+wasi/include/wasm32-wasi/__typedef_dev_t.h
+wasi/include/wasm32-wasi/__typedef_fd_set.h
+wasi/include/wasm32-wasi/__typedef_gid_t.h
+wasi/include/wasm32-wasi/__typedef_in_addr_t.h
+wasi/include/wasm32-wasi/__typedef_in_port_t.h
+wasi/include/wasm32-wasi/__typedef_ino_t.h
+wasi/include/wasm32-wasi/__typedef_mode_t.h
+wasi/include/wasm32-wasi/__typedef_nfds_t.h
+wasi/include/wasm32-wasi/__typedef_nlink_t.h
+wasi/include/wasm32-wasi/__typedef_off_t.h
+wasi/include/wasm32-wasi/__typedef_sa_family_t.h
+wasi/include/wasm32-wasi/__typedef_sigset_t.h
+wasi/include/wasm32-wasi/__typedef_socklen_t.h
+wasi/include/wasm32-wasi/__typedef_ssize_t.h
+wasi/include/wasm32-wasi/__typedef_suseconds_t.h
+wasi/include/wasm32-wasi/__typedef_time_t.h
+wasi/include/wasm32-wasi/__typedef_uid_t.h
+wasi/include/wasm32-wasi/__wasi_snapshot.h
+wasi/include/wasm32-wasi/alloca.h
+wasi/include/wasm32-wasi/ar.h
+wasi/include/wasm32-wasi/arpa/ftp.h
+wasi/include/wasm32-wasi/arpa/inet.h
+wasi/include/wasm32-wasi/arpa/nameser.h
+wasi/include/wasm32-wasi/arpa/nameser_compat.h
+wasi/include/wasm32-wasi/arpa/telnet.h
+wasi/include/wasm32-wasi/arpa/tftp.h
+wasi/include/wasm32-wasi/assert.h
+wasi/include/wasm32-wasi/bits/alltypes.h
+wasi/include/wasm32-wasi/bits/dirent.h
+wasi/include/wasm32-wasi/bits/fcntl.h
+wasi/include/wasm32-wasi/bits/fenv.h
+wasi/include/wasm32-wasi/bits/float.h
+wasi/include/wasm32-wasi/bits/hwcap.h
+wasi/include/wasm32-wasi/bits/io.h
+wasi/include/wasm32-wasi/bits/ioctl.h
+wasi/include/wasm32-wasi/bits/ioctl_fix.h
+wasi/include/wasm32-wasi/bits/ipcstat.h
+wasi/include/wasm32-wasi/bits/limits.h
+wasi/include/wasm32-wasi/bits/mman.h
+wasi/include/wasm32-wasi/bits/poll.h
+wasi/include/wasm32-wasi/bits/posix.h
+wasi/include/wasm32-wasi/bits/reg.h
+wasi/include/wasm32-wasi/bits/resource.h
+wasi/include/wasm32-wasi/bits/setjmp.h
+wasi/include/wasm32-wasi/bits/signal.h
+wasi/include/wasm32-wasi/bits/socket.h
+wasi/include/wasm32-wasi/bits/stat.h
+wasi/include/wasm32-wasi/bits/stdint.h
+wasi/include/wasm32-wasi/byteswap.h
+wasi/include/wasm32-wasi/complex.h
+wasi/include/wasm32-wasi/cpio.h
+wasi/include/wasm32-wasi/crypt.h
+wasi/include/wasm32-wasi/ctype.h
+wasi/include/wasm32-wasi/dirent.h
+wasi/include/wasm32-wasi/dlfcn.h
+wasi/include/wasm32-wasi/endian.h
+wasi/include/wasm32-wasi/err.h
+wasi/include/wasm32-wasi/errno.h
+wasi/include/wasm32-wasi/fcntl.h
+wasi/include/wasm32-wasi/features.h
+wasi/include/wasm32-wasi/fenv.h
+wasi/include/wasm32-wasi/float.h
+wasi/include/wasm32-wasi/fmtmsg.h
+wasi/include/wasm32-wasi/fnmatch.h
+wasi/include/wasm32-wasi/fts.h
+wasi/include/wasm32-wasi/ftw.h
+wasi/include/wasm32-wasi/getopt.h
+wasi/include/wasm32-wasi/glob.h
+wasi/include/wasm32-wasi/iconv.h
+wasi/include/wasm32-wasi/ifaddrs.h
+wasi/include/wasm32-wasi/inttypes.h
+wasi/include/wasm32-wasi/iso646.h
+wasi/include/wasm32-wasi/langinfo.h
+wasi/include/wasm32-wasi/libgen.h
+wasi/include/wasm32-wasi/limits.h
+wasi/include/wasm32-wasi/locale.h
+wasi/include/wasm32-wasi/malloc.h
+wasi/include/wasm32-wasi/math.h
+wasi/include/wasm32-wasi/memory.h
+wasi/include/wasm32-wasi/monetary.h
+wasi/include/wasm32-wasi/mqueue.h
+wasi/include/wasm32-wasi/netinet/icmp6.h
+wasi/include/wasm32-wasi/netinet/igmp.h
+wasi/include/wasm32-wasi/netinet/in.h
+wasi/include/wasm32-wasi/netinet/in_systm.h
+wasi/include/wasm32-wasi/netinet/ip.h
+wasi/include/wasm32-wasi/netinet/ip6.h
+wasi/include/wasm32-wasi/netinet/ip_icmp.h
+wasi/include/wasm32-wasi/netinet/tcp.h
+wasi/include/wasm32-wasi/netinet/udp.h
+wasi/include/wasm32-wasi/netpacket/packet.h
+wasi/include/wasm32-wasi/nl_types.h
+wasi/include/wasm32-wasi/poll.h
+wasi/include/wasm32-wasi/pthread.h
+wasi/include/wasm32-wasi/regex.h
+wasi/include/wasm32-wasi/sched.h
+wasi/include/wasm32-wasi/search.h
+wasi/include/wasm32-wasi/semaphore.h
+wasi/include/wasm32-wasi/setjmp.h
+wasi/include/wasm32-wasi/signal.h
+wasi/include/wasm32-wasi/stdalign.h
+wasi/include/wasm32-wasi/stdbool.h
+wasi/include/wasm32-wasi/stdc-predef.h
+wasi/include/wasm32-wasi/stdint.h
+wasi/include/wasm32-wasi/stdio.h
+wasi/include/wasm32-wasi/stdio_ext.h
+wasi/include/wasm32-wasi/stdlib.h
+wasi/include/wasm32-wasi/stdnoreturn.h
+wasi/include/wasm32-wasi/string.h
+wasi/include/wasm32-wasi/strings.h
+wasi/include/wasm32-wasi/stropts.h
+wasi/include/wasm32-wasi/sys/dir.h
+wasi/include/wasm32-wasi/sys/errno.h
+wasi/include/wasm32-wasi/sys/eventfd.h
+wasi/include/wasm32-wasi/sys/fcntl.h
+wasi/include/wasm32-wasi/sys/file.h
+wasi/include/wasm32-wasi/sys/ioctl.h
+wasi/include/wasm32-wasi/sys/mman.h
+wasi/include/wasm32-wasi/sys/param.h
+wasi/include/wasm32-wasi/sys/poll.h
+wasi/include/wasm32-wasi/sys/random.h
+wasi/include/wasm32-wasi/sys/reg.h
+wasi/include/wasm32-wasi/sys/resource.h
+wasi/include/wasm32-wasi/sys/select.h
+wasi/include/wasm32-wasi/sys/signal.h
+wasi/include/wasm32-wasi/sys/socket.h
+wasi/include/wasm32-wasi/sys/stat.h
+wasi/include/wasm32-wasi/sys/statvfs.h
+wasi/include/wasm32-wasi/sys/stropts.h
+wasi/include/wasm32-wasi/sys/syscall.h
+wasi/include/wasm32-wasi/sys/sysinfo.h
+wasi/include/wasm32-wasi/sys/time.h
+wasi/include/wasm32-wasi/sys/timeb.h
+wasi/include/wasm32-wasi/sys/times.h
+wasi/include/wasm32-wasi/sys/timex.h
+wasi/include/wasm32-wasi/sys/ttydefaults.h
+wasi/include/wasm32-wasi/sys/types.h
+wasi/include/wasm32-wasi/sys/uio.h
+wasi/include/wasm32-wasi/sys/un.h
+wasi/include/wasm32-wasi/sys/utsname.h
+wasi/include/wasm32-wasi/syscall.h
+wasi/include/wasm32-wasi/sysexits.h
+wasi/include/wasm32-wasi/tar.h
+wasi/include/wasm32-wasi/tgmath.h
+wasi/include/wasm32-wasi/threads.h
+wasi/include/wasm32-wasi/time.h
+wasi/include/wasm32-wasi/uchar.h
+wasi/include/wasm32-wasi/unistd.h
+wasi/include/wasm32-wasi/utime.h
+wasi/include/wasm32-wasi/values.h
+wasi/include/wasm32-wasi/wasi/api.h
+wasi/include/wasm32-wasi/wasi/libc-busywait.h
+wasi/include/wasm32-wasi/wasi/libc-environ.h
+wasi/include/wasm32-wasi/wasi/libc-find-relpath.h
+wasi/include/wasm32-wasi/wasi/libc-nocwd.h
+wasi/include/wasm32-wasi/wasi/libc.h
+wasi/include/wasm32-wasi/wasi/wasip2.h
+wasi/include/wasm32-wasi/wchar.h
+wasi/include/wasm32-wasi/wctype.h
 wasi/lib/wasm32-wasi/crt1-command.o
 wasi/lib/wasm32-wasi/crt1-reactor.o
 wasi/lib/wasm32-wasi/crt1.o
 wasi/lib/wasm32-wasi/libc-printscan-long-double.a
 wasi/lib/wasm32-wasi/libc-printscan-no-floating-point.a
 wasi/lib/wasm32-wasi/libc.a
-wasi/lib/wasm32-wasi/libc.imports
 wasi/lib/wasm32-wasi/libcrypt.a
 wasi/lib/wasm32-wasi/libdl.a
 wasi/lib/wasm32-wasi/libm.a
 wasi/lib/wasm32-wasi/libpthread.a
 wasi/lib/wasm32-wasi/libresolv.a
 wasi/lib/wasm32-wasi/librt.a
+wasi/lib/wasm32-wasi/libsetjmp.a
 wasi/lib/wasm32-wasi/libutil.a
 wasi/lib/wasm32-wasi/libwasi-emulated-getpid.a
 wasi/lib/wasm32-wasi/libwasi-emulated-mman.a
 wasi/lib/wasm32-wasi/libwasi-emulated-process-clocks.a
 wasi/lib/wasm32-wasi/libwasi-emulated-signal.a
 wasi/lib/wasm32-wasi/libxnet.a
-wasi/share/wasm32-wasi/defined-symbols.txt
-wasi/share/wasm32-wasi/include-all.c
-wasi/share/wasm32-wasi/predefined-macros.txt
-wasi/share/wasm32-wasi/undefined-symbols.txt
diff --git a/wasi-libc/distinfo b/wasi-libc/distinfo
index e902ccbc0f..abeb7d0b18 100644
--- a/wasi-libc/distinfo
+++ b/wasi-libc/distinfo
@@ -1,9 +1,13 @@
 $NetBSD: distinfo,v 1.2 2022/03/15 14:33:22 wiz Exp $
 
-BLAKE2s (WebAssembly-WASI-3423c9c83c7219095d6e67faaf62598ad370064c.tar.gz) = 50040bba05e7685e002650788f5692c61f489bbf3aee20d1b8b70a0be5fec957
-SHA512 (WebAssembly-WASI-3423c9c83c7219095d6e67faaf62598ad370064c.tar.gz) = b96f2c6a2d777fa721e10cf24f8d11b71bac3c9ee308b2c223daf0477feaf6cd300897dba18d220c30a34cd34fb29f7545f4b393fc60f8b91ba0a1538b787c14
-Size (WebAssembly-WASI-3423c9c83c7219095d6e67faaf62598ad370064c.tar.gz) = 200976 bytes
-BLAKE2s (wasi-libc-0.0.0pre20220311-079adff840032c3455eb1cb34dc9ceaa0b2bfc0c.tar.gz) = cc34906d02772ce0c7b2ce36c3282c7fe91495c3ff854b0688c75b5509ddb6ee
-SHA512 (wasi-libc-0.0.0pre20220311-079adff840032c3455eb1cb34dc9ceaa0b2bfc0c.tar.gz) = f79cee2be336614a4512a074b6909689ecee57baeb16b43602bf9551c778d176901d69db6c56f4d5561f32477c76a861a3c6c73edae651b6d4d83ee439c514df
-Size (wasi-libc-0.0.0pre20220311-079adff840032c3455eb1cb34dc9ceaa0b2bfc0c.tar.gz) = 1251437 bytes
-SHA1 (patch-Makefile) = d7b66d8f5172c1ee21de7ce8075d3f41d2ed0af0
+BLAKE2s (WebAssembly-WASI-59cbe140561db52fc505555e859de884e0ee7f00.tar.gz) = e13f04fd0def3ffba6758bc700db814329a3d8dbae6df82010b1bdb5f0fbf072
+SHA512 (WebAssembly-WASI-59cbe140561db52fc505555e859de884e0ee7f00.tar.gz) = 974228b9b4332f1805d6425a3bed2217604a63baa5ea751ebc106d57b6ec1d211453295f0a878c06bf92bc68d5173de1dffa18c56b6513e818b1d429dc312742
+Size (WebAssembly-WASI-59cbe140561db52fc505555e859de884e0ee7f00.tar.gz) = 162204 bytes
+BLAKE2s (libclang_rt.builtins-wasm32-wasi-25.0.tar.gz) = 6447e44d3c3c1cac011f69ed70de7217b10042d86cf3c3f90f0c84828a908771
+SHA512 (libclang_rt.builtins-wasm32-wasi-25.0.tar.gz) = eff32570d2480601d11126b0ba421632d544a8ba438be69040dd00c1933f2fcfde77eb8b45786859c49caf4fef2cc14b62ce03b6a67eed509fa4e74d9685dd81
+Size (libclang_rt.builtins-wasm32-wasi-25.0.tar.gz) = 128688 bytes
+BLAKE2s (wasi-libc-0.0.0pre20250809-08799da37ae52955427ebec1336b49d6a8eb5051.tar.gz) = 7359820b1543617f0ccf901625a9614cbce0735b81ab1e8c974adf9088c9ec24
+SHA512 (wasi-libc-0.0.0pre20250809-08799da37ae52955427ebec1336b49d6a8eb5051.tar.gz) = 3a1c0ba0d24fc0ff9bca936e4e747efa3c6f1f5177d005d99582674a5f96d88db63622145df0a4a6b128364a80193df14e7269bc144254b57a1402bf1e534730
+Size (wasi-libc-0.0.0pre20250809-08799da37ae52955427ebec1336b49d6a8eb5051.tar.gz) = 1473084 bytes
+SHA1 (patch-Makefile) = 2dc0f3ed86a2d57061d0dfe0d2fb9e13f444e6da
+SHA1 (patch-scripts_install-include-headers.sh) = d5232f85147f131726cad794187da62736f2580c
diff --git a/wasi-libc/patches/patch-Makefile b/wasi-libc/patches/patch-Makefile
index 60f271fa81..2d09479004 100644
--- a/wasi-libc/patches/patch-Makefile
+++ b/wasi-libc/patches/patch-Makefile
@@ -1,19 +1,39 @@
-$NetBSD: patch-Makefile,v 1.2 2022/03/15 14:33:23 wiz Exp $
+$NetBSD: patch-Makefile,v 1.5 2025/08/26 07:53:56 ryoon Exp $
 
-* Disable symbol comparison, it's fragile
+* Do not depend on previously installed wasi runtime.
 * Workaround for rebuild in install stage.
+* Do not install share/ in no-check-symbols case.
+* Disable symbol comparison, it's fragile
 
---- Makefile.orig	2022-03-10 22:14:40.000000000 +0000
+--- Makefile.orig	2025-08-08 15:50:22.000000000 +0000
 +++ Makefile
-@@ -545,9 +545,9 @@ check-symbols: startup_files libc
- 
- 	# Check that the computed metadata matches the expected metadata.
- 	# This ignores whitespace because on Windows the output has CRLF line endings.
--	diff -wur "$(CURDIR)/expected/$(MULTIARCH_TRIPLE)" "$(SYSROOT_SHARE)"
-+	#diff -wur "$(CURDIR)/expected/$(MULTIARCH_TRIPLE)" "$(SYSROOT_SHARE)"
+@@ -599,7 +599,7 @@ SYSTEM_BUILTINS_LIB := $(shell ${CC} ${C
+ SYSTEM_RESOURCE_DIR := $(shell ${CC} ${CFLAGS} -print-resource-dir)
+ BUILTINS_LIB_REL_1 := $(subst $(SYSTEM_RESOURCE_DIR),,$(SYSTEM_BUILTINS_LIB))
+ # Substitute '/' for '\' so Windows paths work
+-BUILTINS_LIB_REL := $(subst \,/,$(BUILTINS_LIB_REL_1))
++BUILTINS_LIB_REL := lib/wasi
+ TMP_RESOURCE_DIR := $(OBJDIR)/resource-dir
+ BUILTINS_LIB_PATH := $(TMP_RESOURCE_DIR)/$(BUILTINS_LIB_REL)
+ BUILTINS_LIB_DIR := $(dir $(BUILTINS_LIB_PATH))
+@@ -885,9 +885,9 @@ finish: check-symbols
+ endif
+ endif
  
 -install: finish
 +install:
  	mkdir -p "$(INSTALL_DIR)"
- 	cp -r "$(SYSROOT)/lib" "$(SYSROOT)/share" "$(SYSROOT)/include" "$(INSTALL_DIR)"
+-	cp -p -r "$(SYSROOT)/lib" "$(SYSROOT)/share" "$(SYSROOT)/include" "$(INSTALL_DIR)"
++	cp -p -r "$(SYSROOT)/lib" "$(SYSROOT)/include" "$(INSTALL_DIR)"
+ 
+ DEFINED_SYMBOLS = $(SYSROOT_SHARE)/defined-symbols.txt
+ UNDEFINED_SYMBOLS = $(SYSROOT_SHARE)/undefined-symbols.txt
+@@ -1018,7 +1018,7 @@ check-symbols: $(STARTUP_FILES) libc
+ 
+ 	# Check that the computed metadata matches the expected metadata.
+ 	# This ignores whitespace because on Windows the output has CRLF line endings.
+-	diff -wur "$(EXPECTED_TARGET_DIR)" "$(SYSROOT_SHARE)"
++	#diff -wur "$(EXPECTED_TARGET_DIR)" "$(SYSROOT_SHARE)"
+ 
  
+ ##### BINDINGS #################################################################
diff --git a/wasi-libc/patches/patch-scripts_install-include-headers.sh b/wasi-libc/patches/patch-scripts_install-include-headers.sh
new file mode 100644
index 0000000000..2eebf6bc4f
--- /dev/null
+++ b/wasi-libc/patches/patch-scripts_install-include-headers.sh
@@ -0,0 +1,18 @@
+$NetBSD: patch-scripts_install-include-headers.sh,v 1.1 2025/08/28 01:27:25 gutteridge Exp $
+
+Don't use "-v" with cp and rm, some platforms like SunOS don't
+support these flags.
+
+--- scripts/install-include-headers.sh.orig	2025-08-27 23:12:09.421796184 +0000
++++ scripts/install-include-headers.sh
+@@ -16,8 +16,8 @@ if [[ -z "${SYSROOT_INC}" || -z "${TARGE
+     exit 1
+ fi
+ # The commands are available for override to allow dry runs.
+-CP="${CP:-cp -v}"
+-RM="${RM:-rm -v}"
++CP="${CP:-cp}"
++RM="${RM:-rm}"
+ MKDIR="${MKDIR:-mkdir}"
+ SED="${SED:-sed}"
+ 
diff --git a/wasi-libcxx/Makefile b/wasi-libcxx/Makefile
index ca2357a183..199502bc9a 100644
--- a/wasi-libcxx/Makefile
+++ b/wasi-libcxx/Makefile
@@ -14,7 +14,7 @@ HOMEPAGE=	https://libcxxabi.llvm.org/
 COMMENT=	C++ Standard Librares (libc++/libc++abi) for WASI/WebAssembly
 LICENSE=	apache-2.0
 
-WRKSRC=		${WRKDIR}
+WRKSRC=		${WRKDIR}/${DISTNAME}
 
 TOOL_DEPENDS+=	lld-[0-9]*:../../wip/lld
 
@@ -33,7 +33,7 @@ SSP_SUPPORTED=		no
 PKGSRC_USE_STACK_CHECK=	no
 
 CMAKE_CONFIGURE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
-CMAKE_CONFIGURE_ARGS+=	-DLIBCXXABI_LIBCXX_INCLUDES=${WRKDIR}/libcxx/include
+#CMAKE_CONFIGURE_ARGS+=	-DLIBCXXABI_LIBCXX_INCLUDES=${WRKSRC}/libcxx/include
 CMAKE_CONFIGURE_ARGS+=	-DLIBCXXABI_USE_LLVM_UNWINDER=OFF
 CMAKE_CONFIGURE_ARGS+=	-DCMAKE_C_COMPILER_WORKS=1
 CMAKE_CONFIGURE_ARGS+=	-DCMAKE_CXX_COMPILER_WORKS=1
@@ -133,7 +133,7 @@ CMAKE_CONFIGURE_ARGS+=	-DCMAKE_CXX_LINK_FLAGS=${LDFLAGS:Q}
 CMAKE_CONFIGURE_ARGS+=	-DCMAKE_C_FLAGS=-fno-exceptions
 CMAKE_CONFIGURE_ARGS+=	-DCMAKE_CXX_FLAGS=-fno-exceptions
 CMAKE_CONFIGURE_ARGS+=	-DLIBCXX_CXX_ABI=system-libcxxabi
-CMAKE_CONFIGURE_ARGS+=	-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${WRKDIR}/libcxxabi/include
+CMAKE_CONFIGURE_ARGS+=	-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${WRKSRC}/libcxxabi/include
 
 CMAKE_INSTALL_PREFIX=	${PREFIX}/wasi
 
@@ -141,14 +141,14 @@ CMAKE_INSTALL_PREFIX=	${PREFIX}/wasi
 CPPFLAGS.NetBSD+=	-D__DEFINED_max_align_t=1
 
 post-extract:
-	${MKDIR} ${WRKDIR}/build_libcxx
-	${MKDIR} ${WRKDIR}/build_libcxxabi
+	${MKDIR} ${WRKSRC}/build_libcxx
+	${MKDIR} ${WRKSRC}/build_libcxxabi
 
 do-configure:
-	cd ${WRKSRC} && cd build_libcxx && \
+	cd ${WRKSRC}/build_libcxx && \
 	${PKGSRC_SETENV} ${_CONFIGURE_CMAKE_ENV} \
 		cmake ${CMAKE_CONFIGURE_ARGS} ../libcxx
-	cd ${WRKSRC} && cd build_libcxxabi && \
+	cd ${WRKSRC}/build_libcxxabi && \
 	${PKGSRC_SETENV} ${_CONFIGURE_CMAKE_ENV} \
 		cmake ${CMAKE_CONFIGURE_ARGS} ../libcxxabi
 
@@ -161,6 +161,7 @@ post-install:
 	${PREFIX}/bin/llvm-ranlib \
 	  ${DESTDIR}${PREFIX}/wasi/lib/wasm32-wasi/libc++abi.a
 
+.include "../../lang/python/tool.mk"
 .include "../../wip/llvm/buildlink3.mk"
 .include "../../wip/wasi-libc/buildlink3.mk"
 .include "../../wip/wasi-compiler-rt/buildlink3.mk"
diff --git a/wasi-libcxx/PLIST b/wasi-libcxx/PLIST
index 3abb320a84..3cd86a1464 100644
--- a/wasi-libcxx/PLIST
+++ b/wasi-libcxx/PLIST
@@ -23,9 +23,9 @@ wasi/include/c++/v1/__algorithm/find_first_of.h
 wasi/include/c++/v1/__algorithm/find_if.h
 wasi/include/c++/v1/__algorithm/find_if_not.h
 wasi/include/c++/v1/__algorithm/find_segment_if.h
-wasi/include/c++/v1/__algorithm/fold.h
 wasi/include/c++/v1/__algorithm/for_each.h
 wasi/include/c++/v1/__algorithm/for_each_n.h
+wasi/include/c++/v1/__algorithm/for_each_n_segment.h
 wasi/include/c++/v1/__algorithm/for_each_segment.h
 wasi/include/c++/v1/__algorithm/generate.h
 wasi/include/c++/v1/__algorithm/generate_n.h
@@ -65,6 +65,7 @@ wasi/include/c++/v1/__algorithm/move_backward.h
 wasi/include/c++/v1/__algorithm/next_permutation.h
 wasi/include/c++/v1/__algorithm/none_of.h
 wasi/include/c++/v1/__algorithm/nth_element.h
+wasi/include/c++/v1/__algorithm/out_value_result.h
 wasi/include/c++/v1/__algorithm/partial_sort.h
 wasi/include/c++/v1/__algorithm/partial_sort_copy.h
 wasi/include/c++/v1/__algorithm/partition.h
@@ -72,44 +73,16 @@ wasi/include/c++/v1/__algorithm/partition_copy.h
 wasi/include/c++/v1/__algorithm/partition_point.h
 wasi/include/c++/v1/__algorithm/pop_heap.h
 wasi/include/c++/v1/__algorithm/prev_permutation.h
-wasi/include/c++/v1/__algorithm/pstl_any_all_none_of.h
-wasi/include/c++/v1/__algorithm/pstl_backend.h
-wasi/include/c++/v1/__algorithm/pstl_backends/cpu_backend.h
-wasi/include/c++/v1/__algorithm/pstl_backends/cpu_backends/any_of.h
-wasi/include/c++/v1/__algorithm/pstl_backends/cpu_backends/backend.h
-wasi/include/c++/v1/__algorithm/pstl_backends/cpu_backends/fill.h
-wasi/include/c++/v1/__algorithm/pstl_backends/cpu_backends/find_if.h
-wasi/include/c++/v1/__algorithm/pstl_backends/cpu_backends/for_each.h
-wasi/include/c++/v1/__algorithm/pstl_backends/cpu_backends/libdispatch.h
-wasi/include/c++/v1/__algorithm/pstl_backends/cpu_backends/merge.h
-wasi/include/c++/v1/__algorithm/pstl_backends/cpu_backends/serial.h
-wasi/include/c++/v1/__algorithm/pstl_backends/cpu_backends/stable_sort.h
-wasi/include/c++/v1/__algorithm/pstl_backends/cpu_backends/thread.h
-wasi/include/c++/v1/__algorithm/pstl_backends/cpu_backends/transform.h
-wasi/include/c++/v1/__algorithm/pstl_backends/cpu_backends/transform_reduce.h
-wasi/include/c++/v1/__algorithm/pstl_copy.h
-wasi/include/c++/v1/__algorithm/pstl_count.h
-wasi/include/c++/v1/__algorithm/pstl_equal.h
-wasi/include/c++/v1/__algorithm/pstl_fill.h
-wasi/include/c++/v1/__algorithm/pstl_find.h
-wasi/include/c++/v1/__algorithm/pstl_for_each.h
-wasi/include/c++/v1/__algorithm/pstl_frontend_dispatch.h
-wasi/include/c++/v1/__algorithm/pstl_generate.h
-wasi/include/c++/v1/__algorithm/pstl_is_partitioned.h
-wasi/include/c++/v1/__algorithm/pstl_merge.h
-wasi/include/c++/v1/__algorithm/pstl_move.h
-wasi/include/c++/v1/__algorithm/pstl_replace.h
-wasi/include/c++/v1/__algorithm/pstl_rotate_copy.h
-wasi/include/c++/v1/__algorithm/pstl_sort.h
-wasi/include/c++/v1/__algorithm/pstl_stable_sort.h
-wasi/include/c++/v1/__algorithm/pstl_transform.h
+wasi/include/c++/v1/__algorithm/pstl.h
 wasi/include/c++/v1/__algorithm/push_heap.h
+wasi/include/c++/v1/__algorithm/radix_sort.h
 wasi/include/c++/v1/__algorithm/ranges_adjacent_find.h
 wasi/include/c++/v1/__algorithm/ranges_all_of.h
 wasi/include/c++/v1/__algorithm/ranges_any_of.h
 wasi/include/c++/v1/__algorithm/ranges_binary_search.h
 wasi/include/c++/v1/__algorithm/ranges_clamp.h
 wasi/include/c++/v1/__algorithm/ranges_contains.h
+wasi/include/c++/v1/__algorithm/ranges_contains_subrange.h
 wasi/include/c++/v1/__algorithm/ranges_copy.h
 wasi/include/c++/v1/__algorithm/ranges_copy_backward.h
 wasi/include/c++/v1/__algorithm/ranges_copy_if.h
@@ -126,6 +99,8 @@ wasi/include/c++/v1/__algorithm/ranges_find_end.h
 wasi/include/c++/v1/__algorithm/ranges_find_first_of.h
 wasi/include/c++/v1/__algorithm/ranges_find_if.h
 wasi/include/c++/v1/__algorithm/ranges_find_if_not.h
+wasi/include/c++/v1/__algorithm/ranges_find_last.h
+wasi/include/c++/v1/__algorithm/ranges_fold.h
 wasi/include/c++/v1/__algorithm/ranges_for_each.h
 wasi/include/c++/v1/__algorithm/ranges_for_each_n.h
 wasi/include/c++/v1/__algorithm/ranges_generate.h
@@ -216,6 +191,7 @@ wasi/include/c++/v1/__algorithm/shift_left.h
 wasi/include/c++/v1/__algorithm/shift_right.h
 wasi/include/c++/v1/__algorithm/shuffle.h
 wasi/include/c++/v1/__algorithm/sift_down.h
+wasi/include/c++/v1/__algorithm/simd_utils.h
 wasi/include/c++/v1/__algorithm/sort.h
 wasi/include/c++/v1/__algorithm/sort_heap.h
 wasi/include/c++/v1/__algorithm/stable_partition.h
@@ -233,19 +209,21 @@ wasi/include/c++/v1/__assert
 wasi/include/c++/v1/__assertion_handler
 wasi/include/c++/v1/__atomic/aliases.h
 wasi/include/c++/v1/__atomic/atomic.h
-wasi/include/c++/v1/__atomic/atomic_base.h
 wasi/include/c++/v1/__atomic/atomic_flag.h
 wasi/include/c++/v1/__atomic/atomic_init.h
 wasi/include/c++/v1/__atomic/atomic_lock_free.h
+wasi/include/c++/v1/__atomic/atomic_ref.h
 wasi/include/c++/v1/__atomic/atomic_sync.h
 wasi/include/c++/v1/__atomic/check_memory_order.h
 wasi/include/c++/v1/__atomic/contention_t.h
-wasi/include/c++/v1/__atomic/cxx_atomic_impl.h
 wasi/include/c++/v1/__atomic/fence.h
 wasi/include/c++/v1/__atomic/is_always_lock_free.h
 wasi/include/c++/v1/__atomic/kill_dependency.h
 wasi/include/c++/v1/__atomic/memory_order.h
-wasi/include/c++/v1/__availability
+wasi/include/c++/v1/__atomic/support.h
+wasi/include/c++/v1/__atomic/support/c11.h
+wasi/include/c++/v1/__atomic/support/gcc.h
+wasi/include/c++/v1/__atomic/to_gcc_order.h
 wasi/include/c++/v1/__bit/bit_cast.h
 wasi/include/c++/v1/__bit/bit_ceil.h
 wasi/include/c++/v1/__bit/bit_floor.h
@@ -262,6 +240,7 @@ wasi/include/c++/v1/__bit/popcount.h
 wasi/include/c++/v1/__bit/rotate.h
 wasi/include/c++/v1/__bit_reference
 wasi/include/c++/v1/__charconv/chars_format.h
+wasi/include/c++/v1/__charconv/from_chars_floating_point.h
 wasi/include/c++/v1/__charconv/from_chars_integral.h
 wasi/include/c++/v1/__charconv/from_chars_result.h
 wasi/include/c++/v1/__charconv/tables.h
@@ -277,11 +256,15 @@ wasi/include/c++/v1/__chrono/convert_to_timespec.h
 wasi/include/c++/v1/__chrono/convert_to_tm.h
 wasi/include/c++/v1/__chrono/day.h
 wasi/include/c++/v1/__chrono/duration.h
+wasi/include/c++/v1/__chrono/exception.h
 wasi/include/c++/v1/__chrono/file_clock.h
 wasi/include/c++/v1/__chrono/formatter.h
+wasi/include/c++/v1/__chrono/gps_clock.h
 wasi/include/c++/v1/__chrono/hh_mm_ss.h
 wasi/include/c++/v1/__chrono/high_resolution_clock.h
+wasi/include/c++/v1/__chrono/leap_second.h
 wasi/include/c++/v1/__chrono/literals.h
+wasi/include/c++/v1/__chrono/local_info.h
 wasi/include/c++/v1/__chrono/month.h
 wasi/include/c++/v1/__chrono/month_weekday.h
 wasi/include/c++/v1/__chrono/monthday.h
@@ -289,15 +272,21 @@ wasi/include/c++/v1/__chrono/ostream.h
 wasi/include/c++/v1/__chrono/parser_std_format_spec.h
 wasi/include/c++/v1/__chrono/statically_widen.h
 wasi/include/c++/v1/__chrono/steady_clock.h
+wasi/include/c++/v1/__chrono/sys_info.h
 wasi/include/c++/v1/__chrono/system_clock.h
+wasi/include/c++/v1/__chrono/tai_clock.h
 wasi/include/c++/v1/__chrono/time_point.h
+wasi/include/c++/v1/__chrono/time_zone.h
+wasi/include/c++/v1/__chrono/time_zone_link.h
 wasi/include/c++/v1/__chrono/tzdb.h
 wasi/include/c++/v1/__chrono/tzdb_list.h
+wasi/include/c++/v1/__chrono/utc_clock.h
 wasi/include/c++/v1/__chrono/weekday.h
 wasi/include/c++/v1/__chrono/year.h
 wasi/include/c++/v1/__chrono/year_month.h
 wasi/include/c++/v1/__chrono/year_month_day.h
 wasi/include/c++/v1/__chrono/year_month_weekday.h
+wasi/include/c++/v1/__chrono/zoned_time.h
 wasi/include/c++/v1/__compare/common_comparison_category.h
 wasi/include/c++/v1/__compare/compare_partial_order_fallback.h
 wasi/include/c++/v1/__compare/compare_strong_order_fallback.h
@@ -336,12 +325,606 @@ wasi/include/c++/v1/__concepts/totally_ordered.h
 wasi/include/c++/v1/__condition_variable/condition_variable.h
 wasi/include/c++/v1/__config
 wasi/include/c++/v1/__config_site
+wasi/include/c++/v1/__configuration/abi.h
+wasi/include/c++/v1/__configuration/availability.h
+wasi/include/c++/v1/__configuration/compiler.h
+wasi/include/c++/v1/__configuration/language.h
+wasi/include/c++/v1/__configuration/platform.h
 wasi/include/c++/v1/__coroutine/coroutine_handle.h
 wasi/include/c++/v1/__coroutine/coroutine_traits.h
 wasi/include/c++/v1/__coroutine/noop_coroutine_handle.h
 wasi/include/c++/v1/__coroutine/trivial_awaitables.h
+wasi/include/c++/v1/__cstddef/byte.h
+wasi/include/c++/v1/__cstddef/max_align_t.h
+wasi/include/c++/v1/__cstddef/nullptr_t.h
+wasi/include/c++/v1/__cstddef/ptrdiff_t.h
+wasi/include/c++/v1/__cstddef/size_t.h
+wasi/include/c++/v1/__cxx03/__algorithm/adjacent_find.h
+wasi/include/c++/v1/__cxx03/__algorithm/all_of.h
+wasi/include/c++/v1/__cxx03/__algorithm/any_of.h
+wasi/include/c++/v1/__cxx03/__algorithm/binary_search.h
+wasi/include/c++/v1/__cxx03/__algorithm/comp.h
+wasi/include/c++/v1/__cxx03/__algorithm/comp_ref_type.h
+wasi/include/c++/v1/__cxx03/__algorithm/copy.h
+wasi/include/c++/v1/__cxx03/__algorithm/copy_backward.h
+wasi/include/c++/v1/__cxx03/__algorithm/copy_if.h
+wasi/include/c++/v1/__cxx03/__algorithm/copy_move_common.h
+wasi/include/c++/v1/__cxx03/__algorithm/copy_n.h
+wasi/include/c++/v1/__cxx03/__algorithm/count.h
+wasi/include/c++/v1/__cxx03/__algorithm/count_if.h
+wasi/include/c++/v1/__cxx03/__algorithm/equal.h
+wasi/include/c++/v1/__cxx03/__algorithm/equal_range.h
+wasi/include/c++/v1/__cxx03/__algorithm/fill.h
+wasi/include/c++/v1/__cxx03/__algorithm/fill_n.h
+wasi/include/c++/v1/__cxx03/__algorithm/find.h
+wasi/include/c++/v1/__cxx03/__algorithm/find_end.h
+wasi/include/c++/v1/__cxx03/__algorithm/find_first_of.h
+wasi/include/c++/v1/__cxx03/__algorithm/find_if.h
+wasi/include/c++/v1/__cxx03/__algorithm/find_if_not.h
+wasi/include/c++/v1/__cxx03/__algorithm/find_segment_if.h
+wasi/include/c++/v1/__cxx03/__algorithm/for_each.h
+wasi/include/c++/v1/__cxx03/__algorithm/for_each_segment.h
+wasi/include/c++/v1/__cxx03/__algorithm/generate.h
+wasi/include/c++/v1/__cxx03/__algorithm/generate_n.h
+wasi/include/c++/v1/__cxx03/__algorithm/half_positive.h
+wasi/include/c++/v1/__cxx03/__algorithm/includes.h
+wasi/include/c++/v1/__cxx03/__algorithm/inplace_merge.h
+wasi/include/c++/v1/__cxx03/__algorithm/is_heap.h
+wasi/include/c++/v1/__cxx03/__algorithm/is_heap_until.h
+wasi/include/c++/v1/__cxx03/__algorithm/is_partitioned.h
+wasi/include/c++/v1/__cxx03/__algorithm/is_permutation.h
+wasi/include/c++/v1/__cxx03/__algorithm/is_sorted.h
+wasi/include/c++/v1/__cxx03/__algorithm/is_sorted_until.h
+wasi/include/c++/v1/__cxx03/__algorithm/iter_swap.h
+wasi/include/c++/v1/__cxx03/__algorithm/iterator_operations.h
+wasi/include/c++/v1/__cxx03/__algorithm/lexicographical_compare.h
+wasi/include/c++/v1/__cxx03/__algorithm/lower_bound.h
+wasi/include/c++/v1/__cxx03/__algorithm/make_heap.h
+wasi/include/c++/v1/__cxx03/__algorithm/make_projected.h
+wasi/include/c++/v1/__cxx03/__algorithm/max.h
+wasi/include/c++/v1/__cxx03/__algorithm/max_element.h
+wasi/include/c++/v1/__cxx03/__algorithm/merge.h
+wasi/include/c++/v1/__cxx03/__algorithm/min.h
+wasi/include/c++/v1/__cxx03/__algorithm/min_element.h
+wasi/include/c++/v1/__cxx03/__algorithm/minmax.h
+wasi/include/c++/v1/__cxx03/__algorithm/minmax_element.h
+wasi/include/c++/v1/__cxx03/__algorithm/mismatch.h
+wasi/include/c++/v1/__cxx03/__algorithm/move.h
+wasi/include/c++/v1/__cxx03/__algorithm/move_backward.h
+wasi/include/c++/v1/__cxx03/__algorithm/next_permutation.h
+wasi/include/c++/v1/__cxx03/__algorithm/none_of.h
+wasi/include/c++/v1/__cxx03/__algorithm/nth_element.h
+wasi/include/c++/v1/__cxx03/__algorithm/partial_sort.h
+wasi/include/c++/v1/__cxx03/__algorithm/partial_sort_copy.h
+wasi/include/c++/v1/__cxx03/__algorithm/partition.h
+wasi/include/c++/v1/__cxx03/__algorithm/partition_copy.h
+wasi/include/c++/v1/__cxx03/__algorithm/partition_point.h
+wasi/include/c++/v1/__cxx03/__algorithm/pop_heap.h
+wasi/include/c++/v1/__cxx03/__algorithm/prev_permutation.h
+wasi/include/c++/v1/__cxx03/__algorithm/push_heap.h
+wasi/include/c++/v1/__cxx03/__algorithm/remove.h
+wasi/include/c++/v1/__cxx03/__algorithm/remove_copy.h
+wasi/include/c++/v1/__cxx03/__algorithm/remove_copy_if.h
+wasi/include/c++/v1/__cxx03/__algorithm/remove_if.h
+wasi/include/c++/v1/__cxx03/__algorithm/replace.h
+wasi/include/c++/v1/__cxx03/__algorithm/replace_copy.h
+wasi/include/c++/v1/__cxx03/__algorithm/replace_copy_if.h
+wasi/include/c++/v1/__cxx03/__algorithm/replace_if.h
+wasi/include/c++/v1/__cxx03/__algorithm/reverse.h
+wasi/include/c++/v1/__cxx03/__algorithm/reverse_copy.h
+wasi/include/c++/v1/__cxx03/__algorithm/rotate.h
+wasi/include/c++/v1/__cxx03/__algorithm/rotate_copy.h
+wasi/include/c++/v1/__cxx03/__algorithm/search.h
+wasi/include/c++/v1/__cxx03/__algorithm/search_n.h
+wasi/include/c++/v1/__cxx03/__algorithm/set_difference.h
+wasi/include/c++/v1/__cxx03/__algorithm/set_intersection.h
+wasi/include/c++/v1/__cxx03/__algorithm/set_symmetric_difference.h
+wasi/include/c++/v1/__cxx03/__algorithm/set_union.h
+wasi/include/c++/v1/__cxx03/__algorithm/shuffle.h
+wasi/include/c++/v1/__cxx03/__algorithm/sift_down.h
+wasi/include/c++/v1/__cxx03/__algorithm/simd_utils.h
+wasi/include/c++/v1/__cxx03/__algorithm/sort.h
+wasi/include/c++/v1/__cxx03/__algorithm/sort_heap.h
+wasi/include/c++/v1/__cxx03/__algorithm/stable_partition.h
+wasi/include/c++/v1/__cxx03/__algorithm/stable_sort.h
+wasi/include/c++/v1/__cxx03/__algorithm/swap_ranges.h
+wasi/include/c++/v1/__cxx03/__algorithm/three_way_comp_ref_type.h
+wasi/include/c++/v1/__cxx03/__algorithm/transform.h
+wasi/include/c++/v1/__cxx03/__algorithm/uniform_random_bit_generator_adaptor.h
+wasi/include/c++/v1/__cxx03/__algorithm/unique.h
+wasi/include/c++/v1/__cxx03/__algorithm/unique_copy.h
+wasi/include/c++/v1/__cxx03/__algorithm/unwrap_iter.h
+wasi/include/c++/v1/__cxx03/__algorithm/unwrap_range.h
+wasi/include/c++/v1/__cxx03/__algorithm/upper_bound.h
+wasi/include/c++/v1/__cxx03/__assert
+wasi/include/c++/v1/__cxx03/__atomic/aliases.h
+wasi/include/c++/v1/__cxx03/__atomic/atomic.h
+wasi/include/c++/v1/__cxx03/__atomic/atomic_base.h
+wasi/include/c++/v1/__cxx03/__atomic/atomic_flag.h
+wasi/include/c++/v1/__cxx03/__atomic/atomic_init.h
+wasi/include/c++/v1/__cxx03/__atomic/atomic_lock_free.h
+wasi/include/c++/v1/__cxx03/__atomic/atomic_sync.h
+wasi/include/c++/v1/__cxx03/__atomic/check_memory_order.h
+wasi/include/c++/v1/__cxx03/__atomic/contention_t.h
+wasi/include/c++/v1/__cxx03/__atomic/cxx_atomic_impl.h
+wasi/include/c++/v1/__cxx03/__atomic/fence.h
+wasi/include/c++/v1/__cxx03/__atomic/is_always_lock_free.h
+wasi/include/c++/v1/__cxx03/__atomic/kill_dependency.h
+wasi/include/c++/v1/__cxx03/__atomic/memory_order.h
+wasi/include/c++/v1/__cxx03/__atomic/to_gcc_order.h
+wasi/include/c++/v1/__cxx03/__bit/blsr.h
+wasi/include/c++/v1/__cxx03/__bit/countl.h
+wasi/include/c++/v1/__cxx03/__bit/countr.h
+wasi/include/c++/v1/__cxx03/__bit/invert_if.h
+wasi/include/c++/v1/__cxx03/__bit/popcount.h
+wasi/include/c++/v1/__cxx03/__bit/rotate.h
+wasi/include/c++/v1/__cxx03/__bit_reference
+wasi/include/c++/v1/__cxx03/__chrono/convert_to_timespec.h
+wasi/include/c++/v1/__cxx03/__chrono/duration.h
+wasi/include/c++/v1/__cxx03/__chrono/high_resolution_clock.h
+wasi/include/c++/v1/__cxx03/__chrono/steady_clock.h
+wasi/include/c++/v1/__cxx03/__chrono/system_clock.h
+wasi/include/c++/v1/__cxx03/__chrono/time_point.h
+wasi/include/c++/v1/__cxx03/__condition_variable/condition_variable.h
+wasi/include/c++/v1/__cxx03/__config
+wasi/include/c++/v1/__cxx03/__configuration/abi.h
+wasi/include/c++/v1/__cxx03/__configuration/availability.h
+wasi/include/c++/v1/__cxx03/__configuration/compiler.h
+wasi/include/c++/v1/__cxx03/__configuration/config_site_shim.h
+wasi/include/c++/v1/__cxx03/__configuration/language.h
+wasi/include/c++/v1/__cxx03/__configuration/platform.h
+wasi/include/c++/v1/__cxx03/__debug_utils/randomize_range.h
+wasi/include/c++/v1/__cxx03/__debug_utils/sanitizers.h
+wasi/include/c++/v1/__cxx03/__debug_utils/strict_weak_ordering_check.h
+wasi/include/c++/v1/__cxx03/__exception/exception.h
+wasi/include/c++/v1/__cxx03/__exception/exception_ptr.h
+wasi/include/c++/v1/__cxx03/__exception/nested_exception.h
+wasi/include/c++/v1/__cxx03/__exception/operations.h
+wasi/include/c++/v1/__cxx03/__exception/terminate.h
+wasi/include/c++/v1/__cxx03/__functional/binary_function.h
+wasi/include/c++/v1/__cxx03/__functional/binary_negate.h
+wasi/include/c++/v1/__cxx03/__functional/bind.h
+wasi/include/c++/v1/__cxx03/__functional/binder1st.h
+wasi/include/c++/v1/__cxx03/__functional/binder2nd.h
+wasi/include/c++/v1/__cxx03/__functional/hash.h
+wasi/include/c++/v1/__cxx03/__functional/identity.h
+wasi/include/c++/v1/__cxx03/__functional/mem_fn.h
+wasi/include/c++/v1/__cxx03/__functional/mem_fun_ref.h
+wasi/include/c++/v1/__cxx03/__functional/operations.h
+wasi/include/c++/v1/__cxx03/__functional/pointer_to_binary_function.h
+wasi/include/c++/v1/__cxx03/__functional/pointer_to_unary_function.h
+wasi/include/c++/v1/__cxx03/__functional/reference_wrapper.h
+wasi/include/c++/v1/__cxx03/__functional/unary_function.h
+wasi/include/c++/v1/__cxx03/__functional/unary_negate.h
+wasi/include/c++/v1/__cxx03/__functional/weak_result_type.h
+wasi/include/c++/v1/__cxx03/__fwd/array.h
+wasi/include/c++/v1/__cxx03/__fwd/bit_reference.h
+wasi/include/c++/v1/__cxx03/__fwd/complex.h
+wasi/include/c++/v1/__cxx03/__fwd/deque.h
+wasi/include/c++/v1/__cxx03/__fwd/fstream.h
+wasi/include/c++/v1/__cxx03/__fwd/functional.h
+wasi/include/c++/v1/__cxx03/__fwd/ios.h
+wasi/include/c++/v1/__cxx03/__fwd/istream.h
+wasi/include/c++/v1/__cxx03/__fwd/memory.h
+wasi/include/c++/v1/__cxx03/__fwd/ostream.h
+wasi/include/c++/v1/__cxx03/__fwd/pair.h
+wasi/include/c++/v1/__cxx03/__fwd/queue.h
+wasi/include/c++/v1/__cxx03/__fwd/sstream.h
+wasi/include/c++/v1/__cxx03/__fwd/stack.h
+wasi/include/c++/v1/__cxx03/__fwd/streambuf.h
+wasi/include/c++/v1/__cxx03/__fwd/string.h
+wasi/include/c++/v1/__cxx03/__fwd/string_view.h
+wasi/include/c++/v1/__cxx03/__fwd/tuple.h
+wasi/include/c++/v1/__cxx03/__fwd/vector.h
+wasi/include/c++/v1/__cxx03/__hash_table
+wasi/include/c++/v1/__cxx03/__ios/fpos.h
+wasi/include/c++/v1/__cxx03/__iterator/access.h
+wasi/include/c++/v1/__cxx03/__iterator/advance.h
+wasi/include/c++/v1/__cxx03/__iterator/aliasing_iterator.h
+wasi/include/c++/v1/__cxx03/__iterator/back_insert_iterator.h
+wasi/include/c++/v1/__cxx03/__iterator/bounded_iter.h
+wasi/include/c++/v1/__cxx03/__iterator/distance.h
+wasi/include/c++/v1/__cxx03/__iterator/erase_if_container.h
+wasi/include/c++/v1/__cxx03/__iterator/front_insert_iterator.h
+wasi/include/c++/v1/__cxx03/__iterator/insert_iterator.h
+wasi/include/c++/v1/__cxx03/__iterator/istream_iterator.h
+wasi/include/c++/v1/__cxx03/__iterator/istreambuf_iterator.h
+wasi/include/c++/v1/__cxx03/__iterator/iterator.h
+wasi/include/c++/v1/__cxx03/__iterator/iterator_traits.h
+wasi/include/c++/v1/__cxx03/__iterator/move_iterator.h
+wasi/include/c++/v1/__cxx03/__iterator/next.h
+wasi/include/c++/v1/__cxx03/__iterator/ostream_iterator.h
+wasi/include/c++/v1/__cxx03/__iterator/ostreambuf_iterator.h
+wasi/include/c++/v1/__cxx03/__iterator/prev.h
+wasi/include/c++/v1/__cxx03/__iterator/reverse_iterator.h
+wasi/include/c++/v1/__cxx03/__iterator/segmented_iterator.h
+wasi/include/c++/v1/__cxx03/__iterator/wrap_iter.h
+wasi/include/c++/v1/__cxx03/__locale
+wasi/include/c++/v1/__cxx03/__locale_dir/locale_base_api.h
+wasi/include/c++/v1/__cxx03/__locale_dir/locale_base_api/android.h
+wasi/include/c++/v1/__cxx03/__locale_dir/locale_base_api/bsd_locale_defaults.h
+wasi/include/c++/v1/__cxx03/__locale_dir/locale_base_api/bsd_locale_fallbacks.h
+wasi/include/c++/v1/__cxx03/__locale_dir/locale_base_api/fuchsia.h
+wasi/include/c++/v1/__cxx03/__locale_dir/locale_base_api/ibm.h
+wasi/include/c++/v1/__cxx03/__locale_dir/locale_base_api/locale_guard.h
+wasi/include/c++/v1/__cxx03/__locale_dir/locale_base_api/musl.h
+wasi/include/c++/v1/__cxx03/__locale_dir/locale_base_api/newlib.h
+wasi/include/c++/v1/__cxx03/__locale_dir/locale_base_api/openbsd.h
+wasi/include/c++/v1/__cxx03/__locale_dir/locale_base_api/win32.h
+wasi/include/c++/v1/__cxx03/__math/abs.h
+wasi/include/c++/v1/__cxx03/__math/copysign.h
+wasi/include/c++/v1/__cxx03/__math/error_functions.h
+wasi/include/c++/v1/__cxx03/__math/exponential_functions.h
+wasi/include/c++/v1/__cxx03/__math/fdim.h
+wasi/include/c++/v1/__cxx03/__math/fma.h
+wasi/include/c++/v1/__cxx03/__math/gamma.h
+wasi/include/c++/v1/__cxx03/__math/hyperbolic_functions.h
+wasi/include/c++/v1/__cxx03/__math/hypot.h
+wasi/include/c++/v1/__cxx03/__math/inverse_hyperbolic_functions.h
+wasi/include/c++/v1/__cxx03/__math/inverse_trigonometric_functions.h
+wasi/include/c++/v1/__cxx03/__math/logarithms.h
+wasi/include/c++/v1/__cxx03/__math/min_max.h
+wasi/include/c++/v1/__cxx03/__math/modulo.h
+wasi/include/c++/v1/__cxx03/__math/remainder.h
+wasi/include/c++/v1/__cxx03/__math/roots.h
+wasi/include/c++/v1/__cxx03/__math/rounding_functions.h
+wasi/include/c++/v1/__cxx03/__math/traits.h
+wasi/include/c++/v1/__cxx03/__math/trigonometric_functions.h
+wasi/include/c++/v1/__cxx03/__mbstate_t.h
+wasi/include/c++/v1/__cxx03/__memory/addressof.h
+wasi/include/c++/v1/__cxx03/__memory/align.h
+wasi/include/c++/v1/__cxx03/__memory/aligned_alloc.h
+wasi/include/c++/v1/__cxx03/__memory/allocate_at_least.h
+wasi/include/c++/v1/__cxx03/__memory/allocation_guard.h
+wasi/include/c++/v1/__cxx03/__memory/allocator.h
+wasi/include/c++/v1/__cxx03/__memory/allocator_arg_t.h
+wasi/include/c++/v1/__cxx03/__memory/allocator_destructor.h
+wasi/include/c++/v1/__cxx03/__memory/allocator_traits.h
+wasi/include/c++/v1/__cxx03/__memory/assume_aligned.h
+wasi/include/c++/v1/__cxx03/__memory/auto_ptr.h
+wasi/include/c++/v1/__cxx03/__memory/builtin_new_allocator.h
+wasi/include/c++/v1/__cxx03/__memory/compressed_pair.h
+wasi/include/c++/v1/__cxx03/__memory/construct_at.h
+wasi/include/c++/v1/__cxx03/__memory/destruct_n.h
+wasi/include/c++/v1/__cxx03/__memory/pointer_traits.h
+wasi/include/c++/v1/__cxx03/__memory/raw_storage_iterator.h
+wasi/include/c++/v1/__cxx03/__memory/shared_ptr.h
+wasi/include/c++/v1/__cxx03/__memory/swap_allocator.h
+wasi/include/c++/v1/__cxx03/__memory/temp_value.h
+wasi/include/c++/v1/__cxx03/__memory/temporary_buffer.h
+wasi/include/c++/v1/__cxx03/__memory/uninitialized_algorithms.h
+wasi/include/c++/v1/__cxx03/__memory/unique_ptr.h
+wasi/include/c++/v1/__cxx03/__memory/uses_allocator.h
+wasi/include/c++/v1/__cxx03/__memory/voidify.h
+wasi/include/c++/v1/__cxx03/__mutex/lock_guard.h
+wasi/include/c++/v1/__cxx03/__mutex/mutex.h
+wasi/include/c++/v1/__cxx03/__mutex/once_flag.h
+wasi/include/c++/v1/__cxx03/__mutex/tag_types.h
+wasi/include/c++/v1/__cxx03/__mutex/unique_lock.h
+wasi/include/c++/v1/__cxx03/__numeric/accumulate.h
+wasi/include/c++/v1/__cxx03/__numeric/adjacent_difference.h
+wasi/include/c++/v1/__cxx03/__numeric/inner_product.h
+wasi/include/c++/v1/__cxx03/__numeric/iota.h
+wasi/include/c++/v1/__cxx03/__numeric/partial_sum.h
+wasi/include/c++/v1/__cxx03/__ostream/basic_ostream.h
+wasi/include/c++/v1/__cxx03/__random/bernoulli_distribution.h
+wasi/include/c++/v1/__cxx03/__random/binomial_distribution.h
+wasi/include/c++/v1/__cxx03/__random/cauchy_distribution.h
+wasi/include/c++/v1/__cxx03/__random/chi_squared_distribution.h
+wasi/include/c++/v1/__cxx03/__random/clamp_to_integral.h
+wasi/include/c++/v1/__cxx03/__random/default_random_engine.h
+wasi/include/c++/v1/__cxx03/__random/discard_block_engine.h
+wasi/include/c++/v1/__cxx03/__random/discrete_distribution.h
+wasi/include/c++/v1/__cxx03/__random/exponential_distribution.h
+wasi/include/c++/v1/__cxx03/__random/extreme_value_distribution.h
+wasi/include/c++/v1/__cxx03/__random/fisher_f_distribution.h
+wasi/include/c++/v1/__cxx03/__random/gamma_distribution.h
+wasi/include/c++/v1/__cxx03/__random/generate_canonical.h
+wasi/include/c++/v1/__cxx03/__random/geometric_distribution.h
+wasi/include/c++/v1/__cxx03/__random/independent_bits_engine.h
+wasi/include/c++/v1/__cxx03/__random/is_seed_sequence.h
+wasi/include/c++/v1/__cxx03/__random/is_valid.h
+wasi/include/c++/v1/__cxx03/__random/knuth_b.h
+wasi/include/c++/v1/__cxx03/__random/linear_congruential_engine.h
+wasi/include/c++/v1/__cxx03/__random/log2.h
+wasi/include/c++/v1/__cxx03/__random/lognormal_distribution.h
+wasi/include/c++/v1/__cxx03/__random/mersenne_twister_engine.h
+wasi/include/c++/v1/__cxx03/__random/negative_binomial_distribution.h
+wasi/include/c++/v1/__cxx03/__random/normal_distribution.h
+wasi/include/c++/v1/__cxx03/__random/piecewise_constant_distribution.h
+wasi/include/c++/v1/__cxx03/__random/piecewise_linear_distribution.h
+wasi/include/c++/v1/__cxx03/__random/poisson_distribution.h
+wasi/include/c++/v1/__cxx03/__random/random_device.h
+wasi/include/c++/v1/__cxx03/__random/ranlux.h
+wasi/include/c++/v1/__cxx03/__random/seed_seq.h
+wasi/include/c++/v1/__cxx03/__random/shuffle_order_engine.h
+wasi/include/c++/v1/__cxx03/__random/student_t_distribution.h
+wasi/include/c++/v1/__cxx03/__random/subtract_with_carry_engine.h
+wasi/include/c++/v1/__cxx03/__random/uniform_int_distribution.h
+wasi/include/c++/v1/__cxx03/__random/uniform_real_distribution.h
+wasi/include/c++/v1/__cxx03/__random/weibull_distribution.h
+wasi/include/c++/v1/__cxx03/__split_buffer
+wasi/include/c++/v1/__cxx03/__std_clang_module
+wasi/include/c++/v1/__cxx03/__std_mbstate_t.h
+wasi/include/c++/v1/__cxx03/__string/char_traits.h
+wasi/include/c++/v1/__cxx03/__string/constexpr_c_functions.h
+wasi/include/c++/v1/__cxx03/__string/extern_template_lists.h
+wasi/include/c++/v1/__cxx03/__support/ibm/gettod_zos.h
+wasi/include/c++/v1/__cxx03/__support/ibm/locale_mgmt_zos.h
+wasi/include/c++/v1/__cxx03/__support/ibm/nanosleep.h
+wasi/include/c++/v1/__cxx03/__support/xlocale/__nop_locale_mgmt.h
+wasi/include/c++/v1/__cxx03/__support/xlocale/__posix_l_fallback.h
+wasi/include/c++/v1/__cxx03/__support/xlocale/__strtonum_fallback.h
+wasi/include/c++/v1/__cxx03/__system_error/errc.h
+wasi/include/c++/v1/__cxx03/__system_error/error_category.h
+wasi/include/c++/v1/__cxx03/__system_error/error_code.h
+wasi/include/c++/v1/__cxx03/__system_error/error_condition.h
+wasi/include/c++/v1/__cxx03/__system_error/system_error.h
+wasi/include/c++/v1/__cxx03/__thread/id.h
+wasi/include/c++/v1/__cxx03/__thread/poll_with_backoff.h
+wasi/include/c++/v1/__cxx03/__thread/support.h
+wasi/include/c++/v1/__cxx03/__thread/support/c11.h
+wasi/include/c++/v1/__cxx03/__thread/support/external.h
+wasi/include/c++/v1/__cxx03/__thread/support/pthread.h
+wasi/include/c++/v1/__cxx03/__thread/support/windows.h
+wasi/include/c++/v1/__cxx03/__thread/this_thread.h
+wasi/include/c++/v1/__cxx03/__thread/thread.h
+wasi/include/c++/v1/__cxx03/__thread/timed_backoff_policy.h
+wasi/include/c++/v1/__cxx03/__tree
+wasi/include/c++/v1/__cxx03/__tuple/find_index.h
+wasi/include/c++/v1/__cxx03/__tuple/make_tuple_types.h
+wasi/include/c++/v1/__cxx03/__tuple/sfinae_helpers.h
+wasi/include/c++/v1/__cxx03/__tuple/tuple_element.h
+wasi/include/c++/v1/__cxx03/__tuple/tuple_indices.h
+wasi/include/c++/v1/__cxx03/__tuple/tuple_like.h
+wasi/include/c++/v1/__cxx03/__tuple/tuple_like_ext.h
+wasi/include/c++/v1/__cxx03/__tuple/tuple_like_no_subrange.h
+wasi/include/c++/v1/__cxx03/__tuple/tuple_size.h
+wasi/include/c++/v1/__cxx03/__tuple/tuple_types.h
+wasi/include/c++/v1/__cxx03/__type_traits/add_const.h
+wasi/include/c++/v1/__cxx03/__type_traits/add_cv.h
+wasi/include/c++/v1/__cxx03/__type_traits/add_lvalue_reference.h
+wasi/include/c++/v1/__cxx03/__type_traits/add_pointer.h
+wasi/include/c++/v1/__cxx03/__type_traits/add_rvalue_reference.h
+wasi/include/c++/v1/__cxx03/__type_traits/add_volatile.h
+wasi/include/c++/v1/__cxx03/__type_traits/aligned_storage.h
+wasi/include/c++/v1/__cxx03/__type_traits/aligned_union.h
+wasi/include/c++/v1/__cxx03/__type_traits/alignment_of.h
+wasi/include/c++/v1/__cxx03/__type_traits/can_extract_key.h
+wasi/include/c++/v1/__cxx03/__type_traits/common_type.h
+wasi/include/c++/v1/__cxx03/__type_traits/conditional.h
+wasi/include/c++/v1/__cxx03/__type_traits/conjunction.h
+wasi/include/c++/v1/__cxx03/__type_traits/copy_cv.h
+wasi/include/c++/v1/__cxx03/__type_traits/copy_cvref.h
+wasi/include/c++/v1/__cxx03/__type_traits/datasizeof.h
+wasi/include/c++/v1/__cxx03/__type_traits/decay.h
+wasi/include/c++/v1/__cxx03/__type_traits/dependent_type.h
+wasi/include/c++/v1/__cxx03/__type_traits/desugars_to.h
+wasi/include/c++/v1/__cxx03/__type_traits/disjunction.h
+wasi/include/c++/v1/__cxx03/__type_traits/enable_if.h
+wasi/include/c++/v1/__cxx03/__type_traits/extent.h
+wasi/include/c++/v1/__cxx03/__type_traits/has_virtual_destructor.h
+wasi/include/c++/v1/__cxx03/__type_traits/integral_constant.h
+wasi/include/c++/v1/__cxx03/__type_traits/invoke.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_abstract.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_allocator.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_always_bitcastable.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_arithmetic.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_array.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_assignable.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_base_of.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_bounded_array.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_callable.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_char_like_type.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_class.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_compound.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_const.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_constant_evaluated.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_constructible.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_convertible.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_core_convertible.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_destructible.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_empty.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_enum.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_equality_comparable.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_execution_policy.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_final.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_floating_point.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_function.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_fundamental.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_implicitly_default_constructible.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_integral.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_literal_type.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_member_pointer.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_nothrow_assignable.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_nothrow_constructible.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_nothrow_destructible.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_null_pointer.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_object.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_pod.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_pointer.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_polymorphic.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_primary_template.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_reference.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_reference_wrapper.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_referenceable.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_same.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_scalar.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_signed.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_signed_integer.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_specialization.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_standard_layout.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_swappable.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_trivial.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_trivially_assignable.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_trivially_constructible.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_trivially_copyable.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_trivially_destructible.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_trivially_lexicographically_comparable.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_trivially_relocatable.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_unbounded_array.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_union.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_unsigned.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_unsigned_integer.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_valid_expansion.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_void.h
+wasi/include/c++/v1/__cxx03/__type_traits/is_volatile.h
+wasi/include/c++/v1/__cxx03/__type_traits/lazy.h
+wasi/include/c++/v1/__cxx03/__type_traits/make_32_64_or_128_bit.h
+wasi/include/c++/v1/__cxx03/__type_traits/make_const_lvalue_ref.h
+wasi/include/c++/v1/__cxx03/__type_traits/make_signed.h
+wasi/include/c++/v1/__cxx03/__type_traits/make_unsigned.h
+wasi/include/c++/v1/__cxx03/__type_traits/maybe_const.h
+wasi/include/c++/v1/__cxx03/__type_traits/nat.h
+wasi/include/c++/v1/__cxx03/__type_traits/negation.h
+wasi/include/c++/v1/__cxx03/__type_traits/noexcept_move_assign_container.h
+wasi/include/c++/v1/__cxx03/__type_traits/promote.h
+wasi/include/c++/v1/__cxx03/__type_traits/rank.h
+wasi/include/c++/v1/__cxx03/__type_traits/remove_all_extents.h
+wasi/include/c++/v1/__cxx03/__type_traits/remove_const.h
+wasi/include/c++/v1/__cxx03/__type_traits/remove_const_ref.h
+wasi/include/c++/v1/__cxx03/__type_traits/remove_cv.h
+wasi/include/c++/v1/__cxx03/__type_traits/remove_cvref.h
+wasi/include/c++/v1/__cxx03/__type_traits/remove_extent.h
+wasi/include/c++/v1/__cxx03/__type_traits/remove_pointer.h
+wasi/include/c++/v1/__cxx03/__type_traits/remove_reference.h
+wasi/include/c++/v1/__cxx03/__type_traits/remove_volatile.h
+wasi/include/c++/v1/__cxx03/__type_traits/result_of.h
+wasi/include/c++/v1/__cxx03/__type_traits/strip_signature.h
+wasi/include/c++/v1/__cxx03/__type_traits/type_identity.h
+wasi/include/c++/v1/__cxx03/__type_traits/type_list.h
+wasi/include/c++/v1/__cxx03/__type_traits/underlying_type.h
+wasi/include/c++/v1/__cxx03/__type_traits/unwrap_ref.h
+wasi/include/c++/v1/__cxx03/__type_traits/void_t.h
+wasi/include/c++/v1/__cxx03/__undef_macros
+wasi/include/c++/v1/__cxx03/__utility/as_lvalue.h
+wasi/include/c++/v1/__cxx03/__utility/auto_cast.h
+wasi/include/c++/v1/__cxx03/__utility/convert_to_integral.h
+wasi/include/c++/v1/__cxx03/__utility/declval.h
+wasi/include/c++/v1/__cxx03/__utility/empty.h
+wasi/include/c++/v1/__cxx03/__utility/exception_guard.h
+wasi/include/c++/v1/__cxx03/__utility/forward.h
+wasi/include/c++/v1/__cxx03/__utility/integer_sequence.h
+wasi/include/c++/v1/__cxx03/__utility/is_pointer_in_range.h
+wasi/include/c++/v1/__cxx03/__utility/is_valid_range.h
+wasi/include/c++/v1/__cxx03/__utility/move.h
+wasi/include/c++/v1/__cxx03/__utility/no_destroy.h
+wasi/include/c++/v1/__cxx03/__utility/pair.h
+wasi/include/c++/v1/__cxx03/__utility/piecewise_construct.h
+wasi/include/c++/v1/__cxx03/__utility/priority_tag.h
+wasi/include/c++/v1/__cxx03/__utility/private_constructor_tag.h
+wasi/include/c++/v1/__cxx03/__utility/rel_ops.h
+wasi/include/c++/v1/__cxx03/__utility/small_buffer.h
+wasi/include/c++/v1/__cxx03/__utility/swap.h
+wasi/include/c++/v1/__cxx03/__utility/unreachable.h
+wasi/include/c++/v1/__cxx03/__variant/monostate.h
+wasi/include/c++/v1/__cxx03/__verbose_abort
+wasi/include/c++/v1/__cxx03/__verbose_trap
+wasi/include/c++/v1/__cxx03/algorithm
+wasi/include/c++/v1/__cxx03/array
+wasi/include/c++/v1/__cxx03/atomic
+wasi/include/c++/v1/__cxx03/bitset
+wasi/include/c++/v1/__cxx03/cassert
+wasi/include/c++/v1/__cxx03/ccomplex
+wasi/include/c++/v1/__cxx03/cctype
+wasi/include/c++/v1/__cxx03/cerrno
+wasi/include/c++/v1/__cxx03/cfenv
+wasi/include/c++/v1/__cxx03/cfloat
+wasi/include/c++/v1/__cxx03/chrono
+wasi/include/c++/v1/__cxx03/cinttypes
+wasi/include/c++/v1/__cxx03/ciso646
+wasi/include/c++/v1/__cxx03/climits
+wasi/include/c++/v1/__cxx03/clocale
+wasi/include/c++/v1/__cxx03/cmath
+wasi/include/c++/v1/__cxx03/codecvt
+wasi/include/c++/v1/__cxx03/complex
+wasi/include/c++/v1/__cxx03/complex.h
+wasi/include/c++/v1/__cxx03/condition_variable
+wasi/include/c++/v1/__cxx03/csetjmp
+wasi/include/c++/v1/__cxx03/csignal
+wasi/include/c++/v1/__cxx03/cstdarg
+wasi/include/c++/v1/__cxx03/cstdbool
+wasi/include/c++/v1/__cxx03/cstddef
+wasi/include/c++/v1/__cxx03/cstdint
+wasi/include/c++/v1/__cxx03/cstdio
+wasi/include/c++/v1/__cxx03/cstdlib
+wasi/include/c++/v1/__cxx03/cstring
+wasi/include/c++/v1/__cxx03/ctgmath
+wasi/include/c++/v1/__cxx03/ctime
+wasi/include/c++/v1/__cxx03/ctype.h
+wasi/include/c++/v1/__cxx03/cuchar
+wasi/include/c++/v1/__cxx03/cwchar
+wasi/include/c++/v1/__cxx03/cwctype
+wasi/include/c++/v1/__cxx03/deque
+wasi/include/c++/v1/__cxx03/errno.h
+wasi/include/c++/v1/__cxx03/exception
+wasi/include/c++/v1/__cxx03/experimental/__config
+wasi/include/c++/v1/__cxx03/experimental/utility
+wasi/include/c++/v1/__cxx03/ext/__hash
+wasi/include/c++/v1/__cxx03/ext/hash_map
+wasi/include/c++/v1/__cxx03/ext/hash_set
+wasi/include/c++/v1/__cxx03/fenv.h
+wasi/include/c++/v1/__cxx03/float.h
+wasi/include/c++/v1/__cxx03/forward_list
+wasi/include/c++/v1/__cxx03/fstream
+wasi/include/c++/v1/__cxx03/functional
+wasi/include/c++/v1/__cxx03/future
+wasi/include/c++/v1/__cxx03/inttypes.h
+wasi/include/c++/v1/__cxx03/iomanip
+wasi/include/c++/v1/__cxx03/ios
+wasi/include/c++/v1/__cxx03/iosfwd
+wasi/include/c++/v1/__cxx03/iostream
+wasi/include/c++/v1/__cxx03/istream
+wasi/include/c++/v1/__cxx03/iterator
+wasi/include/c++/v1/__cxx03/limits
+wasi/include/c++/v1/__cxx03/list
+wasi/include/c++/v1/__cxx03/locale
+wasi/include/c++/v1/__cxx03/locale.h
+wasi/include/c++/v1/__cxx03/map
+wasi/include/c++/v1/__cxx03/math.h
+wasi/include/c++/v1/__cxx03/memory
+wasi/include/c++/v1/__cxx03/module.modulemap
+wasi/include/c++/v1/__cxx03/mutex
+wasi/include/c++/v1/__cxx03/new
+wasi/include/c++/v1/__cxx03/numeric
+wasi/include/c++/v1/__cxx03/ostream
+wasi/include/c++/v1/__cxx03/queue
+wasi/include/c++/v1/__cxx03/random
+wasi/include/c++/v1/__cxx03/ratio
+wasi/include/c++/v1/__cxx03/regex
+wasi/include/c++/v1/__cxx03/set
+wasi/include/c++/v1/__cxx03/sstream
+wasi/include/c++/v1/__cxx03/stack
+wasi/include/c++/v1/__cxx03/stdatomic.h
+wasi/include/c++/v1/__cxx03/stdbool.h
+wasi/include/c++/v1/__cxx03/stddef.h
+wasi/include/c++/v1/__cxx03/stdexcept
+wasi/include/c++/v1/__cxx03/stdint.h
+wasi/include/c++/v1/__cxx03/stdio.h
+wasi/include/c++/v1/__cxx03/stdlib.h
+wasi/include/c++/v1/__cxx03/streambuf
+wasi/include/c++/v1/__cxx03/string
+wasi/include/c++/v1/__cxx03/string.h
+wasi/include/c++/v1/__cxx03/string_view
+wasi/include/c++/v1/__cxx03/strstream
+wasi/include/c++/v1/__cxx03/system_error
+wasi/include/c++/v1/__cxx03/tgmath.h
+wasi/include/c++/v1/__cxx03/thread
+wasi/include/c++/v1/__cxx03/type_traits
+wasi/include/c++/v1/__cxx03/typeindex
+wasi/include/c++/v1/__cxx03/typeinfo
+wasi/include/c++/v1/__cxx03/uchar.h
+wasi/include/c++/v1/__cxx03/unordered_map
+wasi/include/c++/v1/__cxx03/unordered_set
+wasi/include/c++/v1/__cxx03/utility
+wasi/include/c++/v1/__cxx03/valarray
+wasi/include/c++/v1/__cxx03/vector
+wasi/include/c++/v1/__cxx03/version
+wasi/include/c++/v1/__cxx03/wchar.h
+wasi/include/c++/v1/__cxx03/wctype.h
 wasi/include/c++/v1/__cxxabi_config.h
 wasi/include/c++/v1/__debug_utils/randomize_range.h
+wasi/include/c++/v1/__debug_utils/sanitizers.h
 wasi/include/c++/v1/__debug_utils/strict_weak_ordering_check.h
 wasi/include/c++/v1/__exception/exception.h
 wasi/include/c++/v1/__exception/exception_ptr.h
@@ -368,6 +951,16 @@ wasi/include/c++/v1/__filesystem/perms.h
 wasi/include/c++/v1/__filesystem/recursive_directory_iterator.h
 wasi/include/c++/v1/__filesystem/space_info.h
 wasi/include/c++/v1/__filesystem/u8path.h
+wasi/include/c++/v1/__flat_map/flat_map.h
+wasi/include/c++/v1/__flat_map/flat_multimap.h
+wasi/include/c++/v1/__flat_map/key_value_iterator.h
+wasi/include/c++/v1/__flat_map/sorted_equivalent.h
+wasi/include/c++/v1/__flat_map/sorted_unique.h
+wasi/include/c++/v1/__flat_map/utils.h
+wasi/include/c++/v1/__flat_set/flat_multiset.h
+wasi/include/c++/v1/__flat_set/flat_set.h
+wasi/include/c++/v1/__flat_set/ra_iterator.h
+wasi/include/c++/v1/__flat_set/utils.h
 wasi/include/c++/v1/__format/buffer.h
 wasi/include/c++/v1/__format/concepts.h
 wasi/include/c++/v1/__format/container_adaptor.h
@@ -380,7 +973,6 @@ wasi/include/c++/v1/__format/format_args.h
 wasi/include/c++/v1/__format/format_context.h
 wasi/include/c++/v1/__format/format_error.h
 wasi/include/c++/v1/__format/format_functions.h
-wasi/include/c++/v1/__format/format_fwd.h
 wasi/include/c++/v1/__format/format_parse_context.h
 wasi/include/c++/v1/__format/format_string.h
 wasi/include/c++/v1/__format/format_to_n_result.h
@@ -394,6 +986,7 @@ wasi/include/c++/v1/__format/formatter_output.h
 wasi/include/c++/v1/__format/formatter_pointer.h
 wasi/include/c++/v1/__format/formatter_string.h
 wasi/include/c++/v1/__format/formatter_tuple.h
+wasi/include/c++/v1/__format/indic_conjunct_break_table.h
 wasi/include/c++/v1/__format/parser_std_format_spec.h
 wasi/include/c++/v1/__format/range_default_formatter.h
 wasi/include/c++/v1/__format/range_formatter.h
@@ -429,26 +1022,38 @@ wasi/include/c++/v1/__functional/unary_negate.h
 wasi/include/c++/v1/__functional/weak_result_type.h
 wasi/include/c++/v1/__fwd/array.h
 wasi/include/c++/v1/__fwd/bit_reference.h
+wasi/include/c++/v1/__fwd/byte.h
+wasi/include/c++/v1/__fwd/complex.h
+wasi/include/c++/v1/__fwd/deque.h
+wasi/include/c++/v1/__fwd/format.h
 wasi/include/c++/v1/__fwd/fstream.h
+wasi/include/c++/v1/__fwd/functional.h
 wasi/include/c++/v1/__fwd/get.h
-wasi/include/c++/v1/__fwd/hash.h
 wasi/include/c++/v1/__fwd/ios.h
 wasi/include/c++/v1/__fwd/istream.h
+wasi/include/c++/v1/__fwd/map.h
 wasi/include/c++/v1/__fwd/mdspan.h
+wasi/include/c++/v1/__fwd/memory.h
 wasi/include/c++/v1/__fwd/memory_resource.h
 wasi/include/c++/v1/__fwd/ostream.h
 wasi/include/c++/v1/__fwd/pair.h
+wasi/include/c++/v1/__fwd/queue.h
+wasi/include/c++/v1/__fwd/set.h
 wasi/include/c++/v1/__fwd/span.h
 wasi/include/c++/v1/__fwd/sstream.h
+wasi/include/c++/v1/__fwd/stack.h
 wasi/include/c++/v1/__fwd/streambuf.h
 wasi/include/c++/v1/__fwd/string.h
 wasi/include/c++/v1/__fwd/string_view.h
 wasi/include/c++/v1/__fwd/subrange.h
 wasi/include/c++/v1/__fwd/tuple.h
+wasi/include/c++/v1/__fwd/variant.h
+wasi/include/c++/v1/__fwd/vector.h
 wasi/include/c++/v1/__hash_table
 wasi/include/c++/v1/__ios/fpos.h
 wasi/include/c++/v1/__iterator/access.h
 wasi/include/c++/v1/__iterator/advance.h
+wasi/include/c++/v1/__iterator/aliasing_iterator.h
 wasi/include/c++/v1/__iterator/back_insert_iterator.h
 wasi/include/c++/v1/__iterator/bounded_iter.h
 wasi/include/c++/v1/__iterator/common_iterator.h
@@ -479,6 +1084,7 @@ wasi/include/c++/v1/__iterator/ostream_iterator.h
 wasi/include/c++/v1/__iterator/ostreambuf_iterator.h
 wasi/include/c++/v1/__iterator/permutable.h
 wasi/include/c++/v1/__iterator/prev.h
+wasi/include/c++/v1/__iterator/product_iterator.h
 wasi/include/c++/v1/__iterator/projected.h
 wasi/include/c++/v1/__iterator/ranges_iterator_traits.h
 wasi/include/c++/v1/__iterator/readable_traits.h
@@ -487,12 +1093,35 @@ wasi/include/c++/v1/__iterator/reverse_iterator.h
 wasi/include/c++/v1/__iterator/segmented_iterator.h
 wasi/include/c++/v1/__iterator/size.h
 wasi/include/c++/v1/__iterator/sortable.h
+wasi/include/c++/v1/__iterator/static_bounded_iter.h
 wasi/include/c++/v1/__iterator/unreachable_sentinel.h
 wasi/include/c++/v1/__iterator/wrap_iter.h
 wasi/include/c++/v1/__locale
-wasi/include/c++/v1/__locale_dir/locale_base_api/bsd_locale_defaults.h
+wasi/include/c++/v1/__locale_dir/check_grouping.h
+wasi/include/c++/v1/__locale_dir/get_c_locale.h
+wasi/include/c++/v1/__locale_dir/locale_base_api.h
+wasi/include/c++/v1/__locale_dir/locale_base_api/android.h
 wasi/include/c++/v1/__locale_dir/locale_base_api/bsd_locale_fallbacks.h
-wasi/include/c++/v1/__locale_dir/locale_base_api/locale_guard.h
+wasi/include/c++/v1/__locale_dir/locale_base_api/ibm.h
+wasi/include/c++/v1/__locale_dir/locale_base_api/musl.h
+wasi/include/c++/v1/__locale_dir/locale_base_api/openbsd.h
+wasi/include/c++/v1/__locale_dir/messages.h
+wasi/include/c++/v1/__locale_dir/money.h
+wasi/include/c++/v1/__locale_dir/num.h
+wasi/include/c++/v1/__locale_dir/pad_and_output.h
+wasi/include/c++/v1/__locale_dir/scan_keyword.h
+wasi/include/c++/v1/__locale_dir/support/apple.h
+wasi/include/c++/v1/__locale_dir/support/bsd_like.h
+wasi/include/c++/v1/__locale_dir/support/freebsd.h
+wasi/include/c++/v1/__locale_dir/support/fuchsia.h
+wasi/include/c++/v1/__locale_dir/support/linux.h
+wasi/include/c++/v1/__locale_dir/support/no_locale/characters.h
+wasi/include/c++/v1/__locale_dir/support/no_locale/strtonum.h
+wasi/include/c++/v1/__locale_dir/support/windows.h
+wasi/include/c++/v1/__locale_dir/time.h
+wasi/include/c++/v1/__locale_dir/wbuffer_convert.h
+wasi/include/c++/v1/__locale_dir/wstring_convert.h
+wasi/include/c++/v1/__log_hardening_failure
 wasi/include/c++/v1/__math/abs.h
 wasi/include/c++/v1/__math/copysign.h
 wasi/include/c++/v1/__math/error_functions.h
@@ -510,9 +1139,11 @@ wasi/include/c++/v1/__math/modulo.h
 wasi/include/c++/v1/__math/remainder.h
 wasi/include/c++/v1/__math/roots.h
 wasi/include/c++/v1/__math/rounding_functions.h
+wasi/include/c++/v1/__math/special_functions.h
 wasi/include/c++/v1/__math/traits.h
 wasi/include/c++/v1/__math/trigonometric_functions.h
 wasi/include/c++/v1/__mbstate_t.h
+wasi/include/c++/v1/__mdspan/aligned_accessor.h
 wasi/include/c++/v1/__mdspan/default_accessor.h
 wasi/include/c++/v1/__mdspan/extents.h
 wasi/include/c++/v1/__mdspan/layout_left.h
@@ -528,26 +1159,33 @@ wasi/include/c++/v1/__memory/allocator.h
 wasi/include/c++/v1/__memory/allocator_arg_t.h
 wasi/include/c++/v1/__memory/allocator_destructor.h
 wasi/include/c++/v1/__memory/allocator_traits.h
+wasi/include/c++/v1/__memory/array_cookie.h
 wasi/include/c++/v1/__memory/assume_aligned.h
 wasi/include/c++/v1/__memory/auto_ptr.h
-wasi/include/c++/v1/__memory/builtin_new_allocator.h
 wasi/include/c++/v1/__memory/compressed_pair.h
 wasi/include/c++/v1/__memory/concepts.h
 wasi/include/c++/v1/__memory/construct_at.h
+wasi/include/c++/v1/__memory/destroy.h
 wasi/include/c++/v1/__memory/destruct_n.h
+wasi/include/c++/v1/__memory/inout_ptr.h
+wasi/include/c++/v1/__memory/is_sufficiently_aligned.h
+wasi/include/c++/v1/__memory/noexcept_move_assign_container.h
+wasi/include/c++/v1/__memory/out_ptr.h
 wasi/include/c++/v1/__memory/pointer_traits.h
 wasi/include/c++/v1/__memory/ranges_construct_at.h
+wasi/include/c++/v1/__memory/ranges_destroy.h
 wasi/include/c++/v1/__memory/ranges_uninitialized_algorithms.h
 wasi/include/c++/v1/__memory/raw_storage_iterator.h
+wasi/include/c++/v1/__memory/shared_count.h
 wasi/include/c++/v1/__memory/shared_ptr.h
 wasi/include/c++/v1/__memory/swap_allocator.h
 wasi/include/c++/v1/__memory/temp_value.h
 wasi/include/c++/v1/__memory/temporary_buffer.h
 wasi/include/c++/v1/__memory/uninitialized_algorithms.h
 wasi/include/c++/v1/__memory/unique_ptr.h
+wasi/include/c++/v1/__memory/unique_temporary_buffer.h
 wasi/include/c++/v1/__memory/uses_allocator.h
 wasi/include/c++/v1/__memory/uses_allocator_construction.h
-wasi/include/c++/v1/__memory/voidify.h
 wasi/include/c++/v1/__memory_resource/memory_resource.h
 wasi/include/c++/v1/__memory_resource/monotonic_buffer_resource.h
 wasi/include/c++/v1/__memory_resource/polymorphic_allocator.h
@@ -559,6 +1197,16 @@ wasi/include/c++/v1/__mutex/mutex.h
 wasi/include/c++/v1/__mutex/once_flag.h
 wasi/include/c++/v1/__mutex/tag_types.h
 wasi/include/c++/v1/__mutex/unique_lock.h
+wasi/include/c++/v1/__new/align_val_t.h
+wasi/include/c++/v1/__new/allocate.h
+wasi/include/c++/v1/__new/destroying_delete_t.h
+wasi/include/c++/v1/__new/exceptions.h
+wasi/include/c++/v1/__new/global_new_delete.h
+wasi/include/c++/v1/__new/interference_size.h
+wasi/include/c++/v1/__new/launder.h
+wasi/include/c++/v1/__new/new_handler.h
+wasi/include/c++/v1/__new/nothrow_t.h
+wasi/include/c++/v1/__new/placement_new_delete.h
 wasi/include/c++/v1/__node_handle
 wasi/include/c++/v1/__numeric/accumulate.h
 wasi/include/c++/v1/__numeric/adjacent_difference.h
@@ -569,13 +1217,33 @@ wasi/include/c++/v1/__numeric/inner_product.h
 wasi/include/c++/v1/__numeric/iota.h
 wasi/include/c++/v1/__numeric/midpoint.h
 wasi/include/c++/v1/__numeric/partial_sum.h
-wasi/include/c++/v1/__numeric/pstl_reduce.h
-wasi/include/c++/v1/__numeric/pstl_transform_reduce.h
+wasi/include/c++/v1/__numeric/pstl.h
+wasi/include/c++/v1/__numeric/ranges_iota.h
 wasi/include/c++/v1/__numeric/reduce.h
 wasi/include/c++/v1/__numeric/saturation_arithmetic.h
 wasi/include/c++/v1/__numeric/transform_exclusive_scan.h
 wasi/include/c++/v1/__numeric/transform_inclusive_scan.h
 wasi/include/c++/v1/__numeric/transform_reduce.h
+wasi/include/c++/v1/__ostream/basic_ostream.h
+wasi/include/c++/v1/__ostream/print.h
+wasi/include/c++/v1/__ostream/put_character_sequence.h
+wasi/include/c++/v1/__pstl/backend.h
+wasi/include/c++/v1/__pstl/backend_fwd.h
+wasi/include/c++/v1/__pstl/backends/default.h
+wasi/include/c++/v1/__pstl/backends/libdispatch.h
+wasi/include/c++/v1/__pstl/backends/serial.h
+wasi/include/c++/v1/__pstl/backends/std_thread.h
+wasi/include/c++/v1/__pstl/cpu_algos/any_of.h
+wasi/include/c++/v1/__pstl/cpu_algos/cpu_traits.h
+wasi/include/c++/v1/__pstl/cpu_algos/fill.h
+wasi/include/c++/v1/__pstl/cpu_algos/find_if.h
+wasi/include/c++/v1/__pstl/cpu_algos/for_each.h
+wasi/include/c++/v1/__pstl/cpu_algos/merge.h
+wasi/include/c++/v1/__pstl/cpu_algos/stable_sort.h
+wasi/include/c++/v1/__pstl/cpu_algos/transform.h
+wasi/include/c++/v1/__pstl/cpu_algos/transform_reduce.h
+wasi/include/c++/v1/__pstl/dispatch.h
+wasi/include/c++/v1/__pstl/handle_exception.h
 wasi/include/c++/v1/__random/bernoulli_distribution.h
 wasi/include/c++/v1/__random/binomial_distribution.h
 wasi/include/c++/v1/__random/cauchy_distribution.h
@@ -635,6 +1303,7 @@ wasi/include/c++/v1/__ranges/from_range.h
 wasi/include/c++/v1/__ranges/iota_view.h
 wasi/include/c++/v1/__ranges/istream_view.h
 wasi/include/c++/v1/__ranges/join_view.h
+wasi/include/c++/v1/__ranges/join_with_view.h
 wasi/include/c++/v1/__ranges/lazy_split_view.h
 wasi/include/c++/v1/__ranges/movable_box.h
 wasi/include/c++/v1/__ranges/non_propagating_cache.h
@@ -657,7 +1326,6 @@ wasi/include/c++/v1/__ranges/view_interface.h
 wasi/include/c++/v1/__ranges/views.h
 wasi/include/c++/v1/__ranges/zip_view.h
 wasi/include/c++/v1/__split_buffer
-wasi/include/c++/v1/__std_clang_module
 wasi/include/c++/v1/__std_mbstate_t.h
 wasi/include/c++/v1/__stop_token/atomic_unique_lock.h
 wasi/include/c++/v1/__stop_token/intrusive_list_view.h
@@ -669,16 +1337,9 @@ wasi/include/c++/v1/__stop_token/stop_token.h
 wasi/include/c++/v1/__string/char_traits.h
 wasi/include/c++/v1/__string/constexpr_c_functions.h
 wasi/include/c++/v1/__string/extern_template_lists.h
-wasi/include/c++/v1/__support/android/locale_bionic.h
-wasi/include/c++/v1/__support/fuchsia/xlocale.h
 wasi/include/c++/v1/__support/ibm/gettod_zos.h
 wasi/include/c++/v1/__support/ibm/locale_mgmt_zos.h
 wasi/include/c++/v1/__support/ibm/nanosleep.h
-wasi/include/c++/v1/__support/ibm/xlocale.h
-wasi/include/c++/v1/__support/musl/xlocale.h
-wasi/include/c++/v1/__support/newlib/xlocale.h
-wasi/include/c++/v1/__support/openbsd/xlocale.h
-wasi/include/c++/v1/__support/win32/locale_win32.h
 wasi/include/c++/v1/__support/xlocale/__nop_locale_mgmt.h
 wasi/include/c++/v1/__support/xlocale/__posix_l_fallback.h
 wasi/include/c++/v1/__support/xlocale/__strtonum_fallback.h
@@ -687,49 +1348,56 @@ wasi/include/c++/v1/__system_error/error_category.h
 wasi/include/c++/v1/__system_error/error_code.h
 wasi/include/c++/v1/__system_error/error_condition.h
 wasi/include/c++/v1/__system_error/system_error.h
+wasi/include/c++/v1/__system_error/throw_system_error.h
 wasi/include/c++/v1/__thread/formatter.h
 wasi/include/c++/v1/__thread/id.h
 wasi/include/c++/v1/__thread/jthread.h
 wasi/include/c++/v1/__thread/poll_with_backoff.h
+wasi/include/c++/v1/__thread/support.h
+wasi/include/c++/v1/__thread/support/c11.h
+wasi/include/c++/v1/__thread/support/external.h
+wasi/include/c++/v1/__thread/support/pthread.h
+wasi/include/c++/v1/__thread/support/windows.h
 wasi/include/c++/v1/__thread/this_thread.h
 wasi/include/c++/v1/__thread/thread.h
 wasi/include/c++/v1/__thread/timed_backoff_policy.h
-wasi/include/c++/v1/__threading_support
 wasi/include/c++/v1/__tree
+wasi/include/c++/v1/__tuple/find_index.h
+wasi/include/c++/v1/__tuple/ignore.h
 wasi/include/c++/v1/__tuple/make_tuple_types.h
-wasi/include/c++/v1/__tuple/pair_like.h
 wasi/include/c++/v1/__tuple/sfinae_helpers.h
 wasi/include/c++/v1/__tuple/tuple_element.h
 wasi/include/c++/v1/__tuple/tuple_indices.h
 wasi/include/c++/v1/__tuple/tuple_like.h
 wasi/include/c++/v1/__tuple/tuple_like_ext.h
+wasi/include/c++/v1/__tuple/tuple_like_no_subrange.h
 wasi/include/c++/v1/__tuple/tuple_size.h
 wasi/include/c++/v1/__tuple/tuple_types.h
-wasi/include/c++/v1/__type_traits/add_const.h
-wasi/include/c++/v1/__type_traits/add_cv.h
-wasi/include/c++/v1/__type_traits/add_lvalue_reference.h
+wasi/include/c++/v1/__type_traits/add_cv_quals.h
 wasi/include/c++/v1/__type_traits/add_pointer.h
-wasi/include/c++/v1/__type_traits/add_rvalue_reference.h
-wasi/include/c++/v1/__type_traits/add_volatile.h
+wasi/include/c++/v1/__type_traits/add_reference.h
 wasi/include/c++/v1/__type_traits/aligned_storage.h
 wasi/include/c++/v1/__type_traits/aligned_union.h
 wasi/include/c++/v1/__type_traits/alignment_of.h
-wasi/include/c++/v1/__type_traits/apply_cv.h
 wasi/include/c++/v1/__type_traits/can_extract_key.h
 wasi/include/c++/v1/__type_traits/common_reference.h
 wasi/include/c++/v1/__type_traits/common_type.h
 wasi/include/c++/v1/__type_traits/conditional.h
 wasi/include/c++/v1/__type_traits/conjunction.h
+wasi/include/c++/v1/__type_traits/container_traits.h
 wasi/include/c++/v1/__type_traits/copy_cv.h
 wasi/include/c++/v1/__type_traits/copy_cvref.h
 wasi/include/c++/v1/__type_traits/datasizeof.h
 wasi/include/c++/v1/__type_traits/decay.h
 wasi/include/c++/v1/__type_traits/dependent_type.h
+wasi/include/c++/v1/__type_traits/desugars_to.h
+wasi/include/c++/v1/__type_traits/detected_or.h
 wasi/include/c++/v1/__type_traits/disjunction.h
 wasi/include/c++/v1/__type_traits/enable_if.h
 wasi/include/c++/v1/__type_traits/extent.h
 wasi/include/c++/v1/__type_traits/has_unique_object_representation.h
 wasi/include/c++/v1/__type_traits/has_virtual_destructor.h
+wasi/include/c++/v1/__type_traits/integer_traits.h
 wasi/include/c++/v1/__type_traits/integral_constant.h
 wasi/include/c++/v1/__type_traits/invoke.h
 wasi/include/c++/v1/__type_traits/is_abstract.h
@@ -749,10 +1417,7 @@ wasi/include/c++/v1/__type_traits/is_const.h
 wasi/include/c++/v1/__type_traits/is_constant_evaluated.h
 wasi/include/c++/v1/__type_traits/is_constructible.h
 wasi/include/c++/v1/__type_traits/is_convertible.h
-wasi/include/c++/v1/__type_traits/is_copy_assignable.h
-wasi/include/c++/v1/__type_traits/is_copy_constructible.h
 wasi/include/c++/v1/__type_traits/is_core_convertible.h
-wasi/include/c++/v1/__type_traits/is_default_constructible.h
 wasi/include/c++/v1/__type_traits/is_destructible.h
 wasi/include/c++/v1/__type_traits/is_empty.h
 wasi/include/c++/v1/__type_traits/is_enum.h
@@ -762,23 +1427,14 @@ wasi/include/c++/v1/__type_traits/is_final.h
 wasi/include/c++/v1/__type_traits/is_floating_point.h
 wasi/include/c++/v1/__type_traits/is_function.h
 wasi/include/c++/v1/__type_traits/is_fundamental.h
+wasi/include/c++/v1/__type_traits/is_implicit_lifetime.h
 wasi/include/c++/v1/__type_traits/is_implicitly_default_constructible.h
 wasi/include/c++/v1/__type_traits/is_integral.h
 wasi/include/c++/v1/__type_traits/is_literal_type.h
-wasi/include/c++/v1/__type_traits/is_member_function_pointer.h
-wasi/include/c++/v1/__type_traits/is_member_object_pointer.h
 wasi/include/c++/v1/__type_traits/is_member_pointer.h
-wasi/include/c++/v1/__type_traits/is_move_assignable.h
-wasi/include/c++/v1/__type_traits/is_move_constructible.h
 wasi/include/c++/v1/__type_traits/is_nothrow_assignable.h
 wasi/include/c++/v1/__type_traits/is_nothrow_constructible.h
-wasi/include/c++/v1/__type_traits/is_nothrow_convertible.h
-wasi/include/c++/v1/__type_traits/is_nothrow_copy_assignable.h
-wasi/include/c++/v1/__type_traits/is_nothrow_copy_constructible.h
-wasi/include/c++/v1/__type_traits/is_nothrow_default_constructible.h
 wasi/include/c++/v1/__type_traits/is_nothrow_destructible.h
-wasi/include/c++/v1/__type_traits/is_nothrow_move_assignable.h
-wasi/include/c++/v1/__type_traits/is_nothrow_move_constructible.h
 wasi/include/c++/v1/__type_traits/is_null_pointer.h
 wasi/include/c++/v1/__type_traits/is_object.h
 wasi/include/c++/v1/__type_traits/is_pod.h
@@ -788,29 +1444,24 @@ wasi/include/c++/v1/__type_traits/is_primary_template.h
 wasi/include/c++/v1/__type_traits/is_reference.h
 wasi/include/c++/v1/__type_traits/is_reference_wrapper.h
 wasi/include/c++/v1/__type_traits/is_referenceable.h
+wasi/include/c++/v1/__type_traits/is_replaceable.h
 wasi/include/c++/v1/__type_traits/is_same.h
 wasi/include/c++/v1/__type_traits/is_scalar.h
-wasi/include/c++/v1/__type_traits/is_scoped_enum.h
 wasi/include/c++/v1/__type_traits/is_signed.h
-wasi/include/c++/v1/__type_traits/is_signed_integer.h
 wasi/include/c++/v1/__type_traits/is_specialization.h
 wasi/include/c++/v1/__type_traits/is_standard_layout.h
 wasi/include/c++/v1/__type_traits/is_swappable.h
 wasi/include/c++/v1/__type_traits/is_trivial.h
 wasi/include/c++/v1/__type_traits/is_trivially_assignable.h
 wasi/include/c++/v1/__type_traits/is_trivially_constructible.h
-wasi/include/c++/v1/__type_traits/is_trivially_copy_assignable.h
-wasi/include/c++/v1/__type_traits/is_trivially_copy_constructible.h
 wasi/include/c++/v1/__type_traits/is_trivially_copyable.h
-wasi/include/c++/v1/__type_traits/is_trivially_default_constructible.h
 wasi/include/c++/v1/__type_traits/is_trivially_destructible.h
 wasi/include/c++/v1/__type_traits/is_trivially_lexicographically_comparable.h
-wasi/include/c++/v1/__type_traits/is_trivially_move_assignable.h
-wasi/include/c++/v1/__type_traits/is_trivially_move_constructible.h
+wasi/include/c++/v1/__type_traits/is_trivially_relocatable.h
 wasi/include/c++/v1/__type_traits/is_unbounded_array.h
 wasi/include/c++/v1/__type_traits/is_union.h
+wasi/include/c++/v1/__type_traits/is_unqualified.h
 wasi/include/c++/v1/__type_traits/is_unsigned.h
-wasi/include/c++/v1/__type_traits/is_unsigned_integer.h
 wasi/include/c++/v1/__type_traits/is_valid_expansion.h
 wasi/include/c++/v1/__type_traits/is_void.h
 wasi/include/c++/v1/__type_traits/is_volatile.h
@@ -822,10 +1473,10 @@ wasi/include/c++/v1/__type_traits/make_unsigned.h
 wasi/include/c++/v1/__type_traits/maybe_const.h
 wasi/include/c++/v1/__type_traits/nat.h
 wasi/include/c++/v1/__type_traits/negation.h
-wasi/include/c++/v1/__type_traits/noexcept_move_assign_container.h
-wasi/include/c++/v1/__type_traits/operation_traits.h
 wasi/include/c++/v1/__type_traits/promote.h
 wasi/include/c++/v1/__type_traits/rank.h
+wasi/include/c++/v1/__type_traits/reference_constructs_from_temporary.h
+wasi/include/c++/v1/__type_traits/reference_converts_from_temporary.h
 wasi/include/c++/v1/__type_traits/remove_all_extents.h
 wasi/include/c++/v1/__type_traits/remove_const.h
 wasi/include/c++/v1/__type_traits/remove_const_ref.h
@@ -849,6 +1500,7 @@ wasi/include/c++/v1/__utility/auto_cast.h
 wasi/include/c++/v1/__utility/cmp.h
 wasi/include/c++/v1/__utility/convert_to_integral.h
 wasi/include/c++/v1/__utility/declval.h
+wasi/include/c++/v1/__utility/element_count.h
 wasi/include/c++/v1/__utility/empty.h
 wasi/include/c++/v1/__utility/exception_guard.h
 wasi/include/c++/v1/__utility/exchange.h
@@ -857,18 +1509,30 @@ wasi/include/c++/v1/__utility/forward_like.h
 wasi/include/c++/v1/__utility/in_place.h
 wasi/include/c++/v1/__utility/integer_sequence.h
 wasi/include/c++/v1/__utility/is_pointer_in_range.h
+wasi/include/c++/v1/__utility/is_valid_range.h
 wasi/include/c++/v1/__utility/move.h
 wasi/include/c++/v1/__utility/no_destroy.h
 wasi/include/c++/v1/__utility/pair.h
 wasi/include/c++/v1/__utility/piecewise_construct.h
 wasi/include/c++/v1/__utility/priority_tag.h
+wasi/include/c++/v1/__utility/private_constructor_tag.h
 wasi/include/c++/v1/__utility/rel_ops.h
+wasi/include/c++/v1/__utility/scope_guard.h
 wasi/include/c++/v1/__utility/small_buffer.h
 wasi/include/c++/v1/__utility/swap.h
 wasi/include/c++/v1/__utility/to_underlying.h
 wasi/include/c++/v1/__utility/unreachable.h
 wasi/include/c++/v1/__variant/monostate.h
+wasi/include/c++/v1/__vector/comparison.h
+wasi/include/c++/v1/__vector/container_traits.h
+wasi/include/c++/v1/__vector/erase.h
+wasi/include/c++/v1/__vector/pmr.h
+wasi/include/c++/v1/__vector/swap.h
+wasi/include/c++/v1/__vector/vector.h
+wasi/include/c++/v1/__vector/vector_bool.h
+wasi/include/c++/v1/__vector/vector_bool_formatter.h
 wasi/include/c++/v1/__verbose_abort
+wasi/include/c++/v1/__verbose_trap
 wasi/include/c++/v1/algorithm
 wasi/include/c++/v1/any
 wasi/include/c++/v1/array
@@ -898,6 +1562,7 @@ wasi/include/c++/v1/condition_variable
 wasi/include/c++/v1/coroutine
 wasi/include/c++/v1/csetjmp
 wasi/include/c++/v1/csignal
+wasi/include/c++/v1/cstdalign
 wasi/include/c++/v1/cstdarg
 wasi/include/c++/v1/cstdbool
 wasi/include/c++/v1/cstddef
@@ -917,8 +1582,6 @@ wasi/include/c++/v1/errno.h
 wasi/include/c++/v1/exception
 wasi/include/c++/v1/execution
 wasi/include/c++/v1/expected
-wasi/include/c++/v1/experimental/__config
-wasi/include/c++/v1/experimental/__memory
 wasi/include/c++/v1/experimental/__simd/aligned_tag.h
 wasi/include/c++/v1/experimental/__simd/declaration.h
 wasi/include/c++/v1/experimental/__simd/reference.h
@@ -939,6 +1602,8 @@ wasi/include/c++/v1/ext/hash_map
 wasi/include/c++/v1/ext/hash_set
 wasi/include/c++/v1/fenv.h
 wasi/include/c++/v1/filesystem
+wasi/include/c++/v1/flat_map
+wasi/include/c++/v1/flat_set
 wasi/include/c++/v1/float.h
 wasi/include/c++/v1/format
 wasi/include/c++/v1/forward_list
@@ -958,7 +1623,6 @@ wasi/include/c++/v1/libcxx.imp
 wasi/include/c++/v1/limits
 wasi/include/c++/v1/list
 wasi/include/c++/v1/locale
-wasi/include/c++/v1/locale.h
 wasi/include/c++/v1/map
 wasi/include/c++/v1/math.h
 wasi/include/c++/v1/mdspan
@@ -989,7 +1653,6 @@ wasi/include/c++/v1/stdatomic.h
 wasi/include/c++/v1/stdbool.h
 wasi/include/c++/v1/stddef.h
 wasi/include/c++/v1/stdexcept
-wasi/include/c++/v1/stdint.h
 wasi/include/c++/v1/stdio.h
 wasi/include/c++/v1/stdlib.h
 wasi/include/c++/v1/stop_token
@@ -1017,5 +1680,139 @@ wasi/include/c++/v1/version
 wasi/include/c++/v1/wchar.h
 wasi/include/c++/v1/wctype.h
 wasi/lib/wasm32-wasi/libc++.a
+wasi/lib/wasm32-wasi/libc++.modules.json
 wasi/lib/wasm32-wasi/libc++abi.a
 wasi/lib/wasm32-wasi/libc++experimental.a
+wasi/share/libc++/v1/std.compat.cppm
+wasi/share/libc++/v1/std.compat/cassert.inc
+wasi/share/libc++/v1/std.compat/cctype.inc
+wasi/share/libc++/v1/std.compat/cerrno.inc
+wasi/share/libc++/v1/std.compat/cfenv.inc
+wasi/share/libc++/v1/std.compat/cfloat.inc
+wasi/share/libc++/v1/std.compat/cinttypes.inc
+wasi/share/libc++/v1/std.compat/climits.inc
+wasi/share/libc++/v1/std.compat/clocale.inc
+wasi/share/libc++/v1/std.compat/cmath.inc
+wasi/share/libc++/v1/std.compat/csetjmp.inc
+wasi/share/libc++/v1/std.compat/csignal.inc
+wasi/share/libc++/v1/std.compat/cstdarg.inc
+wasi/share/libc++/v1/std.compat/cstddef.inc
+wasi/share/libc++/v1/std.compat/cstdint.inc
+wasi/share/libc++/v1/std.compat/cstdio.inc
+wasi/share/libc++/v1/std.compat/cstdlib.inc
+wasi/share/libc++/v1/std.compat/cstring.inc
+wasi/share/libc++/v1/std.compat/ctime.inc
+wasi/share/libc++/v1/std.compat/cuchar.inc
+wasi/share/libc++/v1/std.compat/cwchar.inc
+wasi/share/libc++/v1/std.compat/cwctype.inc
+wasi/share/libc++/v1/std.cppm
+wasi/share/libc++/v1/std/algorithm.inc
+wasi/share/libc++/v1/std/any.inc
+wasi/share/libc++/v1/std/array.inc
+wasi/share/libc++/v1/std/atomic.inc
+wasi/share/libc++/v1/std/barrier.inc
+wasi/share/libc++/v1/std/bit.inc
+wasi/share/libc++/v1/std/bitset.inc
+wasi/share/libc++/v1/std/cassert.inc
+wasi/share/libc++/v1/std/cctype.inc
+wasi/share/libc++/v1/std/cerrno.inc
+wasi/share/libc++/v1/std/cfenv.inc
+wasi/share/libc++/v1/std/cfloat.inc
+wasi/share/libc++/v1/std/charconv.inc
+wasi/share/libc++/v1/std/chrono.inc
+wasi/share/libc++/v1/std/cinttypes.inc
+wasi/share/libc++/v1/std/climits.inc
+wasi/share/libc++/v1/std/clocale.inc
+wasi/share/libc++/v1/std/cmath.inc
+wasi/share/libc++/v1/std/codecvt.inc
+wasi/share/libc++/v1/std/compare.inc
+wasi/share/libc++/v1/std/complex.inc
+wasi/share/libc++/v1/std/concepts.inc
+wasi/share/libc++/v1/std/condition_variable.inc
+wasi/share/libc++/v1/std/coroutine.inc
+wasi/share/libc++/v1/std/csetjmp.inc
+wasi/share/libc++/v1/std/csignal.inc
+wasi/share/libc++/v1/std/cstdarg.inc
+wasi/share/libc++/v1/std/cstddef.inc
+wasi/share/libc++/v1/std/cstdint.inc
+wasi/share/libc++/v1/std/cstdio.inc
+wasi/share/libc++/v1/std/cstdlib.inc
+wasi/share/libc++/v1/std/cstring.inc
+wasi/share/libc++/v1/std/ctime.inc
+wasi/share/libc++/v1/std/cuchar.inc
+wasi/share/libc++/v1/std/cwchar.inc
+wasi/share/libc++/v1/std/cwctype.inc
+wasi/share/libc++/v1/std/deque.inc
+wasi/share/libc++/v1/std/exception.inc
+wasi/share/libc++/v1/std/execution.inc
+wasi/share/libc++/v1/std/expected.inc
+wasi/share/libc++/v1/std/filesystem.inc
+wasi/share/libc++/v1/std/flat_map.inc
+wasi/share/libc++/v1/std/flat_set.inc
+wasi/share/libc++/v1/std/format.inc
+wasi/share/libc++/v1/std/forward_list.inc
+wasi/share/libc++/v1/std/fstream.inc
+wasi/share/libc++/v1/std/functional.inc
+wasi/share/libc++/v1/std/future.inc
+wasi/share/libc++/v1/std/generator.inc
+wasi/share/libc++/v1/std/hazard_pointer.inc
+wasi/share/libc++/v1/std/initializer_list.inc
+wasi/share/libc++/v1/std/iomanip.inc
+wasi/share/libc++/v1/std/ios.inc
+wasi/share/libc++/v1/std/iosfwd.inc
+wasi/share/libc++/v1/std/iostream.inc
+wasi/share/libc++/v1/std/istream.inc
+wasi/share/libc++/v1/std/iterator.inc
+wasi/share/libc++/v1/std/latch.inc
+wasi/share/libc++/v1/std/limits.inc
+wasi/share/libc++/v1/std/list.inc
+wasi/share/libc++/v1/std/locale.inc
+wasi/share/libc++/v1/std/map.inc
+wasi/share/libc++/v1/std/mdspan.inc
+wasi/share/libc++/v1/std/memory.inc
+wasi/share/libc++/v1/std/memory_resource.inc
+wasi/share/libc++/v1/std/mutex.inc
+wasi/share/libc++/v1/std/new.inc
+wasi/share/libc++/v1/std/numbers.inc
+wasi/share/libc++/v1/std/numeric.inc
+wasi/share/libc++/v1/std/optional.inc
+wasi/share/libc++/v1/std/ostream.inc
+wasi/share/libc++/v1/std/print.inc
+wasi/share/libc++/v1/std/queue.inc
+wasi/share/libc++/v1/std/random.inc
+wasi/share/libc++/v1/std/ranges.inc
+wasi/share/libc++/v1/std/ratio.inc
+wasi/share/libc++/v1/std/rcu.inc
+wasi/share/libc++/v1/std/regex.inc
+wasi/share/libc++/v1/std/scoped_allocator.inc
+wasi/share/libc++/v1/std/semaphore.inc
+wasi/share/libc++/v1/std/set.inc
+wasi/share/libc++/v1/std/shared_mutex.inc
+wasi/share/libc++/v1/std/source_location.inc
+wasi/share/libc++/v1/std/span.inc
+wasi/share/libc++/v1/std/spanstream.inc
+wasi/share/libc++/v1/std/sstream.inc
+wasi/share/libc++/v1/std/stack.inc
+wasi/share/libc++/v1/std/stacktrace.inc
+wasi/share/libc++/v1/std/stdexcept.inc
+wasi/share/libc++/v1/std/stdfloat.inc
+wasi/share/libc++/v1/std/stop_token.inc
+wasi/share/libc++/v1/std/streambuf.inc
+wasi/share/libc++/v1/std/string.inc
+wasi/share/libc++/v1/std/string_view.inc
+wasi/share/libc++/v1/std/strstream.inc
+wasi/share/libc++/v1/std/syncstream.inc
+wasi/share/libc++/v1/std/system_error.inc
+wasi/share/libc++/v1/std/text_encoding.inc
+wasi/share/libc++/v1/std/thread.inc
+wasi/share/libc++/v1/std/tuple.inc
+wasi/share/libc++/v1/std/type_traits.inc
+wasi/share/libc++/v1/std/typeindex.inc
+wasi/share/libc++/v1/std/typeinfo.inc
+wasi/share/libc++/v1/std/unordered_map.inc
+wasi/share/libc++/v1/std/unordered_set.inc
+wasi/share/libc++/v1/std/utility.inc
+wasi/share/libc++/v1/std/valarray.inc
+wasi/share/libc++/v1/std/variant.inc
+wasi/share/libc++/v1/std/vector.inc
+wasi/share/libc++/v1/std/version.inc
diff --git a/wasi-libcxx/distinfo b/wasi-libcxx/distinfo
index a0e53c6893..8e487e798b 100644
--- a/wasi-libcxx/distinfo
+++ b/wasi-libcxx/distinfo
@@ -1,8 +1,8 @@
 $NetBSD: distinfo,v 1.8 2023/01/12 19:32:54 adam Exp $
 
-BLAKE2s (llvm-project-21.1.7.src.tar.xz) = 28c3b235070e74f525e7d7be33de0c5e2a3ad5e5a5673d5320e726a532f0139c
-SHA512 (llvm-project-21.1.7.src.tar.xz) = ae30a53ed929df979849f7433bf705bc3d540aa9e12a02a175eb2483d1a56f9ca1203c9b67795f6e84cf2407c28d46d5d5351b290d8735adb5206103fee6f379
-Size (llvm-project-21.1.7.src.tar.xz) = 158956584 bytes
-SHA1 (patch-libcxx_include_CMakeLists.txt) = 1b525baf1c510d50f170feae8111377c97204f65
-SHA1 (patch-libcxx_src_CMakeLists.txt) = 08b4666830c7eb85a47c9b0d5f523e613b2f20d4
-SHA1 (patch-libcxxabi_src_CMakeLists.txt) = 2bd130551c3e7a3b66732358662fbd28f67a4695
+BLAKE2s (llvm-project-21.1.8.src.tar.xz) = e6db98fed167ddd56b49c7eb46c4de7e7e8e08158e9c99ae79806983bcb60ae9
+SHA512 (llvm-project-21.1.8.src.tar.xz) = cae4c44e7bf678071723da63ad5839491d717a7233e7f4791aa408207f3ea42f52de939ad15189b112c02a0770f1bb8d59bae6ad31ef53417a6eea7770fe52ab
+Size (llvm-project-21.1.8.src.tar.xz) = 158958576 bytes
+SHA1 (patch-libcxx_include_CMakeLists.txt) = 4dde52af9fa23367e6d4a19ab70a06d1ce5f28f7
+SHA1 (patch-libcxx_src_CMakeLists.txt) = c4707f5b0b5eacc0ab02f25dfc7281a484507cc5
+SHA1 (patch-libcxxabi_src_CMakeLists.txt) = deaa2a57f409ac215eb6b9d219086cc3f72b0d7d
diff --git a/wasi-libcxx/patches/patch-libcxx_include_CMakeLists.txt b/wasi-libcxx/patches/patch-libcxx_include_CMakeLists.txt
index c30b3a5393..a62c1d7028 100644
--- a/wasi-libcxx/patches/patch-libcxx_include_CMakeLists.txt
+++ b/wasi-libcxx/patches/patch-libcxx_include_CMakeLists.txt
@@ -3,10 +3,10 @@ $NetBSD: patch-libcxx_include_CMakeLists.txt,v 1.2 2022/11/14 18:44:07 adam Exp
 * Generate __config_site and __assertion_handler under source directory. This is wrong.
   This fixes non-pthreads wasi-libcxx-14.0.6 build.
 
---- libcxx/include/CMakeLists.txt.orig	2024-10-15 08:17:37.000000000 +0000
+--- libcxx/include/CMakeLists.txt.orig	2025-12-12 10:35:47.000000000 +0000
 +++ libcxx/include/CMakeLists.txt
-@@ -1018,9 +1018,13 @@ set(files
-   wctype.h
+@@ -1677,7 +1677,9 @@ set(files
+   __cxx03/wctype.h
    )
  
 +configure_file("__config_site.in" "${CMAKE_CURRENT_SOURCE_DIR}/__config_site" @ONLY)
@@ -14,8 +14,14 @@ $NetBSD: patch-libcxx_include_CMakeLists.txt,v 1.2 2022/11/14 18:44:07 adam Exp
 +configure_file("${LIBCXX_ASSERTION_HANDLER_FILE}" "${CMAKE_CURRENT_SOURCE_DIR}/__assertion_handler" COPYONLY)
  configure_file("${LIBCXX_ASSERTION_HANDLER_FILE}" "${LIBCXX_GENERATED_INCLUDE_DIR}/__assertion_handler" COPYONLY)
  
+ # We generate the modulemap file so that we can include __config_site in it. For now, we don't know how to
+@@ -1687,6 +1689,9 @@ if (NOT LLVM_ENABLE_PER_TARGET_RUNTIME_D
+ endif()
+ configure_file("module.modulemap.in" "${LIBCXX_GENERATED_INCLUDE_DIR}/module.modulemap" @ONLY)
+ 
 +set(_all_includes "${CMAKE_CURRENT_SOURCE_DIR}/__config_site"
-+                  "${CMAKE_CURRENT_SOURCE_DIR}/__assertion_handler")
++                  "${CMAKE_CURRENT_SOURCE_DIR}/__assertion_handler"
++                  "${CMAKE_CURRENT_SOURCE_DIR}/module.modulemap")
  set(_all_includes "${LIBCXX_GENERATED_INCLUDE_TARGET_DIR}/__config_site"
-                   "${LIBCXX_GENERATED_INCLUDE_DIR}/__assertion_handler")
- foreach(f ${files})
+                   "${LIBCXX_GENERATED_INCLUDE_DIR}/__assertion_handler"
+                   "${LIBCXX_GENERATED_INCLUDE_DIR}/module.modulemap")
diff --git a/wasi-libcxx/patches/patch-libcxx_src_CMakeLists.txt b/wasi-libcxx/patches/patch-libcxx_src_CMakeLists.txt
index 1214c5fdbf..d5a7d0f1f8 100644
--- a/wasi-libcxx/patches/patch-libcxx_src_CMakeLists.txt
+++ b/wasi-libcxx/patches/patch-libcxx_src_CMakeLists.txt
@@ -2,14 +2,14 @@ $NetBSD$
 
 Fix build.
 
---- libcxx/src/CMakeLists.txt.orig	2024-10-16 08:25:59.076000355 +0000
+--- libcxx/src/CMakeLists.txt.orig	2025-12-12 10:35:47.000000000 +0000
 +++ libcxx/src/CMakeLists.txt
-@@ -232,7 +232,7 @@ if (LIBCXX_ENABLE_SHARED)
-   # Maybe re-export symbols from libc++abi
-   # In particular, we don't re-export the symbols if libc++abi is merged statically
-   # into libc++ because in that case there's no dylib to re-export from.
--  if (APPLE AND LIBCXX_CXX_ABI MATCHES "libcxxabi$"
-+  if (FALSE AND LIBCXX_CXX_ABI MATCHES "libcxxabi$"
-             AND NOT LIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY)
-     target_link_libraries(cxx_shared PRIVATE cxxabi-reexports)
+@@ -209,7 +209,7 @@ endif()
  
+ # Maybe force some symbols to be weak, not weak or not exported.
+ # TODO: This shouldn't depend on the platform, and ideally it should be done in the sources.
+-if (APPLE AND LIBCXX_CXX_ABI MATCHES "libcxxabi$"
++if (FALSE AND LIBCXX_CXX_ABI MATCHES "libcxxabi$"
+           AND NOT LIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY)
+   target_link_libraries(cxx_shared PRIVATE
+     "-Wl,-force_symbols_not_weak_list,${CMAKE_CURRENT_SOURCE_DIR}/../lib/notweak.exp"
diff --git a/wasi-libcxx/patches/patch-libcxxabi_src_CMakeLists.txt b/wasi-libcxx/patches/patch-libcxxabi_src_CMakeLists.txt
index 5b7df19d10..f048527a79 100644
--- a/wasi-libcxx/patches/patch-libcxxabi_src_CMakeLists.txt
+++ b/wasi-libcxx/patches/patch-libcxxabi_src_CMakeLists.txt
@@ -2,7 +2,7 @@ $NetBSD: patch-libcxxabi_src_CMakeLists.txt,v 1.1 2022/11/14 18:44:07 adam Exp $
 
 Fix build.
 
---- libcxxabi/src/CMakeLists.txt.orig	2024-10-15 08:17:37.000000000 +0000
+--- libcxxabi/src/CMakeLists.txt.orig	2025-12-12 10:35:47.000000000 +0000
 +++ libcxxabi/src/CMakeLists.txt
 @@ -57,6 +57,7 @@ if (MSVC_IDE OR XCODE)
  endif()
@@ -12,11 +12,3 @@ Fix build.
  include_directories("${LIBCXXABI_LIBCXX_PATH}/src")
  
  if (LIBCXXABI_HAS_CXA_THREAD_ATEXIT_IMPL)
-@@ -314,7 +315,6 @@ endif()
- 
- # Add a meta-target for both libraries.
- add_custom_target(cxxabi DEPENDS ${LIBCXXABI_BUILD_TARGETS})
--add_dependencies(cxxabi-test-depends cxxabi cxx)
- 
- if (LIBCXXABI_INSTALL_LIBRARY)
-   install(TARGETS ${LIBCXXABI_INSTALL_TARGETS}


Home | Main Index | Thread Index | Old Index