hi,
here's a wip diff to update to wasi stack to llvm 19:
- drop the separate libcxxabi port, looking at how
freebsd does i folded it into libcxx
- build them with devel/llvm/19
the cmake goo is horrible, and the list of cmake args is copied around
but most of it is probably useless. for some reason, most of the configure
tests fails but that doesnt seem to prevent libcxx build to succeed:
"/usr/local/llvm19/bin/wasm-ld" -m wasm32
-L/usr/local/share/wasi-sysroot/lib/wasm32-wasi
/usr/local/share/wasi-sysroot/lib/wasm32-wasi/crt1-command.o
CMakeFiles/cmTC_710f2.dir/CMakeCCompilerABI.c.o -rpath-link
/usr/X11R6/lib:/usr/local/lib
-lc /usr/local/llvm19/lib/clang/19/lib/wasi/libclang_rt.builtins-wasm32.a
-o cmTC_710f2
wasm-ld: error: unknown argument: -rpath-link
wasm-ld: error: cannot open /usr/X11R6/lib:/usr/local/lib: No such file or
directory
clang: error: linker command failed with exit code 1 (use -v to see invocation)
ninja: build stopped: subcommand failed.
i've looked hard, and i havent been able to figure out where the
'-rpath-link /usr/X11R6/lib:/usr/local/lib' bit was added to LDFLAGS.
that's not in llvm, not in the wasi stack, not in our cmake modules....
and i dont find it anywhere but in the cmake configure log output.
aaanyway, with that, i've been able to successfully build
www/mozilla-firefox & www/firefox-esr, by:
- dropping lang/wasi-sdk/libcxxabi from BDEP
- setting MODCLANG_VERSION = 19 & USE_LLD = ports (the build needs an
lld version matching the compiler version)
one less hurdle for me on the path to update the default llvm to 19 :)
Landry
? wasi-sdk/testing
? wasi-sdk/libcxx/build.log
Index: wasi-sdk/Makefile
===================================================================
RCS file: /cvs/ports/lang/wasi-sdk/Makefile,v
diff -u -r1.1.1.1 Makefile
--- wasi-sdk/Makefile 23 May 2022 14:18:41 -0000 1.1.1.1
+++ wasi-sdk/Makefile 2 Mar 2025 10:01:08 -0000
@@ -1,5 +1,4 @@
SUBDIR = compiler-rt
SUBDIR += libcxx
- SUBDIR += libcxxabi
.include <bsd.port.subdir.mk>
Index: wasi-sdk/Makefile.inc
===================================================================
RCS file: /cvs/ports/lang/wasi-sdk/Makefile.inc,v
diff -u -r1.6 Makefile.inc
--- wasi-sdk/Makefile.inc 18 Dec 2023 07:33:09 -0000 1.6
+++ wasi-sdk/Makefile.inc 2 Mar 2025 10:01:08 -0000
@@ -1,14 +1,16 @@
ONLY_FOR_ARCHS = ${LLVM_ARCHS}
-LLVM_V ?= 16.0.6
+LLVM_V ?= 19.1.7
CATEGORIES = lang
SITES =
https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_V}/
EXTRACT_SUFX = .tar.xz
COMPILER = ports-clang
+MODCLANG_VERSION= 19
MODULES = devel/cmake
WASI_SYSROOT = ${LOCALBASE}/share/wasi-sysroot
# https://github.com/WebAssembly/wasi-sdk/issues/52
CFLAGS += -fno-exceptions
CXXFLAGS += -fno-exceptions
+TRIPLE = wasm32-wasi
WRKSRC = ${WRKDIR}/${DISTNAME}/${BUILDSUBDIR}
DISTFILES = llvm-${LLVM_V}.src${EXTRACT_SUFX} \
@@ -16,14 +18,20 @@
# wasi-libcxx build needs libcxxabi source for c++abi.h only ?
.if ${PKGNAME:Mwasi-libcxx*}
DISTFILES += libcxx-${LLVM_V}.src${EXTRACT_SUFX} \
- libcxxabi-${LLVM_V}.src${EXTRACT_SUFX}
+ libcxxabi-${LLVM_V}.src${EXTRACT_SUFX} \
+ runtimes-${LLVM_V}.src${EXTRACT_SUFX}
post-extract:
mv ${WRKDIR}/libcxx-${LLVM_V}.src ${WRKDIR}/${DISTNAME}/libcxx
mv ${WRKDIR}/libcxxabi-${LLVM_V}.src ${WRKDIR}/${DISTNAME}/libcxxabi
+ mv ${WRKDIR}/runtimes-${LLVM_V}.src/* ${WRKDIR}/${DISTNAME}/runtimes
+ mv ${WRKDIR}/cmake-${LLVM_V}.src/Modules
${WRKDIR}/llvm-${LLVM_V}.src/cmake/
+ cp ${WRKDIR}/llvm-${LLVM_V}.src/cmake/modules/*
${WRKDIR}/llvm-${LLVM_V}.src/cmake/Modules/
.else
DISTFILES += compiler-rt-${LLVM_V}.src${EXTRACT_SUFX}
+post-extract:
+ mv ${WRKDIR}/llvm-${LLVM_V}.src ${WRKDIR}/llvm
.endif
post-build:
Index: wasi-sdk/compiler-rt/Makefile
===================================================================
RCS file: /cvs/ports/lang/wasi-sdk/compiler-rt/Makefile,v
diff -u -r1.10 Makefile
--- wasi-sdk/compiler-rt/Makefile 28 Jan 2025 14:38:29 -0000 1.10
+++ wasi-sdk/compiler-rt/Makefile 2 Mar 2025 10:01:08 -0000
@@ -4,9 +4,7 @@
PKGNAME = wasi-compiler-rt-${LLVM_V}
LIBPATH = wasi/libclang_rt.builtins-wasm32.a
BUILDSUBDIR = lib/builtins
-BUILD_DEPENDS += lang/wasi-libc>=0.20220413p0
-
-REVISION = 1
+BUILD_DEPENDS += lang/wasi-libc>=0.20250204
# In transition from BSD-ish to Apache 2 + LLVM exceptions
PERMIT_PACKAGE = Yes
@@ -14,31 +12,21 @@
SUBST_VARS += MODCLANG_VERSION
CONFIGURE_ARGS= \
- -DLLVM_MAIN_SRC_DIR=${WRKDIR}/llvm-${LLVM_V}.src \
-DCMAKE_MODULE_PATH=${WRKDIR}/cmake-${LLVM_V}.src/Modules \
-DLLVM_CONFIG_PATH=${LOCALBASE}/bin/llvm-config-${MODCLANG_VERSION} \
-
-DLLVM_CMAKE_DIR=${WRKDOR}/${LOCALBASE}/llvm${MODCLANG_VERSION}/lib/cmake/llvm \
+
-DLLVM_CMAKE_DIR=${LOCALBASE}/llvm${MODCLANG_VERSION}/lib/cmake/llvm \
-DCMAKE_C_COMPILER_WORKS=1 \
-DCMAKE_CXX_COMPILER_WORKS=1 \
+ -DCMAKE_C_COMPILER_TARGET=${TRIPLE} \
+ -DCMAKE_CXX_COMPILER_TARGET=${TRIPLE} \
-DCMAKE_STAGING_PREFIX=${LOCALBASE}/llvm${MODCLANG_VERSION}/lib/clang/${MODCLANG_VERSION}
\
-DCMAKE_SYSROOT=${WASI_SYSROOT} \
-DUNIX:BOOL=ON \
-DCOMPILER_RT_BAREMETAL_BUILD=ON \
- -DCOMPILER_RT_DEFAULT_TARGET_ONLY=OFF \
- -DCOMPILER_RT_DEFAULT_TARGET_TRIPLE=wasm32-wasi \
- -DCOMPILER_RT_EXCLUDE_ATOMIC_BUILTIN=TRUE \
- -DCOMPILER_RT_HAS_ATOMIC_KEYWORD:BOOL=ON \
- -DCOMPILER_RT_HAS_ASM_LSE:BOOL=OFF \
- -DCOMPILER_RT_HAS_FLOAT16:BOOL=OFF \
- -DCOMPILER_RT_HAS_FNO_BUILTIN_FLAG:BOOL=ON \
- -DCOMPILER_RT_HAS_FPIC_FLAG=OFF \
+ -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON \
-DCOMPILER_RT_HAS_FPIC_FLAG:BOOL=ON \
-DCOMPILER_RT_HAS_FPIE_FLAG:BOOL=ON \
- -DCOMPILER_RT_HAS_FREESTANDING_FLAG:BOOL=ON \
- -DCOMPILER_RT_HAS_LLVMTESTINGSUPPORT=OFF \
-DCOMPILER_RT_HAS_STD_C11_FLAG:BOOL=ON \
- -DCOMPILER_RT_HAS_VISIBILITY_HIDDEN_FLAG:BOOL=ON \
- -DCOMPILER_RT_HAS_XRAY_COMPILER_FLAG:BOOL=OFF \
-DCOMPILER_RT_INCLUDE_TESTS=OFF \
-DCOMPILER_RT_OS_DIR=wasi
Index: wasi-sdk/compiler-rt/distinfo
===================================================================
RCS file: /cvs/ports/lang/wasi-sdk/compiler-rt/distinfo,v
diff -u -r1.2 distinfo
--- wasi-sdk/compiler-rt/distinfo 18 Nov 2023 07:40:08 -0000 1.2
+++ wasi-sdk/compiler-rt/distinfo 2 Mar 2025 10:01:08 -0000
@@ -1,6 +1,6 @@
-SHA256 (cmake-16.0.6.src.tar.xz) = OdNCpBYQldLyj7ElPkWFl4rFBSERfaZm4rH28oti9RQ=
-SHA256 (compiler-rt-16.0.6.src.tar.xz) =
eRGiqcyhA5Ohf2N8Aab1VVsKOPZP9H3JFoQTpBkLwts=
-SHA256 (llvm-16.0.6.src.tar.xz) = 6R20TRs7scM/zqmn0fJCO4g+qpFj09VsoqptLwcRvCk=
-SIZE (cmake-16.0.6.src.tar.xz) = 9008
-SIZE (compiler-rt-16.0.6.src.tar.xz) = 2358240
-SIZE (llvm-16.0.6.src.tar.xz) = 56149540
+SHA256 (cmake-19.1.7.src.tar.xz) = EcWij5AFOwxD0N7D0K1Xk0f8J3GZwAUga5Y8GarlFOM=
+SHA256 (compiler-rt-19.1.7.src.tar.xz) =
wStudkICxhXBo6+aE9R3hGh4dXrg4p5fiXkhWmlY//w=
+SHA256 (llvm-19.1.7.src.tar.xz) = lvgzxq2Zo+jh2ayl9Dm4/Sx+/c+DtmTgrxwHEsUxWRA=
+SIZE (cmake-19.1.7.src.tar.xz) = 9300
+SIZE (compiler-rt-19.1.7.src.tar.xz) = 2530008
+SIZE (llvm-19.1.7.src.tar.xz) = 67828200
Index: wasi-sdk/libcxx/Makefile
===================================================================
RCS file: /cvs/ports/lang/wasi-sdk/libcxx/Makefile,v
diff -u -r1.5 Makefile
--- wasi-sdk/libcxx/Makefile 28 Jan 2025 14:38:29 -0000 1.5
+++ wasi-sdk/libcxx/Makefile 2 Mar 2025 10:01:08 -0000
@@ -2,26 +2,26 @@
DISTNAME = llvm-${LLVM_V}.src
PKGNAME = wasi-libcxx-${LLVM_V}
-LIBPATH = wasm32-wasi/libc++.a
-BUILDSUBDIR = libcxx
-
-REVISION = 1
+LIBPATH = libc++.a
+BUILDSUBDIR = runtimes
# In transition from BSD-ish to Apache 2 + LLVM exceptions
PERMIT_PACKAGE = Yes
-BUILD_DEPENDS += lang/wasi-libc>=0.20231121
+BUILD_DEPENDS += lang/wasi-libc>=0.20250204
CONFIGURE_ARGS= \
-DLLVM_MAIN_SRC_DIR=${WRKDIR}/llvm-${LLVM_V}.src \
- -DCMAKE_MODULE_PATH=${WRKDIR}/cmake-${LLVM_V}.src/Modules \
-DLLVM_CONFIG_PATH=${LOCALBASE}/bin/llvm-config-${MODCLANG_VERSION} \
-
-DLLVM_CMAKE_DIR=${WRKDOR}/${LOCALBASE}/llvm${MODCLANG_VERSION}/lib/cmake/llvm \
+
-DLLVM_CMAKE_DIR=${LOCALBASE}/llvm${MODCLANG_VERSION}/lib/cmake/llvm \
-DCMAKE_C_COMPILER_WORKS=1 \
-DCMAKE_CXX_COMPILER_WORKS=1 \
- -DCMAKE_CXX_COMPILER_TARGET=wasm32-wasi \
+ -DCMAKE_C_COMPILER_TARGET=${TRIPLE} \
+ -DCMAKE_CXX_COMPILER_TARGET=${TRIPLE} \
-DCMAKE_STAGING_PREFIX=${WASI_SYSROOT} \
-DCMAKE_SYSROOT=${WASI_SYSROOT} \
+ -DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=OFF \
+ -DCMAKE_PLATFORM_RUNTIME_PATH=\; \
-DUNIX:BOOL=ON \
-DLIBCXX_ABI_VERSION=2 \
-DLIBCXX_BUILD_EXTERNAL_THREAD_LIBRARY:BOOL=OFF \
@@ -37,11 +37,47 @@
-DLIBCXX_HAS_WIN32_THREAD_API:BOOL=OFF \
-DLIBCXX_INCLUDE_BENCHMARKS:BOOL=OFF \
-DLIBCXX_INCLUDE_TESTS:BOOL=OFF \
- -DLIBCXX_LIBDIR_SUFFIX=/wasm32-wasi \
- -DLIBCXX_SUPPORTS_FNO_EXCEPTIONS_FLAG:BOOL=ON
-
-# XXX so that libcxxabi headers are found during build
-pre-build:
- cp ${WRKDIR}/${DISTNAME}/libcxxabi/include/*.h ${WRKSRC}/src/
+ -DLIBCXX_LIBDIR_SUFFIX=/${TRIPLE} \
+ -DLIBCXX_SUPPORTS_FNO_EXCEPTIONS_FLAG:BOOL=ON \
+ -DLIBCXXABI_BUILD_EXTERNAL_THREAD_LIBRARY:BOOL=OFF \
+ -DLIBCXXABI_ENABLE_EXCEPTIONS:BOOL=OFF \
+ -DLIBCXXABI_ENABLE_SHARED:BOOL=OFF \
+ -DLIBCXXABI_ENABLE_THREADS:BOOL=OFF \
+ -DLIBCXXABI_HAS_COMMENT_LIB_PRAGMA:BOOL=ON \
+ -DLIBCXXABI_HAS_PTHREAD_API:BOOL=OFF \
+ -DLIBCXXABI_HAS_EXTERNAL_THREAD_API:BOOL=OFF \
+ -DLIBCXXABI_HAS_WIN32_THREAD_API:BOOL=OFF \
+ -DLIBCXXABI_USE_LLVM_UNWINDER:BOOL=OFF \
+ -DLIBCXXABI_LIBDIR_SUFFIX=/${TRIPLE} \
+ -DLIBCXXABI_SILENT_TERMINATE:BOOL=ON \
+ -DLIBCXXABI_SUPPORTS_FNO_EXCEPTIONS_FLAG:BOOL=ON \
+ -DLIBCXXABI_SUPPORTS_NOSTDLIBXX_FLAG:BOOL=ON \
+ -DLIBCXXABI_SUPPORTS_WALL_FLAG:BOOL=ON \
+ -DLIBCXXABI_SUPPORTS_W_FLAG:BOOL=ON \
+ -DLIBCXXABI_SUPPORTS_WWRITE_STRINGS_FLAG:BOOL=ON \
+ -DLIBCXXABI_SUPPORTS_WERROR_EQ_RETURN_TYPE_FLAG:BOOL=ON \
+ -DLIBCXXABI_SUPPORTS_WUNDEF_FLAG:BOOL=ON \
+ -DLIBCXXABI_SUPPORTS_WNO_SUGGEST_OVERRIDE_FLAG:BOOL=ON \
+ -DLIBCXXABI_SUPPORTS_WNO_ERROR_FLAG:BOOL=ON \
+ -DLIBCXXABI_SUPPORTS_EHS_FLAG:BOOL=OFF \
+ -DLIBCXXABI_SUPPORTS_EHA_FLAG:BOOL=OFF \
+ -DLIBCXXABI_SUPPORTS_WCHAR_SUBSCRIPTS_FLAG:BOOL=ON \
+ -DLIBCXXABI_SUPPORTS_WCONVERSION_FLAG:BOOL=ON \
+ -DLIBCXXABI_SUPPORTS_WMISMATCHED_TAGS_FLAG:BOOL=ON \
+ -DLIBCXXABI_SUPPORTS_WMISSING_BRACES_FLAG:BOOL=ON \
+ -DLIBCXXABI_SUPPORTS_WNEWLINE_EOF_FLAG:BOOL=ON \
+ -DLIBCXXABI_SUPPORTS_WUNUSED_FUNCTION_FLAG:BOOL=ON \
+ -DLIBCXXABI_SUPPORTS_WSHADOW_FLAG:BOOL=ON \
+ -DLIBCXXABI_SUPPORTS_WSHORTEN_64_TO_32_FLAG:BOOL=ON \
+ -DLIBCXXABI_SUPPORTS_WSIGN_COMPARE_FLAG:BOOL=ON \
+ -DLIBCXXABI_SUPPORTS_WSIGN_CONVERSION_FLAG:BOOL=ON \
+ -DLIBCXXABI_SUPPORTS_WSTRICT_ALIASING_EQ_2_FLAG:BOOL=ON \
+ -DLIBCXXABI_SUPPORTS_WSTRICT_OVERFLOW_EQ_4_FLAG:BOOL=ON \
+ -DLIBCXXABI_SUPPORTS_WUNUSED_PARAMETER_FLAG:BOOL=ON \
+ -DLIBCXXABI_SUPPORTS_WUNUSED_VARIABLE_FLAG:BOOL=ON \
+ -DLIBCXXABI_SUPPORTS_WX_FLAG:BOOL=ON \
+ -DLIBCXXABI_SUPPORTS_PEDANTIC_FLAG:BOOL=ON \
+ -DLIBCXXABI_SUPPORTS_FSTRICT_ALIASING_FLAG:BOOL=ON \
+ -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi"
.include <bsd.port.mk>
Index: wasi-sdk/libcxx/distinfo
===================================================================
RCS file: /cvs/ports/lang/wasi-sdk/libcxx/distinfo,v
diff -u -r1.2 distinfo
--- wasi-sdk/libcxx/distinfo 7 Dec 2023 12:01:18 -0000 1.2
+++ wasi-sdk/libcxx/distinfo 2 Mar 2025 10:01:08 -0000
@@ -1,8 +1,10 @@
-SHA256 (cmake-16.0.6.src.tar.xz) = OdNCpBYQldLyj7ElPkWFl4rFBSERfaZm4rH28oti9RQ=
-SHA256 (libcxx-16.0.6.src.tar.xz) =
5wRcJmB/6Ro+vPsqQKWnEArWk69WLTFgenvnlyaN5uA=
-SHA256 (libcxxabi-16.0.6.src.tar.xz) =
++zRtRGrJFlWHT+J1OaeI4lwBIY1uHusVKLiKMfkjcc=
-SHA256 (llvm-16.0.6.src.tar.xz) = 6R20TRs7scM/zqmn0fJCO4g+qpFj09VsoqptLwcRvCk=
-SIZE (cmake-16.0.6.src.tar.xz) = 9008
-SIZE (libcxx-16.0.6.src.tar.xz) = 3655520
-SIZE (libcxxabi-16.0.6.src.tar.xz) = 573564
-SIZE (llvm-16.0.6.src.tar.xz) = 56149540
+SHA256 (cmake-19.1.7.src.tar.xz) = EcWij5AFOwxD0N7D0K1Xk0f8J3GZwAUga5Y8GarlFOM=
+SHA256 (libcxx-19.1.7.src.tar.xz) =
tzYQllD/x1Db3FBkgzR7NxPe2dAwD0hDK4IK1mtqkFI=
+SHA256 (libcxxabi-19.1.7.src.tar.xz) =
TSUSUQnj/r4Tk+njD5MVMzPYK0jOe+1je9La9Sv0AXI=
+SHA256 (llvm-19.1.7.src.tar.xz) = lvgzxq2Zo+jh2ayl9Dm4/Sx+/c+DtmTgrxwHEsUxWRA=
+SHA256 (runtimes-19.1.7.src.tar.xz) =
QExUwt9FowczHroTcpF+xICt3zt3yplD7U1+pEXvsI8=
+SIZE (cmake-19.1.7.src.tar.xz) = 9300
+SIZE (libcxx-19.1.7.src.tar.xz) = 4718816
+SIZE (libcxxabi-19.1.7.src.tar.xz) = 583696
+SIZE (llvm-19.1.7.src.tar.xz) = 67828200
+SIZE (runtimes-19.1.7.src.tar.xz) = 7224
Index: wasi-sdk/libcxx/patches/patch-libcxx_include_CMakeLists_txt
===================================================================
RCS file: wasi-sdk/libcxx/patches/patch-libcxx_include_CMakeLists_txt
diff -N wasi-sdk/libcxx/patches/patch-libcxx_include_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ wasi-sdk/libcxx/patches/patch-libcxx_include_CMakeLists_txt 2 Mar 2025
10:01:08 -0000
@@ -0,0 +1,34 @@
+for some reason libcxx.imp isnt generated
+
+Index: libcxx/include/CMakeLists.txt
+--- libcxx/include/CMakeLists.txt.orig
++++ libcxx/include/CMakeLists.txt
+@@ -1033,15 +1033,6 @@ foreach(f ${files})
+ list(APPEND _all_includes "${dst}")
+ endforeach()
+
+-# Generate the IWYU mapping. This depends on all header files but it's also
considered as an
+-# "include" for dependency tracking.
+-add_custom_command(OUTPUT "${LIBCXX_GENERATED_INCLUDE_DIR}/libcxx.imp"
+- COMMAND "${Python3_EXECUTABLE}"
"${LIBCXX_SOURCE_DIR}/utils/generate_iwyu_mapping.py" "-o"
"${LIBCXX_GENERATED_INCLUDE_DIR}/libcxx.imp"
+- DEPENDS ${_all_includes}
+- COMMENT "Generate the mapping file for include-what-you-use"
+-)
+-list(APPEND _all_includes "${LIBCXX_GENERATED_INCLUDE_DIR}/libcxx.imp")
+-
+ add_custom_target(generate-cxx-headers ALL DEPENDS ${_all_includes})
+
+ add_library(cxx-headers INTERFACE)
+@@ -1070,12 +1061,6 @@ if (LIBCXX_INSTALL_HEADERS)
+
+ # Install the generated __assertion_handler file to the generic include dir.
+ install(FILES "${LIBCXX_GENERATED_INCLUDE_DIR}/__assertion_handler"
+- DESTINATION "${LIBCXX_INSTALL_INCLUDE_DIR}"
+- PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+- COMPONENT cxx-headers)
+-
+- # Install the generated IWYU file to the generic include dir.
+- install(FILES "${LIBCXX_GENERATED_INCLUDE_DIR}/libcxx.imp"
+ DESTINATION "${LIBCXX_INSTALL_INCLUDE_DIR}"
+ PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+ COMPONENT cxx-headers)
Index: wasi-sdk/libcxx/patches/patch-runtimes_CMakeLists_txt
===================================================================
RCS file: wasi-sdk/libcxx/patches/patch-runtimes_CMakeLists_txt
diff -N wasi-sdk/libcxx/patches/patch-runtimes_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ wasi-sdk/libcxx/patches/patch-runtimes_CMakeLists_txt 2 Mar 2025
10:01:08 -0000
@@ -0,0 +1,17 @@
+Index: runtimes/CMakeLists.txt
+--- runtimes/CMakeLists.txt.orig
++++ runtimes/CMakeLists.txt
+@@ -72,11 +72,11 @@ set(LLVM_LIBRARY_OUTPUT_INTDIR ${LLVM_LIBRARY_DIR})
+ set(LLVM_RUNTIME_OUTPUT_INTDIR ${LLVM_TOOLS_BINARY_DIR})
+
+ # This variable makes sure that e.g. llvm-lit is found.
+-set(LLVM_MAIN_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../llvm)
++set(LLVM_MAIN_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/..)
+ set(LLVM_CMAKE_DIR ${LLVM_MAIN_SRC_DIR}/cmake/modules)
+
+ # This variable is used by individual runtimes to locate LLVM files.
+-set(LLVM_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../llvm)
++set(LLVM_PATH ${CMAKE_CURRENT_SOURCE_DIR}/..)
+
+ include(CheckLibraryExists)
+ include(LLVMCheckCompilerLinkerFlag)
Index: wasi-sdk/libcxx/pkg/PLIST
===================================================================
RCS file: /cvs/ports/lang/wasi-sdk/libcxx/pkg/PLIST,v
diff -u -r1.2 PLIST
--- wasi-sdk/libcxx/pkg/PLIST 7 Dec 2023 12:01:18 -0000 1.2
+++ wasi-sdk/libcxx/pkg/PLIST 2 Mar 2025 10:01:08 -0000
@@ -1,3 +1,5 @@
+@conflict wasi-libcxxabi-<=16.0.6
+@pkgpath lang/wasi-sdk/libcxxabi
share/wasi-sysroot/
share/wasi-sysroot/include/
share/wasi-sysroot/include/c++/
@@ -26,8 +28,11 @@
share/wasi-sysroot/include/c++/v1/__algorithm/find_first_of.h
share/wasi-sysroot/include/c++/v1/__algorithm/find_if.h
share/wasi-sysroot/include/c++/v1/__algorithm/find_if_not.h
+share/wasi-sysroot/include/c++/v1/__algorithm/find_segment_if.h
+share/wasi-sysroot/include/c++/v1/__algorithm/fold.h
share/wasi-sysroot/include/c++/v1/__algorithm/for_each.h
share/wasi-sysroot/include/c++/v1/__algorithm/for_each_n.h
+share/wasi-sysroot/include/c++/v1/__algorithm/for_each_segment.h
share/wasi-sysroot/include/c++/v1/__algorithm/generate.h
share/wasi-sysroot/include/c++/v1/__algorithm/generate_n.h
share/wasi-sysroot/include/c++/v1/__algorithm/half_positive.h
@@ -48,6 +53,7 @@
share/wasi-sysroot/include/c++/v1/__algorithm/iter_swap.h
share/wasi-sysroot/include/c++/v1/__algorithm/iterator_operations.h
share/wasi-sysroot/include/c++/v1/__algorithm/lexicographical_compare.h
+share/wasi-sysroot/include/c++/v1/__algorithm/lexicographical_compare_three_way.h
share/wasi-sysroot/include/c++/v1/__algorithm/lower_bound.h
share/wasi-sysroot/include/c++/v1/__algorithm/make_heap.h
share/wasi-sysroot/include/c++/v1/__algorithm/make_projected.h
@@ -72,18 +78,22 @@
share/wasi-sysroot/include/c++/v1/__algorithm/partition_point.h
share/wasi-sysroot/include/c++/v1/__algorithm/pop_heap.h
share/wasi-sysroot/include/c++/v1/__algorithm/prev_permutation.h
+share/wasi-sysroot/include/c++/v1/__algorithm/pstl.h
share/wasi-sysroot/include/c++/v1/__algorithm/push_heap.h
share/wasi-sysroot/include/c++/v1/__algorithm/ranges_adjacent_find.h
share/wasi-sysroot/include/c++/v1/__algorithm/ranges_all_of.h
share/wasi-sysroot/include/c++/v1/__algorithm/ranges_any_of.h
share/wasi-sysroot/include/c++/v1/__algorithm/ranges_binary_search.h
share/wasi-sysroot/include/c++/v1/__algorithm/ranges_clamp.h
+share/wasi-sysroot/include/c++/v1/__algorithm/ranges_contains.h
+share/wasi-sysroot/include/c++/v1/__algorithm/ranges_contains_subrange.h
share/wasi-sysroot/include/c++/v1/__algorithm/ranges_copy.h
share/wasi-sysroot/include/c++/v1/__algorithm/ranges_copy_backward.h
share/wasi-sysroot/include/c++/v1/__algorithm/ranges_copy_if.h
share/wasi-sysroot/include/c++/v1/__algorithm/ranges_copy_n.h
share/wasi-sysroot/include/c++/v1/__algorithm/ranges_count.h
share/wasi-sysroot/include/c++/v1/__algorithm/ranges_count_if.h
+share/wasi-sysroot/include/c++/v1/__algorithm/ranges_ends_with.h
share/wasi-sysroot/include/c++/v1/__algorithm/ranges_equal.h
share/wasi-sysroot/include/c++/v1/__algorithm/ranges_equal_range.h
share/wasi-sysroot/include/c++/v1/__algorithm/ranges_fill.h
@@ -93,6 +103,7 @@
share/wasi-sysroot/include/c++/v1/__algorithm/ranges_find_first_of.h
share/wasi-sysroot/include/c++/v1/__algorithm/ranges_find_if.h
share/wasi-sysroot/include/c++/v1/__algorithm/ranges_find_if_not.h
+share/wasi-sysroot/include/c++/v1/__algorithm/ranges_find_last.h
share/wasi-sysroot/include/c++/v1/__algorithm/ranges_for_each.h
share/wasi-sysroot/include/c++/v1/__algorithm/ranges_for_each_n.h
share/wasi-sysroot/include/c++/v1/__algorithm/ranges_generate.h
@@ -154,6 +165,7 @@
share/wasi-sysroot/include/c++/v1/__algorithm/ranges_sort_heap.h
share/wasi-sysroot/include/c++/v1/__algorithm/ranges_stable_partition.h
share/wasi-sysroot/include/c++/v1/__algorithm/ranges_stable_sort.h
+share/wasi-sysroot/include/c++/v1/__algorithm/ranges_starts_with.h
share/wasi-sysroot/include/c++/v1/__algorithm/ranges_swap_ranges.h
share/wasi-sysroot/include/c++/v1/__algorithm/ranges_transform.h
share/wasi-sysroot/include/c++/v1/__algorithm/ranges_unique.h
@@ -182,11 +194,13 @@
share/wasi-sysroot/include/c++/v1/__algorithm/shift_right.h
share/wasi-sysroot/include/c++/v1/__algorithm/shuffle.h
share/wasi-sysroot/include/c++/v1/__algorithm/sift_down.h
+share/wasi-sysroot/include/c++/v1/__algorithm/simd_utils.h
share/wasi-sysroot/include/c++/v1/__algorithm/sort.h
share/wasi-sysroot/include/c++/v1/__algorithm/sort_heap.h
share/wasi-sysroot/include/c++/v1/__algorithm/stable_partition.h
share/wasi-sysroot/include/c++/v1/__algorithm/stable_sort.h
share/wasi-sysroot/include/c++/v1/__algorithm/swap_ranges.h
+share/wasi-sysroot/include/c++/v1/__algorithm/three_way_comp_ref_type.h
share/wasi-sysroot/include/c++/v1/__algorithm/transform.h
share/wasi-sysroot/include/c++/v1/__algorithm/uniform_random_bit_generator_adaptor.h
share/wasi-sysroot/include/c++/v1/__algorithm/unique.h
@@ -195,7 +209,24 @@
share/wasi-sysroot/include/c++/v1/__algorithm/unwrap_range.h
share/wasi-sysroot/include/c++/v1/__algorithm/upper_bound.h
share/wasi-sysroot/include/c++/v1/__assert
-share/wasi-sysroot/include/c++/v1/__availability
+share/wasi-sysroot/include/c++/v1/__assertion_handler
+share/wasi-sysroot/include/c++/v1/__atomic/
+share/wasi-sysroot/include/c++/v1/__atomic/aliases.h
+share/wasi-sysroot/include/c++/v1/__atomic/atomic.h
+share/wasi-sysroot/include/c++/v1/__atomic/atomic_base.h
+share/wasi-sysroot/include/c++/v1/__atomic/atomic_flag.h
+share/wasi-sysroot/include/c++/v1/__atomic/atomic_init.h
+share/wasi-sysroot/include/c++/v1/__atomic/atomic_lock_free.h
+share/wasi-sysroot/include/c++/v1/__atomic/atomic_ref.h
+share/wasi-sysroot/include/c++/v1/__atomic/atomic_sync.h
+share/wasi-sysroot/include/c++/v1/__atomic/check_memory_order.h
+share/wasi-sysroot/include/c++/v1/__atomic/contention_t.h
+share/wasi-sysroot/include/c++/v1/__atomic/cxx_atomic_impl.h
+share/wasi-sysroot/include/c++/v1/__atomic/fence.h
+share/wasi-sysroot/include/c++/v1/__atomic/is_always_lock_free.h
+share/wasi-sysroot/include/c++/v1/__atomic/kill_dependency.h
+share/wasi-sysroot/include/c++/v1/__atomic/memory_order.h
+share/wasi-sysroot/include/c++/v1/__atomic/to_gcc_order.h
share/wasi-sysroot/include/c++/v1/__bit/
share/wasi-sysroot/include/c++/v1/__bit/bit_cast.h
share/wasi-sysroot/include/c++/v1/__bit/bit_ceil.h
@@ -208,28 +239,36 @@
share/wasi-sysroot/include/c++/v1/__bit/countr.h
share/wasi-sysroot/include/c++/v1/__bit/endian.h
share/wasi-sysroot/include/c++/v1/__bit/has_single_bit.h
+share/wasi-sysroot/include/c++/v1/__bit/invert_if.h
share/wasi-sysroot/include/c++/v1/__bit/popcount.h
share/wasi-sysroot/include/c++/v1/__bit/rotate.h
share/wasi-sysroot/include/c++/v1/__bit_reference
-share/wasi-sysroot/include/c++/v1/__bsd_locale_defaults.h
-share/wasi-sysroot/include/c++/v1/__bsd_locale_fallbacks.h
share/wasi-sysroot/include/c++/v1/__charconv/
share/wasi-sysroot/include/c++/v1/__charconv/chars_format.h
+share/wasi-sysroot/include/c++/v1/__charconv/from_chars_integral.h
share/wasi-sysroot/include/c++/v1/__charconv/from_chars_result.h
share/wasi-sysroot/include/c++/v1/__charconv/tables.h
+share/wasi-sysroot/include/c++/v1/__charconv/to_chars.h
share/wasi-sysroot/include/c++/v1/__charconv/to_chars_base_10.h
+share/wasi-sysroot/include/c++/v1/__charconv/to_chars_floating_point.h
+share/wasi-sysroot/include/c++/v1/__charconv/to_chars_integral.h
share/wasi-sysroot/include/c++/v1/__charconv/to_chars_result.h
+share/wasi-sysroot/include/c++/v1/__charconv/traits.h
share/wasi-sysroot/include/c++/v1/__chrono/
share/wasi-sysroot/include/c++/v1/__chrono/calendar.h
+share/wasi-sysroot/include/c++/v1/__chrono/concepts.h
share/wasi-sysroot/include/c++/v1/__chrono/convert_to_timespec.h
share/wasi-sysroot/include/c++/v1/__chrono/convert_to_tm.h
share/wasi-sysroot/include/c++/v1/__chrono/day.h
share/wasi-sysroot/include/c++/v1/__chrono/duration.h
+share/wasi-sysroot/include/c++/v1/__chrono/exception.h
share/wasi-sysroot/include/c++/v1/__chrono/file_clock.h
share/wasi-sysroot/include/c++/v1/__chrono/formatter.h
share/wasi-sysroot/include/c++/v1/__chrono/hh_mm_ss.h
share/wasi-sysroot/include/c++/v1/__chrono/high_resolution_clock.h
+share/wasi-sysroot/include/c++/v1/__chrono/leap_second.h
share/wasi-sysroot/include/c++/v1/__chrono/literals.h
+share/wasi-sysroot/include/c++/v1/__chrono/local_info.h
share/wasi-sysroot/include/c++/v1/__chrono/month.h
share/wasi-sysroot/include/c++/v1/__chrono/month_weekday.h
share/wasi-sysroot/include/c++/v1/__chrono/monthday.h
@@ -237,13 +276,19 @@
share/wasi-sysroot/include/c++/v1/__chrono/parser_std_format_spec.h
share/wasi-sysroot/include/c++/v1/__chrono/statically_widen.h
share/wasi-sysroot/include/c++/v1/__chrono/steady_clock.h
+share/wasi-sysroot/include/c++/v1/__chrono/sys_info.h
share/wasi-sysroot/include/c++/v1/__chrono/system_clock.h
share/wasi-sysroot/include/c++/v1/__chrono/time_point.h
+share/wasi-sysroot/include/c++/v1/__chrono/time_zone.h
+share/wasi-sysroot/include/c++/v1/__chrono/time_zone_link.h
+share/wasi-sysroot/include/c++/v1/__chrono/tzdb.h
+share/wasi-sysroot/include/c++/v1/__chrono/tzdb_list.h
share/wasi-sysroot/include/c++/v1/__chrono/weekday.h
share/wasi-sysroot/include/c++/v1/__chrono/year.h
share/wasi-sysroot/include/c++/v1/__chrono/year_month.h
share/wasi-sysroot/include/c++/v1/__chrono/year_month_day.h
share/wasi-sysroot/include/c++/v1/__chrono/year_month_weekday.h
+share/wasi-sysroot/include/c++/v1/__chrono/zoned_time.h
share/wasi-sysroot/include/c++/v1/__compare/
share/wasi-sysroot/include/c++/v1/__compare/common_comparison_category.h
share/wasi-sysroot/include/c++/v1/__compare/compare_partial_order_fallback.h
@@ -281,17 +326,32 @@
share/wasi-sysroot/include/c++/v1/__concepts/semiregular.h
share/wasi-sysroot/include/c++/v1/__concepts/swappable.h
share/wasi-sysroot/include/c++/v1/__concepts/totally_ordered.h
+share/wasi-sysroot/include/c++/v1/__condition_variable/
+share/wasi-sysroot/include/c++/v1/__condition_variable/condition_variable.h
share/wasi-sysroot/include/c++/v1/__config
share/wasi-sysroot/include/c++/v1/__config_site
+share/wasi-sysroot/include/c++/v1/__configuration/
+share/wasi-sysroot/include/c++/v1/__configuration/abi.h
+share/wasi-sysroot/include/c++/v1/__configuration/availability.h
+share/wasi-sysroot/include/c++/v1/__configuration/compiler.h
+share/wasi-sysroot/include/c++/v1/__configuration/language.h
+share/wasi-sysroot/include/c++/v1/__configuration/platform.h
share/wasi-sysroot/include/c++/v1/__coroutine/
share/wasi-sysroot/include/c++/v1/__coroutine/coroutine_handle.h
share/wasi-sysroot/include/c++/v1/__coroutine/coroutine_traits.h
share/wasi-sysroot/include/c++/v1/__coroutine/noop_coroutine_handle.h
share/wasi-sysroot/include/c++/v1/__coroutine/trivial_awaitables.h
-share/wasi-sysroot/include/c++/v1/__debug
+share/wasi-sysroot/include/c++/v1/__cxxabi_config.h
share/wasi-sysroot/include/c++/v1/__debug_utils/
share/wasi-sysroot/include/c++/v1/__debug_utils/randomize_range.h
-share/wasi-sysroot/include/c++/v1/__errc
+share/wasi-sysroot/include/c++/v1/__debug_utils/sanitizers.h
+share/wasi-sysroot/include/c++/v1/__debug_utils/strict_weak_ordering_check.h
+share/wasi-sysroot/include/c++/v1/__exception/
+share/wasi-sysroot/include/c++/v1/__exception/exception.h
+share/wasi-sysroot/include/c++/v1/__exception/exception_ptr.h
+share/wasi-sysroot/include/c++/v1/__exception/nested_exception.h
+share/wasi-sysroot/include/c++/v1/__exception/operations.h
+share/wasi-sysroot/include/c++/v1/__exception/terminate.h
share/wasi-sysroot/include/c++/v1/__expected/
share/wasi-sysroot/include/c++/v1/__expected/bad_expected_access.h
share/wasi-sysroot/include/c++/v1/__expected/expected.h
@@ -327,7 +387,6 @@
share/wasi-sysroot/include/c++/v1/__format/format_context.h
share/wasi-sysroot/include/c++/v1/__format/format_error.h
share/wasi-sysroot/include/c++/v1/__format/format_functions.h
-share/wasi-sysroot/include/c++/v1/__format/format_fwd.h
share/wasi-sysroot/include/c++/v1/__format/format_parse_context.h
share/wasi-sysroot/include/c++/v1/__format/format_string.h
share/wasi-sysroot/include/c++/v1/__format/format_to_n_result.h
@@ -341,10 +400,13 @@
share/wasi-sysroot/include/c++/v1/__format/formatter_pointer.h
share/wasi-sysroot/include/c++/v1/__format/formatter_string.h
share/wasi-sysroot/include/c++/v1/__format/formatter_tuple.h
+share/wasi-sysroot/include/c++/v1/__format/indic_conjunct_break_table.h
share/wasi-sysroot/include/c++/v1/__format/parser_std_format_spec.h
share/wasi-sysroot/include/c++/v1/__format/range_default_formatter.h
share/wasi-sysroot/include/c++/v1/__format/range_formatter.h
share/wasi-sysroot/include/c++/v1/__format/unicode.h
+share/wasi-sysroot/include/c++/v1/__format/width_estimation_table.h
+share/wasi-sysroot/include/c++/v1/__format/write_escaped.h
share/wasi-sysroot/include/c++/v1/__functional/
share/wasi-sysroot/include/c++/v1/__functional/binary_function.h
share/wasi-sysroot/include/c++/v1/__functional/binary_negate.h
@@ -372,30 +434,45 @@
share/wasi-sysroot/include/c++/v1/__functional/reference_wrapper.h
share/wasi-sysroot/include/c++/v1/__functional/unary_function.h
share/wasi-sysroot/include/c++/v1/__functional/unary_negate.h
-share/wasi-sysroot/include/c++/v1/__functional/unwrap_ref.h
share/wasi-sysroot/include/c++/v1/__functional/weak_result_type.h
share/wasi-sysroot/include/c++/v1/__fwd/
share/wasi-sysroot/include/c++/v1/__fwd/array.h
-share/wasi-sysroot/include/c++/v1/__fwd/get.h
-share/wasi-sysroot/include/c++/v1/__fwd/hash.h
+share/wasi-sysroot/include/c++/v1/__fwd/bit_reference.h
+share/wasi-sysroot/include/c++/v1/__fwd/complex.h
+share/wasi-sysroot/include/c++/v1/__fwd/deque.h
+share/wasi-sysroot/include/c++/v1/__fwd/format.h
+share/wasi-sysroot/include/c++/v1/__fwd/fstream.h
+share/wasi-sysroot/include/c++/v1/__fwd/functional.h
+share/wasi-sysroot/include/c++/v1/__fwd/ios.h
+share/wasi-sysroot/include/c++/v1/__fwd/istream.h
+share/wasi-sysroot/include/c++/v1/__fwd/mdspan.h
+share/wasi-sysroot/include/c++/v1/__fwd/memory.h
share/wasi-sysroot/include/c++/v1/__fwd/memory_resource.h
+share/wasi-sysroot/include/c++/v1/__fwd/ostream.h
share/wasi-sysroot/include/c++/v1/__fwd/pair.h
+share/wasi-sysroot/include/c++/v1/__fwd/queue.h
share/wasi-sysroot/include/c++/v1/__fwd/span.h
+share/wasi-sysroot/include/c++/v1/__fwd/sstream.h
+share/wasi-sysroot/include/c++/v1/__fwd/stack.h
+share/wasi-sysroot/include/c++/v1/__fwd/streambuf.h
share/wasi-sysroot/include/c++/v1/__fwd/string.h
share/wasi-sysroot/include/c++/v1/__fwd/string_view.h
share/wasi-sysroot/include/c++/v1/__fwd/subrange.h
share/wasi-sysroot/include/c++/v1/__fwd/tuple.h
+share/wasi-sysroot/include/c++/v1/__fwd/vector.h
share/wasi-sysroot/include/c++/v1/__hash_table
share/wasi-sysroot/include/c++/v1/__ios/
share/wasi-sysroot/include/c++/v1/__ios/fpos.h
share/wasi-sysroot/include/c++/v1/__iterator/
share/wasi-sysroot/include/c++/v1/__iterator/access.h
share/wasi-sysroot/include/c++/v1/__iterator/advance.h
+share/wasi-sysroot/include/c++/v1/__iterator/aliasing_iterator.h
share/wasi-sysroot/include/c++/v1/__iterator/back_insert_iterator.h
share/wasi-sysroot/include/c++/v1/__iterator/bounded_iter.h
share/wasi-sysroot/include/c++/v1/__iterator/common_iterator.h
share/wasi-sysroot/include/c++/v1/__iterator/concepts.h
share/wasi-sysroot/include/c++/v1/__iterator/counted_iterator.h
+share/wasi-sysroot/include/c++/v1/__iterator/cpp17_iterator_concepts.h
share/wasi-sysroot/include/c++/v1/__iterator/data.h
share/wasi-sysroot/include/c++/v1/__iterator/default_sentinel.h
share/wasi-sysroot/include/c++/v1/__iterator/distance.h
@@ -421,6 +498,7 @@
share/wasi-sysroot/include/c++/v1/__iterator/permutable.h
share/wasi-sysroot/include/c++/v1/__iterator/prev.h
share/wasi-sysroot/include/c++/v1/__iterator/projected.h
+share/wasi-sysroot/include/c++/v1/__iterator/ranges_iterator_traits.h
share/wasi-sysroot/include/c++/v1/__iterator/readable_traits.h
share/wasi-sysroot/include/c++/v1/__iterator/reverse_access.h
share/wasi-sysroot/include/c++/v1/__iterator/reverse_iterator.h
@@ -430,10 +508,52 @@
share/wasi-sysroot/include/c++/v1/__iterator/unreachable_sentinel.h
share/wasi-sysroot/include/c++/v1/__iterator/wrap_iter.h
share/wasi-sysroot/include/c++/v1/__locale
+share/wasi-sysroot/include/c++/v1/__locale_dir/
+share/wasi-sysroot/include/c++/v1/__locale_dir/locale_base_api/
+share/wasi-sysroot/include/c++/v1/__locale_dir/locale_base_api.h
+share/wasi-sysroot/include/c++/v1/__locale_dir/locale_base_api/android.h
+share/wasi-sysroot/include/c++/v1/__locale_dir/locale_base_api/bsd_locale_defaults.h
+share/wasi-sysroot/include/c++/v1/__locale_dir/locale_base_api/bsd_locale_fallbacks.h
+share/wasi-sysroot/include/c++/v1/__locale_dir/locale_base_api/fuchsia.h
+share/wasi-sysroot/include/c++/v1/__locale_dir/locale_base_api/ibm.h
+share/wasi-sysroot/include/c++/v1/__locale_dir/locale_base_api/locale_guard.h
+share/wasi-sysroot/include/c++/v1/__locale_dir/locale_base_api/musl.h
+share/wasi-sysroot/include/c++/v1/__locale_dir/locale_base_api/newlib.h
+share/wasi-sysroot/include/c++/v1/__locale_dir/locale_base_api/openbsd.h
+share/wasi-sysroot/include/c++/v1/__locale_dir/locale_base_api/win32.h
+share/wasi-sysroot/include/c++/v1/__math/
+share/wasi-sysroot/include/c++/v1/__math/abs.h
+share/wasi-sysroot/include/c++/v1/__math/copysign.h
+share/wasi-sysroot/include/c++/v1/__math/error_functions.h
+share/wasi-sysroot/include/c++/v1/__math/exponential_functions.h
+share/wasi-sysroot/include/c++/v1/__math/fdim.h
+share/wasi-sysroot/include/c++/v1/__math/fma.h
+share/wasi-sysroot/include/c++/v1/__math/gamma.h
+share/wasi-sysroot/include/c++/v1/__math/hyperbolic_functions.h
+share/wasi-sysroot/include/c++/v1/__math/hypot.h
+share/wasi-sysroot/include/c++/v1/__math/inverse_hyperbolic_functions.h
+share/wasi-sysroot/include/c++/v1/__math/inverse_trigonometric_functions.h
+share/wasi-sysroot/include/c++/v1/__math/logarithms.h
+share/wasi-sysroot/include/c++/v1/__math/min_max.h
+share/wasi-sysroot/include/c++/v1/__math/modulo.h
+share/wasi-sysroot/include/c++/v1/__math/remainder.h
+share/wasi-sysroot/include/c++/v1/__math/roots.h
+share/wasi-sysroot/include/c++/v1/__math/rounding_functions.h
+share/wasi-sysroot/include/c++/v1/__math/special_functions.h
+share/wasi-sysroot/include/c++/v1/__math/traits.h
+share/wasi-sysroot/include/c++/v1/__math/trigonometric_functions.h
share/wasi-sysroot/include/c++/v1/__mbstate_t.h
+share/wasi-sysroot/include/c++/v1/__mdspan/
+share/wasi-sysroot/include/c++/v1/__mdspan/default_accessor.h
+share/wasi-sysroot/include/c++/v1/__mdspan/extents.h
+share/wasi-sysroot/include/c++/v1/__mdspan/layout_left.h
+share/wasi-sysroot/include/c++/v1/__mdspan/layout_right.h
+share/wasi-sysroot/include/c++/v1/__mdspan/layout_stride.h
+share/wasi-sysroot/include/c++/v1/__mdspan/mdspan.h
share/wasi-sysroot/include/c++/v1/__memory/
share/wasi-sysroot/include/c++/v1/__memory/addressof.h
share/wasi-sysroot/include/c++/v1/__memory/align.h
+share/wasi-sysroot/include/c++/v1/__memory/aligned_alloc.h
share/wasi-sysroot/include/c++/v1/__memory/allocate_at_least.h
share/wasi-sysroot/include/c++/v1/__memory/allocation_guard.h
share/wasi-sysroot/include/c++/v1/__memory/allocator.h
@@ -447,6 +567,8 @@
share/wasi-sysroot/include/c++/v1/__memory/concepts.h
share/wasi-sysroot/include/c++/v1/__memory/construct_at.h
share/wasi-sysroot/include/c++/v1/__memory/destruct_n.h
+share/wasi-sysroot/include/c++/v1/__memory/inout_ptr.h
+share/wasi-sysroot/include/c++/v1/__memory/out_ptr.h
share/wasi-sysroot/include/c++/v1/__memory/pointer_traits.h
share/wasi-sysroot/include/c++/v1/__memory/ranges_construct_at.h
share/wasi-sysroot/include/c++/v1/__memory/ranges_uninitialized_algorithms.h
@@ -467,7 +589,12 @@
share/wasi-sysroot/include/c++/v1/__memory_resource/pool_options.h
share/wasi-sysroot/include/c++/v1/__memory_resource/synchronized_pool_resource.h
share/wasi-sysroot/include/c++/v1/__memory_resource/unsynchronized_pool_resource.h
-share/wasi-sysroot/include/c++/v1/__mutex_base
+share/wasi-sysroot/include/c++/v1/__mutex/
+share/wasi-sysroot/include/c++/v1/__mutex/lock_guard.h
+share/wasi-sysroot/include/c++/v1/__mutex/mutex.h
+share/wasi-sysroot/include/c++/v1/__mutex/once_flag.h
+share/wasi-sysroot/include/c++/v1/__mutex/tag_types.h
+share/wasi-sysroot/include/c++/v1/__mutex/unique_lock.h
share/wasi-sysroot/include/c++/v1/__node_handle
share/wasi-sysroot/include/c++/v1/__numeric/
share/wasi-sysroot/include/c++/v1/__numeric/accumulate.h
@@ -479,10 +606,35 @@
share/wasi-sysroot/include/c++/v1/__numeric/iota.h
share/wasi-sysroot/include/c++/v1/__numeric/midpoint.h
share/wasi-sysroot/include/c++/v1/__numeric/partial_sum.h
+share/wasi-sysroot/include/c++/v1/__numeric/pstl.h
share/wasi-sysroot/include/c++/v1/__numeric/reduce.h
+share/wasi-sysroot/include/c++/v1/__numeric/saturation_arithmetic.h
share/wasi-sysroot/include/c++/v1/__numeric/transform_exclusive_scan.h
share/wasi-sysroot/include/c++/v1/__numeric/transform_inclusive_scan.h
share/wasi-sysroot/include/c++/v1/__numeric/transform_reduce.h
+share/wasi-sysroot/include/c++/v1/__ostream/
+share/wasi-sysroot/include/c++/v1/__ostream/basic_ostream.h
+share/wasi-sysroot/include/c++/v1/__ostream/print.h
+share/wasi-sysroot/include/c++/v1/__pstl/
+share/wasi-sysroot/include/c++/v1/__pstl/backend.h
+share/wasi-sysroot/include/c++/v1/__pstl/backend_fwd.h
+share/wasi-sysroot/include/c++/v1/__pstl/backends/
+share/wasi-sysroot/include/c++/v1/__pstl/backends/default.h
+share/wasi-sysroot/include/c++/v1/__pstl/backends/libdispatch.h
+share/wasi-sysroot/include/c++/v1/__pstl/backends/serial.h
+share/wasi-sysroot/include/c++/v1/__pstl/backends/std_thread.h
+share/wasi-sysroot/include/c++/v1/__pstl/cpu_algos/
+share/wasi-sysroot/include/c++/v1/__pstl/cpu_algos/any_of.h
+share/wasi-sysroot/include/c++/v1/__pstl/cpu_algos/cpu_traits.h
+share/wasi-sysroot/include/c++/v1/__pstl/cpu_algos/fill.h
+share/wasi-sysroot/include/c++/v1/__pstl/cpu_algos/find_if.h
+share/wasi-sysroot/include/c++/v1/__pstl/cpu_algos/for_each.h
+share/wasi-sysroot/include/c++/v1/__pstl/cpu_algos/merge.h
+share/wasi-sysroot/include/c++/v1/__pstl/cpu_algos/stable_sort.h
+share/wasi-sysroot/include/c++/v1/__pstl/cpu_algos/transform.h
+share/wasi-sysroot/include/c++/v1/__pstl/cpu_algos/transform_reduce.h
+share/wasi-sysroot/include/c++/v1/__pstl/dispatch.h
+share/wasi-sysroot/include/c++/v1/__pstl/handle_exception.h
share/wasi-sysroot/include/c++/v1/__random/
share/wasi-sysroot/include/c++/v1/__random/bernoulli_distribution.h
share/wasi-sysroot/include/c++/v1/__random/binomial_distribution.h
@@ -525,9 +677,10 @@
share/wasi-sysroot/include/c++/v1/__ranges/access.h
share/wasi-sysroot/include/c++/v1/__ranges/all.h
share/wasi-sysroot/include/c++/v1/__ranges/as_rvalue_view.h
+share/wasi-sysroot/include/c++/v1/__ranges/chunk_by_view.h
share/wasi-sysroot/include/c++/v1/__ranges/common_view.h
share/wasi-sysroot/include/c++/v1/__ranges/concepts.h
-share/wasi-sysroot/include/c++/v1/__ranges/copyable_box.h
+share/wasi-sysroot/include/c++/v1/__ranges/container_compatible_range.h
share/wasi-sysroot/include/c++/v1/__ranges/counted.h
share/wasi-sysroot/include/c++/v1/__ranges/dangling.h
share/wasi-sysroot/include/c++/v1/__ranges/data.h
@@ -539,16 +692,19 @@
share/wasi-sysroot/include/c++/v1/__ranges/enable_borrowed_range.h
share/wasi-sysroot/include/c++/v1/__ranges/enable_view.h
share/wasi-sysroot/include/c++/v1/__ranges/filter_view.h
+share/wasi-sysroot/include/c++/v1/__ranges/from_range.h
share/wasi-sysroot/include/c++/v1/__ranges/iota_view.h
share/wasi-sysroot/include/c++/v1/__ranges/istream_view.h
share/wasi-sysroot/include/c++/v1/__ranges/join_view.h
share/wasi-sysroot/include/c++/v1/__ranges/lazy_split_view.h
+share/wasi-sysroot/include/c++/v1/__ranges/movable_box.h
share/wasi-sysroot/include/c++/v1/__ranges/non_propagating_cache.h
share/wasi-sysroot/include/c++/v1/__ranges/owning_view.h
share/wasi-sysroot/include/c++/v1/__ranges/range_adaptor.h
share/wasi-sysroot/include/c++/v1/__ranges/rbegin.h
share/wasi-sysroot/include/c++/v1/__ranges/ref_view.h
share/wasi-sysroot/include/c++/v1/__ranges/rend.h
+share/wasi-sysroot/include/c++/v1/__ranges/repeat_view.h
share/wasi-sysroot/include/c++/v1/__ranges/reverse_view.h
share/wasi-sysroot/include/c++/v1/__ranges/single_view.h
share/wasi-sysroot/include/c++/v1/__ranges/size.h
@@ -556,57 +712,68 @@
share/wasi-sysroot/include/c++/v1/__ranges/subrange.h
share/wasi-sysroot/include/c++/v1/__ranges/take_view.h
share/wasi-sysroot/include/c++/v1/__ranges/take_while_view.h
+share/wasi-sysroot/include/c++/v1/__ranges/to.h
share/wasi-sysroot/include/c++/v1/__ranges/transform_view.h
share/wasi-sysroot/include/c++/v1/__ranges/view_interface.h
share/wasi-sysroot/include/c++/v1/__ranges/views.h
share/wasi-sysroot/include/c++/v1/__ranges/zip_view.h
share/wasi-sysroot/include/c++/v1/__split_buffer
-share/wasi-sysroot/include/c++/v1/__std_stream
+share/wasi-sysroot/include/c++/v1/__std_clang_module
+share/wasi-sysroot/include/c++/v1/__std_mbstate_t.h
+share/wasi-sysroot/include/c++/v1/__stop_token/
+share/wasi-sysroot/include/c++/v1/__stop_token/atomic_unique_lock.h
+share/wasi-sysroot/include/c++/v1/__stop_token/intrusive_list_view.h
+share/wasi-sysroot/include/c++/v1/__stop_token/intrusive_shared_ptr.h
+share/wasi-sysroot/include/c++/v1/__stop_token/stop_callback.h
+share/wasi-sysroot/include/c++/v1/__stop_token/stop_source.h
+share/wasi-sysroot/include/c++/v1/__stop_token/stop_state.h
+share/wasi-sysroot/include/c++/v1/__stop_token/stop_token.h
share/wasi-sysroot/include/c++/v1/__string/
share/wasi-sysroot/include/c++/v1/__string/char_traits.h
+share/wasi-sysroot/include/c++/v1/__string/constexpr_c_functions.h
share/wasi-sysroot/include/c++/v1/__string/extern_template_lists.h
share/wasi-sysroot/include/c++/v1/__support/
-share/wasi-sysroot/include/c++/v1/__support/android/
-share/wasi-sysroot/include/c++/v1/__support/android/locale_bionic.h
-share/wasi-sysroot/include/c++/v1/__support/fuchsia/
-share/wasi-sysroot/include/c++/v1/__support/fuchsia/xlocale.h
share/wasi-sysroot/include/c++/v1/__support/ibm/
share/wasi-sysroot/include/c++/v1/__support/ibm/gettod_zos.h
share/wasi-sysroot/include/c++/v1/__support/ibm/locale_mgmt_zos.h
share/wasi-sysroot/include/c++/v1/__support/ibm/nanosleep.h
-share/wasi-sysroot/include/c++/v1/__support/ibm/xlocale.h
-share/wasi-sysroot/include/c++/v1/__support/musl/
-share/wasi-sysroot/include/c++/v1/__support/musl/xlocale.h
-share/wasi-sysroot/include/c++/v1/__support/newlib/
-share/wasi-sysroot/include/c++/v1/__support/newlib/xlocale.h
-share/wasi-sysroot/include/c++/v1/__support/openbsd/
-share/wasi-sysroot/include/c++/v1/__support/openbsd/xlocale.h
-share/wasi-sysroot/include/c++/v1/__support/solaris/
-share/wasi-sysroot/include/c++/v1/__support/solaris/floatingpoint.h
-share/wasi-sysroot/include/c++/v1/__support/solaris/wchar.h
-share/wasi-sysroot/include/c++/v1/__support/solaris/xlocale.h
-share/wasi-sysroot/include/c++/v1/__support/win32/
-share/wasi-sysroot/include/c++/v1/__support/win32/locale_win32.h
share/wasi-sysroot/include/c++/v1/__support/xlocale/
share/wasi-sysroot/include/c++/v1/__support/xlocale/__nop_locale_mgmt.h
share/wasi-sysroot/include/c++/v1/__support/xlocale/__posix_l_fallback.h
share/wasi-sysroot/include/c++/v1/__support/xlocale/__strtonum_fallback.h
+share/wasi-sysroot/include/c++/v1/__system_error/
+share/wasi-sysroot/include/c++/v1/__system_error/errc.h
+share/wasi-sysroot/include/c++/v1/__system_error/error_category.h
+share/wasi-sysroot/include/c++/v1/__system_error/error_code.h
+share/wasi-sysroot/include/c++/v1/__system_error/error_condition.h
+share/wasi-sysroot/include/c++/v1/__system_error/system_error.h
share/wasi-sysroot/include/c++/v1/__thread/
+share/wasi-sysroot/include/c++/v1/__thread/formatter.h
+share/wasi-sysroot/include/c++/v1/__thread/id.h
+share/wasi-sysroot/include/c++/v1/__thread/jthread.h
share/wasi-sysroot/include/c++/v1/__thread/poll_with_backoff.h
+share/wasi-sysroot/include/c++/v1/__thread/support/
+share/wasi-sysroot/include/c++/v1/__thread/support.h
+share/wasi-sysroot/include/c++/v1/__thread/support/c11.h
+share/wasi-sysroot/include/c++/v1/__thread/support/external.h
+share/wasi-sysroot/include/c++/v1/__thread/support/pthread.h
+share/wasi-sysroot/include/c++/v1/__thread/support/windows.h
+share/wasi-sysroot/include/c++/v1/__thread/this_thread.h
+share/wasi-sysroot/include/c++/v1/__thread/thread.h
share/wasi-sysroot/include/c++/v1/__thread/timed_backoff_policy.h
-share/wasi-sysroot/include/c++/v1/__threading_support
share/wasi-sysroot/include/c++/v1/__tree
-share/wasi-sysroot/include/c++/v1/__tuple_dir/
-share/wasi-sysroot/include/c++/v1/__tuple_dir/apply_cv.h
-share/wasi-sysroot/include/c++/v1/__tuple_dir/make_tuple_types.h
-share/wasi-sysroot/include/c++/v1/__tuple_dir/pair_like.h
-share/wasi-sysroot/include/c++/v1/__tuple_dir/sfinae_helpers.h
-share/wasi-sysroot/include/c++/v1/__tuple_dir/tuple_element.h
-share/wasi-sysroot/include/c++/v1/__tuple_dir/tuple_indices.h
-share/wasi-sysroot/include/c++/v1/__tuple_dir/tuple_like.h
-share/wasi-sysroot/include/c++/v1/__tuple_dir/tuple_like_ext.h
-share/wasi-sysroot/include/c++/v1/__tuple_dir/tuple_size.h
-share/wasi-sysroot/include/c++/v1/__tuple_dir/tuple_types.h
+share/wasi-sysroot/include/c++/v1/__tuple/
+share/wasi-sysroot/include/c++/v1/__tuple/find_index.h
+share/wasi-sysroot/include/c++/v1/__tuple/ignore.h
+share/wasi-sysroot/include/c++/v1/__tuple/make_tuple_types.h
+share/wasi-sysroot/include/c++/v1/__tuple/sfinae_helpers.h
+share/wasi-sysroot/include/c++/v1/__tuple/tuple_element.h
+share/wasi-sysroot/include/c++/v1/__tuple/tuple_indices.h
+share/wasi-sysroot/include/c++/v1/__tuple/tuple_like.h
+share/wasi-sysroot/include/c++/v1/__tuple/tuple_like_ext.h
+share/wasi-sysroot/include/c++/v1/__tuple/tuple_like_no_subrange.h
+share/wasi-sysroot/include/c++/v1/__tuple/tuple_size.h
+share/wasi-sysroot/include/c++/v1/__tuple/tuple_types.h
share/wasi-sysroot/include/c++/v1/__type_traits/
share/wasi-sysroot/include/c++/v1/__type_traits/add_const.h
share/wasi-sysroot/include/c++/v1/__type_traits/add_cv.h
@@ -617,7 +784,6 @@
share/wasi-sysroot/include/c++/v1/__type_traits/aligned_storage.h
share/wasi-sysroot/include/c++/v1/__type_traits/aligned_union.h
share/wasi-sysroot/include/c++/v1/__type_traits/alignment_of.h
-share/wasi-sysroot/include/c++/v1/__type_traits/apply_cv.h
share/wasi-sysroot/include/c++/v1/__type_traits/can_extract_key.h
share/wasi-sysroot/include/c++/v1/__type_traits/common_reference.h
share/wasi-sysroot/include/c++/v1/__type_traits/common_type.h
@@ -625,14 +791,17 @@
share/wasi-sysroot/include/c++/v1/__type_traits/conjunction.h
share/wasi-sysroot/include/c++/v1/__type_traits/copy_cv.h
share/wasi-sysroot/include/c++/v1/__type_traits/copy_cvref.h
+share/wasi-sysroot/include/c++/v1/__type_traits/datasizeof.h
share/wasi-sysroot/include/c++/v1/__type_traits/decay.h
share/wasi-sysroot/include/c++/v1/__type_traits/dependent_type.h
+share/wasi-sysroot/include/c++/v1/__type_traits/desugars_to.h
share/wasi-sysroot/include/c++/v1/__type_traits/disjunction.h
share/wasi-sysroot/include/c++/v1/__type_traits/enable_if.h
share/wasi-sysroot/include/c++/v1/__type_traits/extent.h
share/wasi-sysroot/include/c++/v1/__type_traits/has_unique_object_representation.h
share/wasi-sysroot/include/c++/v1/__type_traits/has_virtual_destructor.h
share/wasi-sysroot/include/c++/v1/__type_traits/integral_constant.h
+share/wasi-sysroot/include/c++/v1/__type_traits/invoke.h
share/wasi-sysroot/include/c++/v1/__type_traits/is_abstract.h
share/wasi-sysroot/include/c++/v1/__type_traits/is_aggregate.h
share/wasi-sysroot/include/c++/v1/__type_traits/is_allocator.h
@@ -650,13 +819,12 @@
share/wasi-sysroot/include/c++/v1/__type_traits/is_constant_evaluated.h
share/wasi-sysroot/include/c++/v1/__type_traits/is_constructible.h
share/wasi-sysroot/include/c++/v1/__type_traits/is_convertible.h
-share/wasi-sysroot/include/c++/v1/__type_traits/is_copy_assignable.h
-share/wasi-sysroot/include/c++/v1/__type_traits/is_copy_constructible.h
share/wasi-sysroot/include/c++/v1/__type_traits/is_core_convertible.h
-share/wasi-sysroot/include/c++/v1/__type_traits/is_default_constructible.h
share/wasi-sysroot/include/c++/v1/__type_traits/is_destructible.h
share/wasi-sysroot/include/c++/v1/__type_traits/is_empty.h
share/wasi-sysroot/include/c++/v1/__type_traits/is_enum.h
+share/wasi-sysroot/include/c++/v1/__type_traits/is_equality_comparable.h
+share/wasi-sysroot/include/c++/v1/__type_traits/is_execution_policy.h
share/wasi-sysroot/include/c++/v1/__type_traits/is_final.h
share/wasi-sysroot/include/c++/v1/__type_traits/is_floating_point.h
share/wasi-sysroot/include/c++/v1/__type_traits/is_function.h
@@ -664,20 +832,11 @@
share/wasi-sysroot/include/c++/v1/__type_traits/is_implicitly_default_constructible.h
share/wasi-sysroot/include/c++/v1/__type_traits/is_integral.h
share/wasi-sysroot/include/c++/v1/__type_traits/is_literal_type.h
-share/wasi-sysroot/include/c++/v1/__type_traits/is_member_function_pointer.h
-share/wasi-sysroot/include/c++/v1/__type_traits/is_member_object_pointer.h
share/wasi-sysroot/include/c++/v1/__type_traits/is_member_pointer.h
-share/wasi-sysroot/include/c++/v1/__type_traits/is_move_assignable.h
-share/wasi-sysroot/include/c++/v1/__type_traits/is_move_constructible.h
share/wasi-sysroot/include/c++/v1/__type_traits/is_nothrow_assignable.h
share/wasi-sysroot/include/c++/v1/__type_traits/is_nothrow_constructible.h
share/wasi-sysroot/include/c++/v1/__type_traits/is_nothrow_convertible.h
-share/wasi-sysroot/include/c++/v1/__type_traits/is_nothrow_copy_assignable.h
-share/wasi-sysroot/include/c++/v1/__type_traits/is_nothrow_copy_constructible.h
-share/wasi-sysroot/include/c++/v1/__type_traits/is_nothrow_default_constructible.h
share/wasi-sysroot/include/c++/v1/__type_traits/is_nothrow_destructible.h
-share/wasi-sysroot/include/c++/v1/__type_traits/is_nothrow_move_assignable.h
-share/wasi-sysroot/include/c++/v1/__type_traits/is_nothrow_move_constructible.h
share/wasi-sysroot/include/c++/v1/__type_traits/is_null_pointer.h
share/wasi-sysroot/include/c++/v1/__type_traits/is_object.h
share/wasi-sysroot/include/c++/v1/__type_traits/is_pod.h
@@ -689,7 +848,6 @@
share/wasi-sysroot/include/c++/v1/__type_traits/is_referenceable.h
share/wasi-sysroot/include/c++/v1/__type_traits/is_same.h
share/wasi-sysroot/include/c++/v1/__type_traits/is_scalar.h
-share/wasi-sysroot/include/c++/v1/__type_traits/is_scoped_enum.h
share/wasi-sysroot/include/c++/v1/__type_traits/is_signed.h
share/wasi-sysroot/include/c++/v1/__type_traits/is_signed_integer.h
share/wasi-sysroot/include/c++/v1/__type_traits/is_specialization.h
@@ -698,13 +856,10 @@
share/wasi-sysroot/include/c++/v1/__type_traits/is_trivial.h
share/wasi-sysroot/include/c++/v1/__type_traits/is_trivially_assignable.h
share/wasi-sysroot/include/c++/v1/__type_traits/is_trivially_constructible.h
-share/wasi-sysroot/include/c++/v1/__type_traits/is_trivially_copy_assignable.h
-share/wasi-sysroot/include/c++/v1/__type_traits/is_trivially_copy_constructible.h
share/wasi-sysroot/include/c++/v1/__type_traits/is_trivially_copyable.h
-share/wasi-sysroot/include/c++/v1/__type_traits/is_trivially_default_constructible.h
share/wasi-sysroot/include/c++/v1/__type_traits/is_trivially_destructible.h
-share/wasi-sysroot/include/c++/v1/__type_traits/is_trivially_move_assignable.h
-share/wasi-sysroot/include/c++/v1/__type_traits/is_trivially_move_constructible.h
+share/wasi-sysroot/include/c++/v1/__type_traits/is_trivially_lexicographically_comparable.h
+share/wasi-sysroot/include/c++/v1/__type_traits/is_trivially_relocatable.h
share/wasi-sysroot/include/c++/v1/__type_traits/is_unbounded_array.h
share/wasi-sysroot/include/c++/v1/__type_traits/is_union.h
share/wasi-sysroot/include/c++/v1/__type_traits/is_unsigned.h
@@ -737,25 +892,33 @@
share/wasi-sysroot/include/c++/v1/__type_traits/type_identity.h
share/wasi-sysroot/include/c++/v1/__type_traits/type_list.h
share/wasi-sysroot/include/c++/v1/__type_traits/underlying_type.h
+share/wasi-sysroot/include/c++/v1/__type_traits/unwrap_ref.h
share/wasi-sysroot/include/c++/v1/__type_traits/void_t.h
share/wasi-sysroot/include/c++/v1/__undef_macros
share/wasi-sysroot/include/c++/v1/__utility/
share/wasi-sysroot/include/c++/v1/__utility/as_const.h
+share/wasi-sysroot/include/c++/v1/__utility/as_lvalue.h
share/wasi-sysroot/include/c++/v1/__utility/auto_cast.h
share/wasi-sysroot/include/c++/v1/__utility/cmp.h
share/wasi-sysroot/include/c++/v1/__utility/convert_to_integral.h
share/wasi-sysroot/include/c++/v1/__utility/declval.h
+share/wasi-sysroot/include/c++/v1/__utility/empty.h
share/wasi-sysroot/include/c++/v1/__utility/exception_guard.h
share/wasi-sysroot/include/c++/v1/__utility/exchange.h
share/wasi-sysroot/include/c++/v1/__utility/forward.h
share/wasi-sysroot/include/c++/v1/__utility/forward_like.h
share/wasi-sysroot/include/c++/v1/__utility/in_place.h
share/wasi-sysroot/include/c++/v1/__utility/integer_sequence.h
+share/wasi-sysroot/include/c++/v1/__utility/is_pointer_in_range.h
+share/wasi-sysroot/include/c++/v1/__utility/is_valid_range.h
share/wasi-sysroot/include/c++/v1/__utility/move.h
+share/wasi-sysroot/include/c++/v1/__utility/no_destroy.h
share/wasi-sysroot/include/c++/v1/__utility/pair.h
share/wasi-sysroot/include/c++/v1/__utility/piecewise_construct.h
share/wasi-sysroot/include/c++/v1/__utility/priority_tag.h
+share/wasi-sysroot/include/c++/v1/__utility/private_constructor_tag.h
share/wasi-sysroot/include/c++/v1/__utility/rel_ops.h
+share/wasi-sysroot/include/c++/v1/__utility/small_buffer.h
share/wasi-sysroot/include/c++/v1/__utility/swap.h
share/wasi-sysroot/include/c++/v1/__utility/to_underlying.h
share/wasi-sysroot/include/c++/v1/__utility/unreachable.h
@@ -804,6 +967,7 @@
share/wasi-sysroot/include/c++/v1/cuchar
share/wasi-sysroot/include/c++/v1/cwchar
share/wasi-sysroot/include/c++/v1/cwctype
+share/wasi-sysroot/include/c++/v1/cxxabi.h
share/wasi-sysroot/include/c++/v1/deque
share/wasi-sysroot/include/c++/v1/errno.h
share/wasi-sysroot/include/c++/v1/exception
@@ -811,26 +975,22 @@
share/wasi-sysroot/include/c++/v1/expected
share/wasi-sysroot/include/c++/v1/experimental/
share/wasi-sysroot/include/c++/v1/experimental/__config
-share/wasi-sysroot/include/c++/v1/experimental/__memory
-share/wasi-sysroot/include/c++/v1/experimental/algorithm
-share/wasi-sysroot/include/c++/v1/experimental/coroutine
-share/wasi-sysroot/include/c++/v1/experimental/deque
-share/wasi-sysroot/include/c++/v1/experimental/forward_list
-share/wasi-sysroot/include/c++/v1/experimental/functional
+share/wasi-sysroot/include/c++/v1/experimental/__simd/
+share/wasi-sysroot/include/c++/v1/experimental/__simd/aligned_tag.h
+share/wasi-sysroot/include/c++/v1/experimental/__simd/declaration.h
+share/wasi-sysroot/include/c++/v1/experimental/__simd/reference.h
+share/wasi-sysroot/include/c++/v1/experimental/__simd/scalar.h
+share/wasi-sysroot/include/c++/v1/experimental/__simd/simd.h
+share/wasi-sysroot/include/c++/v1/experimental/__simd/simd_mask.h
+share/wasi-sysroot/include/c++/v1/experimental/__simd/traits.h
+share/wasi-sysroot/include/c++/v1/experimental/__simd/utility.h
+share/wasi-sysroot/include/c++/v1/experimental/__simd/vec_ext.h
share/wasi-sysroot/include/c++/v1/experimental/iterator
-share/wasi-sysroot/include/c++/v1/experimental/list
-share/wasi-sysroot/include/c++/v1/experimental/map
-share/wasi-sysroot/include/c++/v1/experimental/memory_resource
+share/wasi-sysroot/include/c++/v1/experimental/memory
share/wasi-sysroot/include/c++/v1/experimental/propagate_const
-share/wasi-sysroot/include/c++/v1/experimental/regex
-share/wasi-sysroot/include/c++/v1/experimental/set
share/wasi-sysroot/include/c++/v1/experimental/simd
-share/wasi-sysroot/include/c++/v1/experimental/string
share/wasi-sysroot/include/c++/v1/experimental/type_traits
-share/wasi-sysroot/include/c++/v1/experimental/unordered_map
-share/wasi-sysroot/include/c++/v1/experimental/unordered_set
share/wasi-sysroot/include/c++/v1/experimental/utility
-share/wasi-sysroot/include/c++/v1/experimental/vector
share/wasi-sysroot/include/c++/v1/ext/
share/wasi-sysroot/include/c++/v1/ext/__hash
share/wasi-sysroot/include/c++/v1/ext/hash_map
@@ -852,14 +1012,13 @@
share/wasi-sysroot/include/c++/v1/istream
share/wasi-sysroot/include/c++/v1/iterator
share/wasi-sysroot/include/c++/v1/latch
-share/wasi-sysroot/include/c++/v1/libcxx.imp
share/wasi-sysroot/include/c++/v1/limits
-share/wasi-sysroot/include/c++/v1/limits.h
share/wasi-sysroot/include/c++/v1/list
share/wasi-sysroot/include/c++/v1/locale
share/wasi-sysroot/include/c++/v1/locale.h
share/wasi-sysroot/include/c++/v1/map
share/wasi-sysroot/include/c++/v1/math.h
+share/wasi-sysroot/include/c++/v1/mdspan
share/wasi-sysroot/include/c++/v1/memory
share/wasi-sysroot/include/c++/v1/memory_resource
share/wasi-sysroot/include/c++/v1/module.modulemap
@@ -869,6 +1028,7 @@
share/wasi-sysroot/include/c++/v1/numeric
share/wasi-sysroot/include/c++/v1/optional
share/wasi-sysroot/include/c++/v1/ostream
+share/wasi-sysroot/include/c++/v1/print
share/wasi-sysroot/include/c++/v1/queue
share/wasi-sysroot/include/c++/v1/random
share/wasi-sysroot/include/c++/v1/ranges
@@ -877,7 +1037,6 @@
share/wasi-sysroot/include/c++/v1/scoped_allocator
share/wasi-sysroot/include/c++/v1/semaphore
share/wasi-sysroot/include/c++/v1/set
-share/wasi-sysroot/include/c++/v1/setjmp.h
share/wasi-sysroot/include/c++/v1/shared_mutex
share/wasi-sysroot/include/c++/v1/source_location
share/wasi-sysroot/include/c++/v1/span
@@ -890,11 +1049,13 @@
share/wasi-sysroot/include/c++/v1/stdint.h
share/wasi-sysroot/include/c++/v1/stdio.h
share/wasi-sysroot/include/c++/v1/stdlib.h
+share/wasi-sysroot/include/c++/v1/stop_token
share/wasi-sysroot/include/c++/v1/streambuf
share/wasi-sysroot/include/c++/v1/string
share/wasi-sysroot/include/c++/v1/string.h
share/wasi-sysroot/include/c++/v1/string_view
share/wasi-sysroot/include/c++/v1/strstream
+share/wasi-sysroot/include/c++/v1/syncstream
share/wasi-sysroot/include/c++/v1/system_error
share/wasi-sysroot/include/c++/v1/tgmath.h
share/wasi-sysroot/include/c++/v1/thread
@@ -915,4 +1076,144 @@
share/wasi-sysroot/lib/
share/wasi-sysroot/lib/wasm32-wasi/
@static-lib share/wasi-sysroot/lib/wasm32-wasi/libc++.a
+share/wasi-sysroot/lib/wasm32-wasi/libc++.modules.json
+@static-lib share/wasi-sysroot/lib/wasm32-wasi/libc++abi.a
@static-lib share/wasi-sysroot/lib/wasm32-wasi/libc++experimental.a
+share/wasi-sysroot/share/
+share/wasi-sysroot/share/libc++/
+share/wasi-sysroot/share/libc++/v1/
+share/wasi-sysroot/share/libc++/v1/std/
+share/wasi-sysroot/share/libc++/v1/std.compat/
+share/wasi-sysroot/share/libc++/v1/std.compat.cppm
+share/wasi-sysroot/share/libc++/v1/std.compat/cassert.inc
+share/wasi-sysroot/share/libc++/v1/std.compat/cctype.inc
+share/wasi-sysroot/share/libc++/v1/std.compat/cerrno.inc
+share/wasi-sysroot/share/libc++/v1/std.compat/cfenv.inc
+share/wasi-sysroot/share/libc++/v1/std.compat/cfloat.inc
+share/wasi-sysroot/share/libc++/v1/std.compat/cinttypes.inc
+share/wasi-sysroot/share/libc++/v1/std.compat/climits.inc
+share/wasi-sysroot/share/libc++/v1/std.compat/clocale.inc
+share/wasi-sysroot/share/libc++/v1/std.compat/cmath.inc
+share/wasi-sysroot/share/libc++/v1/std.compat/csetjmp.inc
+share/wasi-sysroot/share/libc++/v1/std.compat/csignal.inc
+share/wasi-sysroot/share/libc++/v1/std.compat/cstdarg.inc
+share/wasi-sysroot/share/libc++/v1/std.compat/cstddef.inc
+share/wasi-sysroot/share/libc++/v1/std.compat/cstdint.inc
+share/wasi-sysroot/share/libc++/v1/std.compat/cstdio.inc
+share/wasi-sysroot/share/libc++/v1/std.compat/cstdlib.inc
+share/wasi-sysroot/share/libc++/v1/std.compat/cstring.inc
+share/wasi-sysroot/share/libc++/v1/std.compat/ctime.inc
+share/wasi-sysroot/share/libc++/v1/std.compat/cuchar.inc
+share/wasi-sysroot/share/libc++/v1/std.compat/cwchar.inc
+share/wasi-sysroot/share/libc++/v1/std.compat/cwctype.inc
+share/wasi-sysroot/share/libc++/v1/std.cppm
+share/wasi-sysroot/share/libc++/v1/std/algorithm.inc
+share/wasi-sysroot/share/libc++/v1/std/any.inc
+share/wasi-sysroot/share/libc++/v1/std/array.inc
+share/wasi-sysroot/share/libc++/v1/std/atomic.inc
+share/wasi-sysroot/share/libc++/v1/std/barrier.inc
+share/wasi-sysroot/share/libc++/v1/std/bit.inc
+share/wasi-sysroot/share/libc++/v1/std/bitset.inc
+share/wasi-sysroot/share/libc++/v1/std/cassert.inc
+share/wasi-sysroot/share/libc++/v1/std/cctype.inc
+share/wasi-sysroot/share/libc++/v1/std/cerrno.inc
+share/wasi-sysroot/share/libc++/v1/std/cfenv.inc
+share/wasi-sysroot/share/libc++/v1/std/cfloat.inc
+share/wasi-sysroot/share/libc++/v1/std/charconv.inc
+share/wasi-sysroot/share/libc++/v1/std/chrono.inc
+share/wasi-sysroot/share/libc++/v1/std/cinttypes.inc
+share/wasi-sysroot/share/libc++/v1/std/climits.inc
+share/wasi-sysroot/share/libc++/v1/std/clocale.inc
+share/wasi-sysroot/share/libc++/v1/std/cmath.inc
+share/wasi-sysroot/share/libc++/v1/std/codecvt.inc
+share/wasi-sysroot/share/libc++/v1/std/compare.inc
+share/wasi-sysroot/share/libc++/v1/std/complex.inc
+share/wasi-sysroot/share/libc++/v1/std/concepts.inc
+share/wasi-sysroot/share/libc++/v1/std/condition_variable.inc
+share/wasi-sysroot/share/libc++/v1/std/coroutine.inc
+share/wasi-sysroot/share/libc++/v1/std/csetjmp.inc
+share/wasi-sysroot/share/libc++/v1/std/csignal.inc
+share/wasi-sysroot/share/libc++/v1/std/cstdarg.inc
+share/wasi-sysroot/share/libc++/v1/std/cstddef.inc
+share/wasi-sysroot/share/libc++/v1/std/cstdint.inc
+share/wasi-sysroot/share/libc++/v1/std/cstdio.inc
+share/wasi-sysroot/share/libc++/v1/std/cstdlib.inc
+share/wasi-sysroot/share/libc++/v1/std/cstring.inc
+share/wasi-sysroot/share/libc++/v1/std/ctime.inc
+share/wasi-sysroot/share/libc++/v1/std/cuchar.inc
+share/wasi-sysroot/share/libc++/v1/std/cwchar.inc
+share/wasi-sysroot/share/libc++/v1/std/cwctype.inc
+share/wasi-sysroot/share/libc++/v1/std/deque.inc
+share/wasi-sysroot/share/libc++/v1/std/exception.inc
+share/wasi-sysroot/share/libc++/v1/std/execution.inc
+share/wasi-sysroot/share/libc++/v1/std/expected.inc
+share/wasi-sysroot/share/libc++/v1/std/filesystem.inc
+share/wasi-sysroot/share/libc++/v1/std/flat_map.inc
+share/wasi-sysroot/share/libc++/v1/std/flat_set.inc
+share/wasi-sysroot/share/libc++/v1/std/format.inc
+share/wasi-sysroot/share/libc++/v1/std/forward_list.inc
+share/wasi-sysroot/share/libc++/v1/std/fstream.inc
+share/wasi-sysroot/share/libc++/v1/std/functional.inc
+share/wasi-sysroot/share/libc++/v1/std/future.inc
+share/wasi-sysroot/share/libc++/v1/std/generator.inc
+share/wasi-sysroot/share/libc++/v1/std/hazard_pointer.inc
+share/wasi-sysroot/share/libc++/v1/std/initializer_list.inc
+share/wasi-sysroot/share/libc++/v1/std/iomanip.inc
+share/wasi-sysroot/share/libc++/v1/std/ios.inc
+share/wasi-sysroot/share/libc++/v1/std/iosfwd.inc
+share/wasi-sysroot/share/libc++/v1/std/iostream.inc
+share/wasi-sysroot/share/libc++/v1/std/istream.inc
+share/wasi-sysroot/share/libc++/v1/std/iterator.inc
+share/wasi-sysroot/share/libc++/v1/std/latch.inc
+share/wasi-sysroot/share/libc++/v1/std/limits.inc
+share/wasi-sysroot/share/libc++/v1/std/list.inc
+share/wasi-sysroot/share/libc++/v1/std/locale.inc
+share/wasi-sysroot/share/libc++/v1/std/map.inc
+share/wasi-sysroot/share/libc++/v1/std/mdspan.inc
+share/wasi-sysroot/share/libc++/v1/std/memory.inc
+share/wasi-sysroot/share/libc++/v1/std/memory_resource.inc
+share/wasi-sysroot/share/libc++/v1/std/mutex.inc
+share/wasi-sysroot/share/libc++/v1/std/new.inc
+share/wasi-sysroot/share/libc++/v1/std/numbers.inc
+share/wasi-sysroot/share/libc++/v1/std/numeric.inc
+share/wasi-sysroot/share/libc++/v1/std/optional.inc
+share/wasi-sysroot/share/libc++/v1/std/ostream.inc
+share/wasi-sysroot/share/libc++/v1/std/print.inc
+share/wasi-sysroot/share/libc++/v1/std/queue.inc
+share/wasi-sysroot/share/libc++/v1/std/random.inc
+share/wasi-sysroot/share/libc++/v1/std/ranges.inc
+share/wasi-sysroot/share/libc++/v1/std/ratio.inc
+share/wasi-sysroot/share/libc++/v1/std/rcu.inc
+share/wasi-sysroot/share/libc++/v1/std/regex.inc
+share/wasi-sysroot/share/libc++/v1/std/scoped_allocator.inc
+share/wasi-sysroot/share/libc++/v1/std/semaphore.inc
+share/wasi-sysroot/share/libc++/v1/std/set.inc
+share/wasi-sysroot/share/libc++/v1/std/shared_mutex.inc
+share/wasi-sysroot/share/libc++/v1/std/source_location.inc
+share/wasi-sysroot/share/libc++/v1/std/span.inc
+share/wasi-sysroot/share/libc++/v1/std/spanstream.inc
+share/wasi-sysroot/share/libc++/v1/std/sstream.inc
+share/wasi-sysroot/share/libc++/v1/std/stack.inc
+share/wasi-sysroot/share/libc++/v1/std/stacktrace.inc
+share/wasi-sysroot/share/libc++/v1/std/stdexcept.inc
+share/wasi-sysroot/share/libc++/v1/std/stdfloat.inc
+share/wasi-sysroot/share/libc++/v1/std/stop_token.inc
+share/wasi-sysroot/share/libc++/v1/std/streambuf.inc
+share/wasi-sysroot/share/libc++/v1/std/string.inc
+share/wasi-sysroot/share/libc++/v1/std/string_view.inc
+share/wasi-sysroot/share/libc++/v1/std/strstream.inc
+share/wasi-sysroot/share/libc++/v1/std/syncstream.inc
+share/wasi-sysroot/share/libc++/v1/std/system_error.inc
+share/wasi-sysroot/share/libc++/v1/std/text_encoding.inc
+share/wasi-sysroot/share/libc++/v1/std/thread.inc
+share/wasi-sysroot/share/libc++/v1/std/tuple.inc
+share/wasi-sysroot/share/libc++/v1/std/type_traits.inc
+share/wasi-sysroot/share/libc++/v1/std/typeindex.inc
+share/wasi-sysroot/share/libc++/v1/std/typeinfo.inc
+share/wasi-sysroot/share/libc++/v1/std/unordered_map.inc
+share/wasi-sysroot/share/libc++/v1/std/unordered_set.inc
+share/wasi-sysroot/share/libc++/v1/std/utility.inc
+share/wasi-sysroot/share/libc++/v1/std/valarray.inc
+share/wasi-sysroot/share/libc++/v1/std/variant.inc
+share/wasi-sysroot/share/libc++/v1/std/vector.inc
+share/wasi-sysroot/share/libc++/v1/std/version.inc
Index: wasi-sdk/libcxxabi/Makefile
===================================================================
RCS file: /cvs/ports/lang/wasi-sdk/libcxxabi/Makefile,v
diff -u -r1.5 Makefile
--- wasi-sdk/libcxxabi/Makefile 28 Jan 2025 14:38:29 -0000 1.5
+++ wasi-sdk/libcxxabi/Makefile 2 Mar 2025 10:01:08 -0000
@@ -13,11 +13,12 @@
BUILD_DEPENDS += lang/wasi-libc>=0.20231121
BUILD_DEPENDS += lang/wasi-sdk/libcxx>=16
+#
https://github.com/FreeBSD/freebsd-ports/commit/c6c4482d77ec63006b47ba286a103128c6b8b7f7
llvm unwinder
CONFIGURE_ARGS= \
-DLLVM_MAIN_SRC_DIR=${WRKDIR}/llvm-${LLVM_V}.src \
-DCMAKE_MODULE_PATH=${WRKDIR}/cmake-${LLVM_V}.src/Modules \
-DLLVM_CONFIG_PATH=${LOCALBASE}/bin/llvm-config-${MODCLANG_VERSION} \
-
-DLLVM_CMAKE_DIR=${WRKDOR}/${LOCALBASE}/llvm${MODCLANG_VERSION}/lib/cmake/llvm \
+
-DLLVM_CMAKE_DIR=${WRKDIR}/${LOCALBASE}/llvm${MODCLANG_VERSION}/lib/cmake/llvm \
-DCMAKE_C_COMPILER_WORKS=1 \
-DCMAKE_CXX_COMPILER_WORKS=1 \
-DCMAKE_CXX_COMPILER_TARGET=wasm32-wasi \
@@ -32,6 +33,7 @@
-DLIBCXXABI_HAS_PTHREAD_API:BOOL=OFF \
-DLIBCXXABI_HAS_EXTERNAL_THREAD_API:BOOL=OFF \
-DLIBCXXABI_HAS_WIN32_THREAD_API:BOOL=OFF \
+ -DLIBCXXABI_USE_LLVM_UNWINDER:BOOL=OFF \
-DLIBCXXABI_LIBCXX_INCLUDES=${WASI_SYSROOT}/include \
-DLIBCXXABI_LIBDIR_SUFFIX=/wasm32-wasi \
-DLIBCXXABI_SILENT_TERMINATE:BOOL=ON \
Index: wasi-sdk/libcxxabi/distinfo
===================================================================
RCS file: /cvs/ports/lang/wasi-sdk/libcxxabi/distinfo,v
diff -u -r1.2 distinfo
--- wasi-sdk/libcxxabi/distinfo 7 Dec 2023 12:01:18 -0000 1.2
+++ wasi-sdk/libcxxabi/distinfo 2 Mar 2025 10:01:08 -0000
@@ -1,8 +1,10 @@
-SHA256 (cmake-16.0.6.src.tar.xz) = OdNCpBYQldLyj7ElPkWFl4rFBSERfaZm4rH28oti9RQ=
-SHA256 (libcxx-16.0.6.src.tar.xz) =
5wRcJmB/6Ro+vPsqQKWnEArWk69WLTFgenvnlyaN5uA=
-SHA256 (libcxxabi-16.0.6.src.tar.xz) =
++zRtRGrJFlWHT+J1OaeI4lwBIY1uHusVKLiKMfkjcc=
-SHA256 (llvm-16.0.6.src.tar.xz) = 6R20TRs7scM/zqmn0fJCO4g+qpFj09VsoqptLwcRvCk=
-SIZE (cmake-16.0.6.src.tar.xz) = 9008
-SIZE (libcxx-16.0.6.src.tar.xz) = 3655520
-SIZE (libcxxabi-16.0.6.src.tar.xz) = 573564
-SIZE (llvm-16.0.6.src.tar.xz) = 56149540
+SHA256 (cmake-19.1.7.src.tar.xz) = EcWij5AFOwxD0N7D0K1Xk0f8J3GZwAUga5Y8GarlFOM=
+SHA256 (libcxx-19.1.7.src.tar.xz) =
tzYQllD/x1Db3FBkgzR7NxPe2dAwD0hDK4IK1mtqkFI=
+SHA256 (libcxxabi-19.1.7.src.tar.xz) =
TSUSUQnj/r4Tk+njD5MVMzPYK0jOe+1je9La9Sv0AXI=
+SHA256 (llvm-19.1.7.src.tar.xz) = lvgzxq2Zo+jh2ayl9Dm4/Sx+/c+DtmTgrxwHEsUxWRA=
+SHA256 (runtimes-19.1.7.src.tar.xz) =
QExUwt9FowczHroTcpF+xICt3zt3yplD7U1+pEXvsI8=
+SIZE (cmake-19.1.7.src.tar.xz) = 9300
+SIZE (libcxx-19.1.7.src.tar.xz) = 4718816
+SIZE (libcxxabi-19.1.7.src.tar.xz) = 583696
+SIZE (llvm-19.1.7.src.tar.xz) = 67828200
+SIZE (runtimes-19.1.7.src.tar.xz) = 7224
Index: wasi-libc/Makefile
===================================================================
RCS file: /cvs/ports/lang/wasi-libc/Makefile,v
diff -u -r1.10 Makefile
--- wasi-libc/Makefile 26 Dec 2024 21:51:37 -0000 1.10
+++ wasi-libc/Makefile 2 Mar 2025 10:01:08 -0000
@@ -2,10 +2,8 @@
GH_ACCOUNT = WebAssembly
GH_PROJECT = wasi-libc
-GH_COMMIT = 9c17f5235c7977cb2a000990eb8c605a25a80adf
-DISTNAME = wasi-libc-0.20231121
-
-REVISION = 0
+GH_COMMIT = e9524a0980b9bb6bb92e87a41ed1055bdda5bb86
+DISTNAME = wasi-libc-0.20250204
DISTFILES = ${GH_DISTFILE}
DISTFILES.h = wasi-libc-llvm13-std-headers.tar.gz
@@ -18,6 +16,7 @@
COMPILER = ports-clang
COMPILER_LANGS =c
+MODCLANG_VERSION = 19
USE_GMAKE = yes
ALL_TARGET = finish
@@ -32,6 +31,6 @@
post-install:
${INSTALL_DATA} ${WRKDIR}/sysroot/include/* \
- ${PREFIX}/share/wasi-sysroot/include
+ ${PREFIX}/share/wasi-sysroot/include/wasm32-wasi
.include <bsd.port.mk>
Index: wasi-libc/distinfo
===================================================================
RCS file: /cvs/ports/lang/wasi-libc/distinfo,v
diff -u -r1.3 distinfo
--- wasi-libc/distinfo 7 Dec 2023 11:59:13 -0000 1.3
+++ wasi-libc/distinfo 2 Mar 2025 10:01:08 -0000
@@ -1,4 +1,4 @@
-SHA256 (wasi-libc-0.20231121-9c17f523.tar.gz) =
dRUaojjr1lnbuJytlZFIC+oM2mfWoEeo5Qd3SoJ4mOk=
+SHA256 (wasi-libc-0.20250204-e9524a09.tar.gz) =
m66HZQvmbRBmIFXsE4xlULEn8c7trweSZvibfH37fzQ=
SHA256 (wasi-libc-llvm13-std-headers.tar.gz) =
YTble8uIDTmeki+GTWKcGnO5JHK6p/educ3h/T+tIE4=
-SIZE (wasi-libc-0.20231121-9c17f523.tar.gz) = 1313030
+SIZE (wasi-libc-0.20250204-e9524a09.tar.gz) = 1444350
SIZE (wasi-libc-llvm13-std-headers.tar.gz) = 1795
Index: wasi-libc/patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/lang/wasi-libc/patches/patch-Makefile,v
diff -u -r1.4 patch-Makefile
--- wasi-libc/patches/patch-Makefile 22 Jul 2024 08:56:13 -0000 1.4
+++ wasi-libc/patches/patch-Makefile 2 Mar 2025 10:01:08 -0000
@@ -8,7 +8,7 @@
Index: Makefile
--- Makefile.orig
+++ Makefile
-@@ -346,7 +346,7 @@ endif
+@@ -466,7 +466,7 @@ endif
# should come earlier in the search path, so they can "override"
# and/or `#include_next` the public headers. `-isystem` (like
# `-idirafter`) comes later in the search path than `-I`.
@@ -17,7 +17,16 @@
# These variables describe the locations of various files and directories in
# the build tree.
-@@ -789,8 +789,9 @@ check-symbols: startup_files libc
+@@ -814,7 +814,7 @@ finish: check-symbols
+ endif
+ endif
+
+-install: finish
++install:
+ mkdir -p "$(INSTALL_DIR)"
+ cp -r "$(SYSROOT)/lib" "$(SYSROOT)/share" "$(SYSROOT)/include"
"$(INSTALL_DIR)"
+
+@@ -929,14 +929,15 @@ check-symbols: $(STARTUP_FILES) libc
-U__FLT_EVAL_METHOD__ -Wno-builtin-macro-redefined \
| sed -e
's/__[[:upper:][:digit:]]*_ATOMIC_\([[:upper:][:digit:]_]*\)_LOCK_FREE/__compiler_ATOMIC_\1_LOCK_FREE/'
\
| sed -e 's/__GNUC_VA_LIST $$/__GNUC_VA_LIST 1/' \
@@ -28,13 +37,12 @@
+ | egrep -v '^#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_(1|2|4|8)' \
| grep -v '^#define __FPCLASS_' \
| grep -v '^#define __FLT128_' \
+ | grep -v '^#define __MEMORY_SCOPE_' \
+- | grep -v '^#define __GCC_\(CON\|DE\)STRUCTIVE_SIZE' \
++ | egrep -v '^#define __GCC_(CON|DE)STRUCTIVE_SIZE' \
+ | grep -v '^#define __STDC_EMBED_' \
+- | grep -v '^#define __\(DBL\|FLT\|LDBL\)_NORM_MAX__' \
++ | egrep -v '^#define __(DBL|FLT|LDBL)_NORM_MAX__' \
| grep -v '^#define NDEBUG' \
-@@ -803,7 +804,7 @@ check-symbols: startup_files libc
- # This ignores whitespace because on Windows the output has CRLF line
endings.
- diff -wur "expected/$(TARGET_TRIPLE)" "$(SYSROOT_SHARE)"
-
--install: finish
-+install:
- mkdir -p "$(INSTALL_DIR)"
- cp -r "$(SYSROOT)/lib" "$(SYSROOT)/share" "$(SYSROOT)/include"
"$(INSTALL_DIR)"
-
+ | grep -v '^#define __OPTIMIZE__' \
+ | grep -v '^#define assert' \
Index: wasi-libc/pkg/PLIST
===================================================================
RCS file: /cvs/ports/lang/wasi-libc/pkg/PLIST,v
diff -u -r1.3 PLIST
--- wasi-libc/pkg/PLIST 7 Dec 2023 11:59:13 -0000 1.3
+++ wasi-libc/pkg/PLIST 2 Mar 2025 10:01:08 -0000
@@ -1,211 +1,219 @@
share/wasi-sysroot/
share/wasi-sysroot/include/
-share/wasi-sysroot/include/__errno.h
-share/wasi-sysroot/include/__errno_values.h
-share/wasi-sysroot/include/__fd_set.h
-share/wasi-sysroot/include/__function___isatty.h
-share/wasi-sysroot/include/__functions_malloc.h
-share/wasi-sysroot/include/__functions_memcpy.h
-share/wasi-sysroot/include/__header_dirent.h
-share/wasi-sysroot/include/__header_fcntl.h
-share/wasi-sysroot/include/__header_inttypes.h
-share/wasi-sysroot/include/__header_netinet_in.h
-share/wasi-sysroot/include/__header_poll.h
-share/wasi-sysroot/include/__header_stdlib.h
-share/wasi-sysroot/include/__header_string.h
-share/wasi-sysroot/include/__header_sys_ioctl.h
-share/wasi-sysroot/include/__header_sys_resource.h
-share/wasi-sysroot/include/__header_sys_socket.h
-share/wasi-sysroot/include/__header_sys_stat.h
-share/wasi-sysroot/include/__header_time.h
-share/wasi-sysroot/include/__header_unistd.h
-share/wasi-sysroot/include/__macro_FD_SETSIZE.h
-share/wasi-sysroot/include/__macro_PAGESIZE.h
-share/wasi-sysroot/include/__mode_t.h
-share/wasi-sysroot/include/__seek.h
-share/wasi-sysroot/include/__struct_dirent.h
-share/wasi-sysroot/include/__struct_in6_addr.h
-share/wasi-sysroot/include/__struct_in_addr.h
-share/wasi-sysroot/include/__struct_iovec.h
-share/wasi-sysroot/include/__struct_msghdr.h
-share/wasi-sysroot/include/__struct_pollfd.h
-share/wasi-sysroot/include/__struct_rusage.h
-share/wasi-sysroot/include/__struct_sockaddr.h
-share/wasi-sysroot/include/__struct_sockaddr_in.h
-share/wasi-sysroot/include/__struct_sockaddr_in6.h
-share/wasi-sysroot/include/__struct_sockaddr_storage.h
-share/wasi-sysroot/include/__struct_sockaddr_un.h
-share/wasi-sysroot/include/__struct_stat.h
-share/wasi-sysroot/include/__struct_timespec.h
-share/wasi-sysroot/include/__struct_timeval.h
-share/wasi-sysroot/include/__struct_tm.h
-share/wasi-sysroot/include/__struct_tms.h
-share/wasi-sysroot/include/__typedef_DIR.h
-share/wasi-sysroot/include/__typedef_blkcnt_t.h
-share/wasi-sysroot/include/__typedef_blksize_t.h
-share/wasi-sysroot/include/__typedef_clock_t.h
-share/wasi-sysroot/include/__typedef_clockid_t.h
-share/wasi-sysroot/include/__typedef_dev_t.h
-share/wasi-sysroot/include/__typedef_fd_set.h
-share/wasi-sysroot/include/__typedef_gid_t.h
-share/wasi-sysroot/include/__typedef_in_addr_t.h
-share/wasi-sysroot/include/__typedef_in_port_t.h
-share/wasi-sysroot/include/__typedef_ino_t.h
-share/wasi-sysroot/include/__typedef_mode_t.h
-share/wasi-sysroot/include/__typedef_nfds_t.h
-share/wasi-sysroot/include/__typedef_nlink_t.h
-share/wasi-sysroot/include/__typedef_off_t.h
-share/wasi-sysroot/include/__typedef_sa_family_t.h
-share/wasi-sysroot/include/__typedef_sigset_t.h
-share/wasi-sysroot/include/__typedef_socklen_t.h
-share/wasi-sysroot/include/__typedef_ssize_t.h
-share/wasi-sysroot/include/__typedef_suseconds_t.h
-share/wasi-sysroot/include/__typedef_time_t.h
-share/wasi-sysroot/include/__typedef_uid_t.h
-share/wasi-sysroot/include/alloca.h
-share/wasi-sysroot/include/ar.h
-share/wasi-sysroot/include/arpa/
-share/wasi-sysroot/include/arpa/ftp.h
-share/wasi-sysroot/include/arpa/inet.h
-share/wasi-sysroot/include/arpa/nameser.h
-share/wasi-sysroot/include/arpa/nameser_compat.h
-share/wasi-sysroot/include/arpa/telnet.h
-share/wasi-sysroot/include/arpa/tftp.h
-share/wasi-sysroot/include/assert.h
-share/wasi-sysroot/include/bits/
-share/wasi-sysroot/include/bits/alltypes.h
-share/wasi-sysroot/include/bits/dirent.h
-share/wasi-sysroot/include/bits/fcntl.h
-share/wasi-sysroot/include/bits/fenv.h
-share/wasi-sysroot/include/bits/float.h
-share/wasi-sysroot/include/bits/hwcap.h
-share/wasi-sysroot/include/bits/io.h
-share/wasi-sysroot/include/bits/ioctl.h
-share/wasi-sysroot/include/bits/ioctl_fix.h
-share/wasi-sysroot/include/bits/ipcstat.h
-share/wasi-sysroot/include/bits/limits.h
-share/wasi-sysroot/include/bits/mman.h
-share/wasi-sysroot/include/bits/poll.h
-share/wasi-sysroot/include/bits/posix.h
-share/wasi-sysroot/include/bits/reg.h
-share/wasi-sysroot/include/bits/resource.h
-share/wasi-sysroot/include/bits/signal.h
-share/wasi-sysroot/include/bits/socket.h
-share/wasi-sysroot/include/bits/stat.h
-share/wasi-sysroot/include/bits/stdint.h
-share/wasi-sysroot/include/byteswap.h
-share/wasi-sysroot/include/complex.h
-share/wasi-sysroot/include/cpio.h
-share/wasi-sysroot/include/crypt.h
-share/wasi-sysroot/include/ctype.h
-share/wasi-sysroot/include/dirent.h
-share/wasi-sysroot/include/dlfcn.h
-share/wasi-sysroot/include/endian.h
-share/wasi-sysroot/include/err.h
-share/wasi-sysroot/include/errno.h
-share/wasi-sysroot/include/fcntl.h
-share/wasi-sysroot/include/features.h
-share/wasi-sysroot/include/fenv.h
-share/wasi-sysroot/include/float.h
-share/wasi-sysroot/include/fmtmsg.h
-share/wasi-sysroot/include/fnmatch.h
-share/wasi-sysroot/include/ftw.h
-share/wasi-sysroot/include/getopt.h
-share/wasi-sysroot/include/glob.h
-share/wasi-sysroot/include/iconv.h
-share/wasi-sysroot/include/ifaddrs.h
-share/wasi-sysroot/include/inttypes.h
-share/wasi-sysroot/include/iso646.h
-share/wasi-sysroot/include/langinfo.h
-share/wasi-sysroot/include/libgen.h
-share/wasi-sysroot/include/limits.h
-share/wasi-sysroot/include/locale.h
-share/wasi-sysroot/include/malloc.h
-share/wasi-sysroot/include/math.h
-share/wasi-sysroot/include/memory.h
-share/wasi-sysroot/include/monetary.h
-share/wasi-sysroot/include/mqueue.h
-share/wasi-sysroot/include/net/
-share/wasi-sysroot/include/netinet/
-share/wasi-sysroot/include/netinet/icmp6.h
-share/wasi-sysroot/include/netinet/igmp.h
-share/wasi-sysroot/include/netinet/in.h
-share/wasi-sysroot/include/netinet/in_systm.h
-share/wasi-sysroot/include/netinet/ip.h
-share/wasi-sysroot/include/netinet/ip6.h
-share/wasi-sysroot/include/netinet/ip_icmp.h
-share/wasi-sysroot/include/netinet/tcp.h
-share/wasi-sysroot/include/netinet/udp.h
-share/wasi-sysroot/include/netpacket/
-share/wasi-sysroot/include/netpacket/packet.h
-share/wasi-sysroot/include/nl_types.h
-share/wasi-sysroot/include/poll.h
-share/wasi-sysroot/include/regex.h
-share/wasi-sysroot/include/sched.h
-share/wasi-sysroot/include/scsi/
-share/wasi-sysroot/include/search.h
-share/wasi-sysroot/include/semaphore.h
-share/wasi-sysroot/include/signal.h
-share/wasi-sysroot/include/stdalign.h
-share/wasi-sysroot/include/stdarg.h
-share/wasi-sysroot/include/stdbool.h
-share/wasi-sysroot/include/stdc-predef.h
-share/wasi-sysroot/include/stddef.h
-share/wasi-sysroot/include/stdint.h
-share/wasi-sysroot/include/stdio.h
-share/wasi-sysroot/include/stdio_ext.h
-share/wasi-sysroot/include/stdlib.h
-share/wasi-sysroot/include/stdnoreturn.h
-share/wasi-sysroot/include/string.h
-share/wasi-sysroot/include/strings.h
-share/wasi-sysroot/include/stropts.h
-share/wasi-sysroot/include/sys/
-share/wasi-sysroot/include/sys/dir.h
-share/wasi-sysroot/include/sys/errno.h
-share/wasi-sysroot/include/sys/eventfd.h
-share/wasi-sysroot/include/sys/fcntl.h
-share/wasi-sysroot/include/sys/file.h
-share/wasi-sysroot/include/sys/ioctl.h
-share/wasi-sysroot/include/sys/mman.h
-share/wasi-sysroot/include/sys/param.h
-share/wasi-sysroot/include/sys/poll.h
-share/wasi-sysroot/include/sys/random.h
-share/wasi-sysroot/include/sys/reg.h
-share/wasi-sysroot/include/sys/resource.h
-share/wasi-sysroot/include/sys/select.h
-share/wasi-sysroot/include/sys/signal.h
-share/wasi-sysroot/include/sys/socket.h
-share/wasi-sysroot/include/sys/stat.h
-share/wasi-sysroot/include/sys/stropts.h
-share/wasi-sysroot/include/sys/syscall.h
-share/wasi-sysroot/include/sys/sysinfo.h
-share/wasi-sysroot/include/sys/time.h
-share/wasi-sysroot/include/sys/timeb.h
-share/wasi-sysroot/include/sys/times.h
-share/wasi-sysroot/include/sys/timex.h
-share/wasi-sysroot/include/sys/ttydefaults.h
-share/wasi-sysroot/include/sys/types.h
-share/wasi-sysroot/include/sys/uio.h
-share/wasi-sysroot/include/sys/un.h
-share/wasi-sysroot/include/sys/utsname.h
-share/wasi-sysroot/include/syscall.h
-share/wasi-sysroot/include/sysexits.h
-share/wasi-sysroot/include/tar.h
-share/wasi-sysroot/include/tgmath.h
-share/wasi-sysroot/include/threads.h
-share/wasi-sysroot/include/time.h
-share/wasi-sysroot/include/uchar.h
-share/wasi-sysroot/include/unistd.h
-share/wasi-sysroot/include/utime.h
-share/wasi-sysroot/include/values.h
-share/wasi-sysroot/include/wasi/
-share/wasi-sysroot/include/wasi/api.h
-share/wasi-sysroot/include/wasi/libc-environ.h
-share/wasi-sysroot/include/wasi/libc-find-relpath.h
-share/wasi-sysroot/include/wasi/libc-nocwd.h
-share/wasi-sysroot/include/wasi/libc.h
-share/wasi-sysroot/include/wchar.h
-share/wasi-sysroot/include/wctype.h
+share/wasi-sysroot/include/wasm32-wasi/
+share/wasi-sysroot/include/wasm32-wasi/__errno.h
+share/wasi-sysroot/include/wasm32-wasi/__errno_values.h
+share/wasi-sysroot/include/wasm32-wasi/__fd_set.h
+share/wasi-sysroot/include/wasm32-wasi/__function___isatty.h
+share/wasi-sysroot/include/wasm32-wasi/__functions_malloc.h
+share/wasi-sysroot/include/wasm32-wasi/__functions_memcpy.h
+share/wasi-sysroot/include/wasm32-wasi/__header_dirent.h
+share/wasi-sysroot/include/wasm32-wasi/__header_fcntl.h
+share/wasi-sysroot/include/wasm32-wasi/__header_inttypes.h
+share/wasi-sysroot/include/wasm32-wasi/__header_netinet_in.h
+share/wasi-sysroot/include/wasm32-wasi/__header_poll.h
+share/wasi-sysroot/include/wasm32-wasi/__header_stdlib.h
+share/wasi-sysroot/include/wasm32-wasi/__header_string.h
+share/wasi-sysroot/include/wasm32-wasi/__header_sys_ioctl.h
+share/wasi-sysroot/include/wasm32-wasi/__header_sys_resource.h
+share/wasi-sysroot/include/wasm32-wasi/__header_sys_socket.h
+share/wasi-sysroot/include/wasm32-wasi/__header_sys_stat.h
+share/wasi-sysroot/include/wasm32-wasi/__header_time.h
+share/wasi-sysroot/include/wasm32-wasi/__header_unistd.h
+share/wasi-sysroot/include/wasm32-wasi/__macro_FD_SETSIZE.h
+share/wasi-sysroot/include/wasm32-wasi/__macro_PAGESIZE.h
+share/wasi-sysroot/include/wasm32-wasi/__mode_t.h
+share/wasi-sysroot/include/wasm32-wasi/__seek.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_dirent.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_in6_addr.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_in_addr.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_iovec.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_msghdr.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_pollfd.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_rusage.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_sockaddr.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_sockaddr_in.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_sockaddr_in6.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_sockaddr_storage.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_sockaddr_un.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_stat.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_timespec.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_timeval.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_tm.h
+share/wasi-sysroot/include/wasm32-wasi/__struct_tms.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_DIR.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_blkcnt_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_blksize_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_clock_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_clockid_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_dev_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_fd_set.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_gid_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_in_addr_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_in_port_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_ino_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_mode_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_nfds_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_nlink_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_off_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_sa_family_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_sigset_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_socklen_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_ssize_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_suseconds_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_time_t.h
+share/wasi-sysroot/include/wasm32-wasi/__typedef_uid_t.h
+share/wasi-sysroot/include/wasm32-wasi/__wasi_snapshot.h
+share/wasi-sysroot/include/wasm32-wasi/alloca.h
+share/wasi-sysroot/include/wasm32-wasi/ar.h
+share/wasi-sysroot/include/wasm32-wasi/arpa/
+share/wasi-sysroot/include/wasm32-wasi/arpa/ftp.h
+share/wasi-sysroot/include/wasm32-wasi/arpa/inet.h
+share/wasi-sysroot/include/wasm32-wasi/arpa/nameser.h
+share/wasi-sysroot/include/wasm32-wasi/arpa/nameser_compat.h
+share/wasi-sysroot/include/wasm32-wasi/arpa/telnet.h
+share/wasi-sysroot/include/wasm32-wasi/arpa/tftp.h
+share/wasi-sysroot/include/wasm32-wasi/assert.h
+share/wasi-sysroot/include/wasm32-wasi/bits/
+share/wasi-sysroot/include/wasm32-wasi/bits/alltypes.h
+share/wasi-sysroot/include/wasm32-wasi/bits/dirent.h
+share/wasi-sysroot/include/wasm32-wasi/bits/fcntl.h
+share/wasi-sysroot/include/wasm32-wasi/bits/fenv.h
+share/wasi-sysroot/include/wasm32-wasi/bits/float.h
+share/wasi-sysroot/include/wasm32-wasi/bits/hwcap.h
+share/wasi-sysroot/include/wasm32-wasi/bits/io.h
+share/wasi-sysroot/include/wasm32-wasi/bits/ioctl.h
+share/wasi-sysroot/include/wasm32-wasi/bits/ioctl_fix.h
+share/wasi-sysroot/include/wasm32-wasi/bits/ipcstat.h
+share/wasi-sysroot/include/wasm32-wasi/bits/limits.h
+share/wasi-sysroot/include/wasm32-wasi/bits/mman.h
+share/wasi-sysroot/include/wasm32-wasi/bits/poll.h
+share/wasi-sysroot/include/wasm32-wasi/bits/posix.h
+share/wasi-sysroot/include/wasm32-wasi/bits/reg.h
+share/wasi-sysroot/include/wasm32-wasi/bits/resource.h
+share/wasi-sysroot/include/wasm32-wasi/bits/setjmp.h
+share/wasi-sysroot/include/wasm32-wasi/bits/signal.h
+share/wasi-sysroot/include/wasm32-wasi/bits/socket.h
+share/wasi-sysroot/include/wasm32-wasi/bits/stat.h
+share/wasi-sysroot/include/wasm32-wasi/bits/stdint.h
+share/wasi-sysroot/include/wasm32-wasi/byteswap.h
+share/wasi-sysroot/include/wasm32-wasi/complex.h
+share/wasi-sysroot/include/wasm32-wasi/cpio.h
+share/wasi-sysroot/include/wasm32-wasi/crypt.h
+share/wasi-sysroot/include/wasm32-wasi/ctype.h
+share/wasi-sysroot/include/wasm32-wasi/dirent.h
+share/wasi-sysroot/include/wasm32-wasi/dlfcn.h
+share/wasi-sysroot/include/wasm32-wasi/endian.h
+share/wasi-sysroot/include/wasm32-wasi/err.h
+share/wasi-sysroot/include/wasm32-wasi/errno.h
+share/wasi-sysroot/include/wasm32-wasi/fcntl.h
+share/wasi-sysroot/include/wasm32-wasi/features.h
+share/wasi-sysroot/include/wasm32-wasi/fenv.h
+share/wasi-sysroot/include/wasm32-wasi/float.h
+share/wasi-sysroot/include/wasm32-wasi/fmtmsg.h
+share/wasi-sysroot/include/wasm32-wasi/fnmatch.h
+share/wasi-sysroot/include/wasm32-wasi/fts.h
+share/wasi-sysroot/include/wasm32-wasi/ftw.h
+share/wasi-sysroot/include/wasm32-wasi/getopt.h
+share/wasi-sysroot/include/wasm32-wasi/glob.h
+share/wasi-sysroot/include/wasm32-wasi/iconv.h
+share/wasi-sysroot/include/wasm32-wasi/ifaddrs.h
+share/wasi-sysroot/include/wasm32-wasi/inttypes.h
+share/wasi-sysroot/include/wasm32-wasi/iso646.h
+share/wasi-sysroot/include/wasm32-wasi/langinfo.h
+share/wasi-sysroot/include/wasm32-wasi/libgen.h
+share/wasi-sysroot/include/wasm32-wasi/limits.h
+share/wasi-sysroot/include/wasm32-wasi/locale.h
+share/wasi-sysroot/include/wasm32-wasi/malloc.h
+share/wasi-sysroot/include/wasm32-wasi/math.h
+share/wasi-sysroot/include/wasm32-wasi/memory.h
+share/wasi-sysroot/include/wasm32-wasi/monetary.h
+share/wasi-sysroot/include/wasm32-wasi/mqueue.h
+share/wasi-sysroot/include/wasm32-wasi/net/
+share/wasi-sysroot/include/wasm32-wasi/netinet/
+share/wasi-sysroot/include/wasm32-wasi/netinet/icmp6.h
+share/wasi-sysroot/include/wasm32-wasi/netinet/igmp.h
+share/wasi-sysroot/include/wasm32-wasi/netinet/in.h
+share/wasi-sysroot/include/wasm32-wasi/netinet/in_systm.h
+share/wasi-sysroot/include/wasm32-wasi/netinet/ip.h
+share/wasi-sysroot/include/wasm32-wasi/netinet/ip6.h
+share/wasi-sysroot/include/wasm32-wasi/netinet/ip_icmp.h
+share/wasi-sysroot/include/wasm32-wasi/netinet/tcp.h
+share/wasi-sysroot/include/wasm32-wasi/netinet/udp.h
+share/wasi-sysroot/include/wasm32-wasi/netpacket/
+share/wasi-sysroot/include/wasm32-wasi/netpacket/packet.h
+share/wasi-sysroot/include/wasm32-wasi/nl_types.h
+share/wasi-sysroot/include/wasm32-wasi/poll.h
+share/wasi-sysroot/include/wasm32-wasi/pthread.h
+share/wasi-sysroot/include/wasm32-wasi/regex.h
+share/wasi-sysroot/include/wasm32-wasi/sched.h
+share/wasi-sysroot/include/wasm32-wasi/scsi/
+share/wasi-sysroot/include/wasm32-wasi/search.h
+share/wasi-sysroot/include/wasm32-wasi/semaphore.h
+share/wasi-sysroot/include/wasm32-wasi/setjmp.h
+share/wasi-sysroot/include/wasm32-wasi/signal.h
+share/wasi-sysroot/include/wasm32-wasi/stdalign.h
+share/wasi-sysroot/include/wasm32-wasi/stdarg.h
+share/wasi-sysroot/include/wasm32-wasi/stdbool.h
+share/wasi-sysroot/include/wasm32-wasi/stdc-predef.h
+share/wasi-sysroot/include/wasm32-wasi/stddef.h
+share/wasi-sysroot/include/wasm32-wasi/stdint.h
+share/wasi-sysroot/include/wasm32-wasi/stdio.h
+share/wasi-sysroot/include/wasm32-wasi/stdio_ext.h
+share/wasi-sysroot/include/wasm32-wasi/stdlib.h
+share/wasi-sysroot/include/wasm32-wasi/stdnoreturn.h
+share/wasi-sysroot/include/wasm32-wasi/string.h
+share/wasi-sysroot/include/wasm32-wasi/strings.h
+share/wasi-sysroot/include/wasm32-wasi/stropts.h
+share/wasi-sysroot/include/wasm32-wasi/sys/
+share/wasi-sysroot/include/wasm32-wasi/sys/dir.h
+share/wasi-sysroot/include/wasm32-wasi/sys/errno.h
+share/wasi-sysroot/include/wasm32-wasi/sys/eventfd.h
+share/wasi-sysroot/include/wasm32-wasi/sys/fcntl.h
+share/wasi-sysroot/include/wasm32-wasi/sys/file.h
+share/wasi-sysroot/include/wasm32-wasi/sys/ioctl.h
+share/wasi-sysroot/include/wasm32-wasi/sys/mman.h
+share/wasi-sysroot/include/wasm32-wasi/sys/param.h
+share/wasi-sysroot/include/wasm32-wasi/sys/poll.h
+share/wasi-sysroot/include/wasm32-wasi/sys/random.h
+share/wasi-sysroot/include/wasm32-wasi/sys/reg.h
+share/wasi-sysroot/include/wasm32-wasi/sys/resource.h
+share/wasi-sysroot/include/wasm32-wasi/sys/select.h
+share/wasi-sysroot/include/wasm32-wasi/sys/signal.h
+share/wasi-sysroot/include/wasm32-wasi/sys/socket.h
+share/wasi-sysroot/include/wasm32-wasi/sys/stat.h
+share/wasi-sysroot/include/wasm32-wasi/sys/statvfs.h
+share/wasi-sysroot/include/wasm32-wasi/sys/stropts.h
+share/wasi-sysroot/include/wasm32-wasi/sys/syscall.h
+share/wasi-sysroot/include/wasm32-wasi/sys/sysinfo.h
+share/wasi-sysroot/include/wasm32-wasi/sys/time.h
+share/wasi-sysroot/include/wasm32-wasi/sys/timeb.h
+share/wasi-sysroot/include/wasm32-wasi/sys/times.h
+share/wasi-sysroot/include/wasm32-wasi/sys/timex.h
+share/wasi-sysroot/include/wasm32-wasi/sys/ttydefaults.h
+share/wasi-sysroot/include/wasm32-wasi/sys/types.h
+share/wasi-sysroot/include/wasm32-wasi/sys/uio.h
+share/wasi-sysroot/include/wasm32-wasi/sys/un.h
+share/wasi-sysroot/include/wasm32-wasi/sys/utsname.h
+share/wasi-sysroot/include/wasm32-wasi/syscall.h
+share/wasi-sysroot/include/wasm32-wasi/sysexits.h
+share/wasi-sysroot/include/wasm32-wasi/tar.h
+share/wasi-sysroot/include/wasm32-wasi/tgmath.h
+share/wasi-sysroot/include/wasm32-wasi/threads.h
+share/wasi-sysroot/include/wasm32-wasi/time.h
+share/wasi-sysroot/include/wasm32-wasi/uchar.h
+share/wasi-sysroot/include/wasm32-wasi/unistd.h
+share/wasi-sysroot/include/wasm32-wasi/utime.h
+share/wasi-sysroot/include/wasm32-wasi/values.h
+share/wasi-sysroot/include/wasm32-wasi/wasi/
+share/wasi-sysroot/include/wasm32-wasi/wasi/api.h
+share/wasi-sysroot/include/wasm32-wasi/wasi/libc-environ.h
+share/wasi-sysroot/include/wasm32-wasi/wasi/libc-find-relpath.h
+share/wasi-sysroot/include/wasm32-wasi/wasi/libc-nocwd.h
+share/wasi-sysroot/include/wasm32-wasi/wasi/libc.h
+share/wasi-sysroot/include/wasm32-wasi/wasi/wasip2.h
+share/wasi-sysroot/include/wasm32-wasi/wchar.h
+share/wasi-sysroot/include/wasm32-wasi/wctype.h
share/wasi-sysroot/lib/
share/wasi-sysroot/lib/wasm32-wasi/
share/wasi-sysroot/lib/wasm32-wasi/crt1-command.o
@@ -221,10 +229,12 @@
@static-lib share/wasi-sysroot/lib/wasm32-wasi/libpthread.a
@static-lib share/wasi-sysroot/lib/wasm32-wasi/libresolv.a
@static-lib share/wasi-sysroot/lib/wasm32-wasi/librt.a
+@static-lib share/wasi-sysroot/lib/wasm32-wasi/libsetjmp.a
@static-lib share/wasi-sysroot/lib/wasm32-wasi/libutil.a
@static-lib share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-getpid.a
@static-lib share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-mman.a
@static-lib
share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-process-clocks.a
+@static-lib share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-pthread.a
@static-lib share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-signal.a
@static-lib share/wasi-sysroot/lib/wasm32-wasi/libxnet.a
share/wasi-sysroot/share/
