git: 7c5b2039a45a - main - wasi: consistently use the wasm32-wasip1 triple

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Charlie Li <vishwin_at_FreeBSD.org>
Date: Fri, 20 Mar 2026 20:02:39 UTC
The branch main has been updated by vishwin:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7c5b2039a45ad3fc5479a25f4143716135aa3279

commit 7c5b2039a45ad3fc5479a25f4143716135aa3279
Author:     Charlie Li <vishwin@FreeBSD.org>
AuthorDate: 2026-03-20 19:26:09 +0000
Commit:     Charlie Li <vishwin@FreeBSD.org>
CommitDate: 2026-03-20 20:01:49 +0000

    wasi: consistently use the wasm32-wasip1 triple
    
    The WebAssembly community have reclaimed wasm32-wasi, without suffix,
    for a future WASI 1.0 standard. The first version of WASI, 0.1, is
    now wasm32-wasip1 in triple form, WASI 0.2 is wasm32-wasip2, etc.
    Starting LLVM 22 the non-suffixed form is deprecated, aligning with
    Rust and Go:
    
    https://github.com/llvm/llvm-project/issues/165344
    https://blog.rust-lang.org/2024/04/09/updates-to-rusts-wasi-targets/
    
    The Mozilla build system's WASI checks always pass -Werror so
    configure fails when the non-suffixed target/triple is passed using
    LLVM 22:
    
    Using wasi sysroot in /usr/local/share/wasi-sysroot
    checking for the wasm C compiler... /usr/local/bin/clang22
    checking whether the wasm C compiler can be used... yes
    checking the wasm C compiler version... 22.1.0
    checking the wasm C compiler works... yes
    checking the wasm C compiler can find wasi headers... yes
    checking the wasm C linker can find wasi libraries... yes
    checking for the wasm C++ compiler... /usr/local/bin/clang++22
    checking whether the wasm C++ compiler can be used... yes
    checking the wasm C++ compiler version... 22.1.0
    checking the wasm C++ compiler works... yes
    checking the wasm C++ compiler can find wasi headers... yes
    checking the wasm C++ linker can find wasi libraries... yes
    checking for clock() in wasi sysroot... no
    checking for emulated clock() in wasi sysroot...
    DEBUG: Creating `/tmp/conftest0vk5p554.c` with content:
    DEBUG: | #include <time.h>
    DEBUG: | int
    DEBUG: | main(void)
    DEBUG: | {
    DEBUG: | clock();
    DEBUG: |   ;
    DEBUG: |   return 0;
    DEBUG: | }
    DEBUG: Executing: `/usr/local/bin/clang22 --target=wasm32-wasi /tmp/conftest0vk5p554.c -Werror -D_WASI_EMULATED_PROCESS_CLOCKS -lwasi-emulated-process-clocks --sysroot=/usr/local/share/wasi-sysroot`
    DEBUG: The command returned non-zero exit status 1.
    DEBUG: Its error output was:
    DEBUG: | clang: error: argument '--target=wasm32-wasi' is deprecated, use --target=wasm32-wasip1 instead [-Werror,-Wdeprecated]
    ERROR: Can't find clock() in wasi sysroot.
    
    Mozilla bug: https://bugzilla.mozilla.org/show_bug.cgi?id=2023597
    
    Bump all WASI ports for the new triple. Adjust consumers accordingly
    but do not bump, since non-suffixed and p1 are identical as a
    transition measure.
---
 devel/wasi-compiler-rt/Makefile   |   9 +-
 devel/wasi-compiler-rt17/Makefile |   2 +-
 devel/wasi-compiler-rt18/Makefile |   2 +-
 devel/wasi-compiler-rt19/Makefile |   1 +
 devel/wasi-compiler-rt20/Makefile |   1 +
 devel/wasi-compiler-rt21/Makefile |   1 +
 devel/wasi-compiler-rt22/Makefile |   1 +
 devel/wasi-libc/Makefile          |  10 +-
 devel/wasi-libc/pkg-plist17       | 450 +++++++++++++++++++-------------------
 devel/wasi-libc/pkg-plist18       | 450 +++++++++++++++++++-------------------
 devel/wasi-libc/pkg-plist19       | 450 +++++++++++++++++++-------------------
 devel/wasi-libc/pkg-plist20       | 450 +++++++++++++++++++-------------------
 devel/wasi-libc/pkg-plist21       | 450 +++++++++++++++++++-------------------
 devel/wasi-libc/pkg-plist22       | 450 +++++++++++++++++++-------------------
 devel/wasi-libcxx/Makefile        |   2 +-
 devel/wasi-libcxx17/Makefile      |   2 +-
 devel/wasi-libcxx18/Makefile      |   2 +-
 devel/wasi-libcxx19/Makefile      |   2 +-
 devel/wasi-libcxx20/Makefile      |   2 +-
 devel/wasi-libcxx21/Makefile      |   2 +-
 devel/wasi-libcxx22/Makefile      |   1 +
 mail/thunderbird-esr/Makefile     |   6 +-
 mail/thunderbird/Makefile         |   6 +-
 www/firefox-esr/Makefile          |   6 +-
 www/firefox/Makefile              |   6 +-
 www/librewolf/Makefile            |   6 +-
 www/tor-browser/Makefile          |   8 +-
 www/waterfox/Makefile             |   6 +-
 28 files changed, 1403 insertions(+), 1381 deletions(-)

diff --git a/devel/wasi-compiler-rt/Makefile b/devel/wasi-compiler-rt/Makefile
index eb84840cd01e..ce4f30b1c44f 100644
--- a/devel/wasi-compiler-rt/Makefile
+++ b/devel/wasi-compiler-rt/Makefile
@@ -33,7 +33,7 @@ DISTINFO_FILE=	${PORTSDIR}/${LLVM_PORT}/distinfo
 NO_ARCH=	yes
 
 WASI_SYSROOT=	${LOCALBASE}/share/wasi-sysroot
-TRIPLE=		wasm32-wasi
+TRIPLE=		wasm32-unknown-wasip1
 WITHOUT_CPU_CFLAGS=	yes
 # try to sync with https://github.com/WebAssembly/wasi-sdk
 # wasi-sdk.cmake and cmake/wasi-sdk-sysroot.cmake
@@ -53,11 +53,11 @@ CMAKE_ARGS=	-DCMAKE_SYSTEM_NAME=WASI \
 		-DCMAKE_C_COMPILER_WORKS=ON \
 		-DCMAKE_CXX_COMPILER_WORKS=ON \
 		-DCMAKE_SYSROOT=${WASI_SYSROOT} \
+		-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON \
 		-DCOMPILER_RT_BAREMETAL_BUILD=ON \
 		-DCOMPILER_RT_BUILD_XRAY=OFF \
 		-DCOMPILER_RT_INCLUDE_TESTS=OFF \
 		-DCOMPILER_RT_HAS_FPIC_FLAG=OFF \
-		-DCOMPILER_RT_ENABLE_IOS=OFF \
 		-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON \
 		-DCOMPILER_RT_BUILD_SANITIZERS=OFF \
 		-DCOMPILER_RT_BUILD_XRAY=OFF \
@@ -66,10 +66,9 @@ CMAKE_ARGS=	-DCMAKE_SYSTEM_NAME=WASI \
 		-DCOMPILER_RT_BUILD_CTX_PROFILE=OFF \
 		-DCOMPILER_RT_BUILD_MEMPROF=OFF \
 		-DCOMPILER_RT_BUILD_ORC=OFF \
-		-DCOMPILER_RT_BUILD_GWP_ASAN=OFF \
-		-DCOMPILER_RT_OS_DIR=wasi
+		-DCOMPILER_RT_BUILD_GWP_ASAN=OFF
 CMAKE_INSTALL_PREFIX=	${LLVM_PREFIX}/lib/clang/${LLVM_VERSION}
 
-PLIST_FILES=	${LLVM_PREFIX}/lib/clang/${LLVM_VERSION}/lib/wasi/libclang_rt.builtins-wasm32.a
+PLIST_FILES=	${LLVM_PREFIX}/lib/clang/${LLVM_VERSION}/lib/${TRIPLE}/libclang_rt.builtins.a
 
 .include <bsd.port.mk>
diff --git a/devel/wasi-compiler-rt17/Makefile b/devel/wasi-compiler-rt17/Makefile
index 5c7882c84831..9b74ed72d90f 100644
--- a/devel/wasi-compiler-rt17/Makefile
+++ b/devel/wasi-compiler-rt17/Makefile
@@ -1,6 +1,6 @@
 # must sync with devel/llvm17
 DISTVERSION=	17.0.6
-PORTREVISION=	2
+PORTREVISION=	3
 
 MASTERDIR=	${.CURDIR}/../wasi-compiler-rt
 
diff --git a/devel/wasi-compiler-rt18/Makefile b/devel/wasi-compiler-rt18/Makefile
index 5d51ffdf1b5b..4193f7a52630 100644
--- a/devel/wasi-compiler-rt18/Makefile
+++ b/devel/wasi-compiler-rt18/Makefile
@@ -1,6 +1,6 @@
 # must sync with devel/llvm18
 DISTVERSION=	18.1.8
-PORTREVISION=	1
+PORTREVISION=	2
 
 MASTERDIR=	${.CURDIR}/../wasi-compiler-rt
 
diff --git a/devel/wasi-compiler-rt19/Makefile b/devel/wasi-compiler-rt19/Makefile
index 29a288d81f3b..78e2e41b366b 100644
--- a/devel/wasi-compiler-rt19/Makefile
+++ b/devel/wasi-compiler-rt19/Makefile
@@ -1,5 +1,6 @@
 # must sync with devel/llvm19
 DISTVERSION=	19.1.7
+PORTREVISION=	1
 
 MASTERDIR=	${.CURDIR}/../wasi-compiler-rt
 
diff --git a/devel/wasi-compiler-rt20/Makefile b/devel/wasi-compiler-rt20/Makefile
index 2cd2b30e3699..a167c0636db4 100644
--- a/devel/wasi-compiler-rt20/Makefile
+++ b/devel/wasi-compiler-rt20/Makefile
@@ -1,5 +1,6 @@
 # must sync with devel/llvm20
 DISTVERSION=	20.1.8
+PORTREVISION=	1
 
 MASTERDIR=	${.CURDIR}/../wasi-compiler-rt
 
diff --git a/devel/wasi-compiler-rt21/Makefile b/devel/wasi-compiler-rt21/Makefile
index 2c0ab41c55af..3b66285ddc8f 100644
--- a/devel/wasi-compiler-rt21/Makefile
+++ b/devel/wasi-compiler-rt21/Makefile
@@ -1,5 +1,6 @@
 # must sync with devel/llvm21
 DISTVERSION=	21.1.8
+PORTREVISION=	1
 
 MASTERDIR=	${.CURDIR}/../wasi-compiler-rt
 
diff --git a/devel/wasi-compiler-rt22/Makefile b/devel/wasi-compiler-rt22/Makefile
index 8f2f6f874d39..faad426849cd 100644
--- a/devel/wasi-compiler-rt22/Makefile
+++ b/devel/wasi-compiler-rt22/Makefile
@@ -1,5 +1,6 @@
 # must sync with devel/llvm22
 DISTVERSION=	22.1.0
+PORTREVISION=	1
 
 MASTERDIR=	${.CURDIR}/../wasi-compiler-rt
 
diff --git a/devel/wasi-libc/Makefile b/devel/wasi-libc/Makefile
index 32c1021d4a27..3da7c62f9f28 100644
--- a/devel/wasi-libc/Makefile
+++ b/devel/wasi-libc/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	wasi-libc
 DISTVERSIONPREFIX=	wasi-sdk-
 DISTVERSION=	31
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMESUFFIX=	${FLAVOR}
 
@@ -28,19 +29,20 @@ GH_ACCOUNT=	WebAssembly
 GH_TUPLE=	WebAssembly:WASI:59cbe14:wasi/tools/wasi-headers/WASI
 NO_ARCH=	yes
 PLIST=		${PKGDIR}/pkg-plist${LLVM_VERSION}
+PLIST_SUB=	TRIPLE=${TRIPLE}
 CONFLICTS_INSTALL=	wasi-libc[0-9]*
 WITHOUT_CPU_CFLAGS=	yes
 
 # NOTE: matches the https://github.com/WebAssembly/wasi-sdk
 WASI_SYSROOT=	${PREFIX}/share/wasi-sysroot
+TRIPLE=		wasm32-wasip1
 
 CMAKE_INSTALL_PREFIX=	${WASI_SYSROOT}
-CMAKE_ARGS=	-DCMAKE_C_COMPILER=clang${LLVM_VERSION} \
-		-DCMAKE_AR=llvm-ar${LLVM_VERSION} \
+CMAKE_ARGS=	-DCMAKE_AR=llvm-ar${LLVM_VERSION} \
 		-DCMAKE_NM=llvm-nm${LLVM_VERSION} \
 		-DCMAKE_RANLIB=llvm-ranlib${LLVM_VERSION} \
-		-DTARGET_TRIPLE=wasm32-wasi \
-		-DBUILTINS_LIB=${LLVM_PREFIX:S/${PREFIX}/${LOCALBASE}/}/lib/clang/${LLVM_VERSION}/lib/wasi/libclang_rt.builtins-wasm32.a \
+		-DTARGET_TRIPLE=${TRIPLE} \
+		-DBUILTINS_LIB=${LLVM_PREFIX:S|${PREFIX}|${LOCALBASE}|}/lib/clang/${LLVM_VERSION}/lib/${TRIPLE:S|-|-unknown-|}/libclang_rt.builtins.a \
 		-DBUILD_SHARED=OFF
 
 .include <bsd.port.mk>
diff --git a/devel/wasi-libc/pkg-plist17 b/devel/wasi-libc/pkg-plist17
index 70134a9ade3b..9451850aff7e 100644
--- a/devel/wasi-libc/pkg-plist17
+++ b/devel/wasi-libc/pkg-plist17
@@ -1,225 +1,225 @@
-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/alloca.h
-share/wasi-sysroot/include/wasm32-wasi/ar.h
-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/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/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/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/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/stdbool.h
-share/wasi-sysroot/include/wasm32-wasi/stdc-predef.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/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/api.h
-share/wasi-sysroot/include/wasm32-wasi/wasi/libc-busywait.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/version.h
-share/wasi-sysroot/include/wasm32-wasi/wasi/wasip1.h
-share/wasi-sysroot/include/wasm32-wasi/wasi/wasip2.h
-share/wasi-sysroot/include/wasm32-wasi/wasi/wasip3.h
-share/wasi-sysroot/include/wasm32-wasi/wchar.h
-share/wasi-sysroot/include/wasm32-wasi/wctype.h
-share/wasi-sysroot/lib/wasm32-wasi/crt1-command.o
-share/wasi-sysroot/lib/wasm32-wasi/crt1-reactor.o
-share/wasi-sysroot/lib/wasm32-wasi/crt1.o
-share/wasi-sysroot/lib/wasm32-wasi/libc-printscan-long-double.a
-share/wasi-sysroot/lib/wasm32-wasi/libc-printscan-no-floating-point.a
-share/wasi-sysroot/lib/wasm32-wasi/libc.a
-share/wasi-sysroot/lib/wasm32-wasi/libcrypt.a
-share/wasi-sysroot/lib/wasm32-wasi/libdl.a
-share/wasi-sysroot/lib/wasm32-wasi/libm.a
-share/wasi-sysroot/lib/wasm32-wasi/libpthread.a
-share/wasi-sysroot/lib/wasm32-wasi/libresolv.a
-share/wasi-sysroot/lib/wasm32-wasi/librt.a
-share/wasi-sysroot/lib/wasm32-wasi/libsetjmp.a
-share/wasi-sysroot/lib/wasm32-wasi/libutil.a
-share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-getpid.a
-share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-mman.a
-share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-process-clocks.a
-share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-signal.a
-share/wasi-sysroot/lib/wasm32-wasi/libxnet.a
+share/wasi-sysroot/include/%%TRIPLE%%/__errno.h
+share/wasi-sysroot/include/%%TRIPLE%%/__errno_values.h
+share/wasi-sysroot/include/%%TRIPLE%%/__fd_set.h
+share/wasi-sysroot/include/%%TRIPLE%%/__function___isatty.h
+share/wasi-sysroot/include/%%TRIPLE%%/__functions_malloc.h
+share/wasi-sysroot/include/%%TRIPLE%%/__functions_memcpy.h
+share/wasi-sysroot/include/%%TRIPLE%%/__header_dirent.h
+share/wasi-sysroot/include/%%TRIPLE%%/__header_fcntl.h
+share/wasi-sysroot/include/%%TRIPLE%%/__header_inttypes.h
+share/wasi-sysroot/include/%%TRIPLE%%/__header_netinet_in.h
+share/wasi-sysroot/include/%%TRIPLE%%/__header_poll.h
+share/wasi-sysroot/include/%%TRIPLE%%/__header_stdlib.h
+share/wasi-sysroot/include/%%TRIPLE%%/__header_string.h
+share/wasi-sysroot/include/%%TRIPLE%%/__header_sys_ioctl.h
+share/wasi-sysroot/include/%%TRIPLE%%/__header_sys_resource.h
+share/wasi-sysroot/include/%%TRIPLE%%/__header_sys_socket.h
+share/wasi-sysroot/include/%%TRIPLE%%/__header_sys_stat.h
+share/wasi-sysroot/include/%%TRIPLE%%/__header_time.h
+share/wasi-sysroot/include/%%TRIPLE%%/__header_unistd.h
+share/wasi-sysroot/include/%%TRIPLE%%/__macro_FD_SETSIZE.h
+share/wasi-sysroot/include/%%TRIPLE%%/__macro_PAGESIZE.h
+share/wasi-sysroot/include/%%TRIPLE%%/__mode_t.h
+share/wasi-sysroot/include/%%TRIPLE%%/__seek.h
+share/wasi-sysroot/include/%%TRIPLE%%/__struct_dirent.h
+share/wasi-sysroot/include/%%TRIPLE%%/__struct_in6_addr.h
+share/wasi-sysroot/include/%%TRIPLE%%/__struct_in_addr.h
+share/wasi-sysroot/include/%%TRIPLE%%/__struct_iovec.h
+share/wasi-sysroot/include/%%TRIPLE%%/__struct_msghdr.h
+share/wasi-sysroot/include/%%TRIPLE%%/__struct_pollfd.h
+share/wasi-sysroot/include/%%TRIPLE%%/__struct_rusage.h
+share/wasi-sysroot/include/%%TRIPLE%%/__struct_sockaddr.h
+share/wasi-sysroot/include/%%TRIPLE%%/__struct_sockaddr_in.h
+share/wasi-sysroot/include/%%TRIPLE%%/__struct_sockaddr_in6.h
+share/wasi-sysroot/include/%%TRIPLE%%/__struct_sockaddr_storage.h
+share/wasi-sysroot/include/%%TRIPLE%%/__struct_sockaddr_un.h
+share/wasi-sysroot/include/%%TRIPLE%%/__struct_stat.h
+share/wasi-sysroot/include/%%TRIPLE%%/__struct_timespec.h
+share/wasi-sysroot/include/%%TRIPLE%%/__struct_timeval.h
+share/wasi-sysroot/include/%%TRIPLE%%/__struct_tm.h
+share/wasi-sysroot/include/%%TRIPLE%%/__struct_tms.h
+share/wasi-sysroot/include/%%TRIPLE%%/__typedef_DIR.h
+share/wasi-sysroot/include/%%TRIPLE%%/__typedef_blkcnt_t.h
+share/wasi-sysroot/include/%%TRIPLE%%/__typedef_blksize_t.h
+share/wasi-sysroot/include/%%TRIPLE%%/__typedef_clock_t.h
+share/wasi-sysroot/include/%%TRIPLE%%/__typedef_clockid_t.h
+share/wasi-sysroot/include/%%TRIPLE%%/__typedef_dev_t.h
+share/wasi-sysroot/include/%%TRIPLE%%/__typedef_fd_set.h
+share/wasi-sysroot/include/%%TRIPLE%%/__typedef_gid_t.h
+share/wasi-sysroot/include/%%TRIPLE%%/__typedef_in_addr_t.h
+share/wasi-sysroot/include/%%TRIPLE%%/__typedef_in_port_t.h
+share/wasi-sysroot/include/%%TRIPLE%%/__typedef_ino_t.h
+share/wasi-sysroot/include/%%TRIPLE%%/__typedef_mode_t.h
+share/wasi-sysroot/include/%%TRIPLE%%/__typedef_nfds_t.h
+share/wasi-sysroot/include/%%TRIPLE%%/__typedef_nlink_t.h
+share/wasi-sysroot/include/%%TRIPLE%%/__typedef_off_t.h
+share/wasi-sysroot/include/%%TRIPLE%%/__typedef_sa_family_t.h
+share/wasi-sysroot/include/%%TRIPLE%%/__typedef_sigset_t.h
+share/wasi-sysroot/include/%%TRIPLE%%/__typedef_socklen_t.h
+share/wasi-sysroot/include/%%TRIPLE%%/__typedef_ssize_t.h
+share/wasi-sysroot/include/%%TRIPLE%%/__typedef_suseconds_t.h
+share/wasi-sysroot/include/%%TRIPLE%%/__typedef_time_t.h
+share/wasi-sysroot/include/%%TRIPLE%%/__typedef_uid_t.h
+share/wasi-sysroot/include/%%TRIPLE%%/alloca.h
+share/wasi-sysroot/include/%%TRIPLE%%/ar.h
+share/wasi-sysroot/include/%%TRIPLE%%/arpa/ftp.h
+share/wasi-sysroot/include/%%TRIPLE%%/arpa/inet.h
+share/wasi-sysroot/include/%%TRIPLE%%/arpa/nameser.h
+share/wasi-sysroot/include/%%TRIPLE%%/arpa/nameser_compat.h
+share/wasi-sysroot/include/%%TRIPLE%%/arpa/telnet.h
+share/wasi-sysroot/include/%%TRIPLE%%/arpa/tftp.h
+share/wasi-sysroot/include/%%TRIPLE%%/assert.h
+share/wasi-sysroot/include/%%TRIPLE%%/bits/alltypes.h
+share/wasi-sysroot/include/%%TRIPLE%%/bits/dirent.h
+share/wasi-sysroot/include/%%TRIPLE%%/bits/fcntl.h
+share/wasi-sysroot/include/%%TRIPLE%%/bits/fenv.h
+share/wasi-sysroot/include/%%TRIPLE%%/bits/float.h
+share/wasi-sysroot/include/%%TRIPLE%%/bits/hwcap.h
+share/wasi-sysroot/include/%%TRIPLE%%/bits/io.h
+share/wasi-sysroot/include/%%TRIPLE%%/bits/ioctl.h
+share/wasi-sysroot/include/%%TRIPLE%%/bits/ioctl_fix.h
+share/wasi-sysroot/include/%%TRIPLE%%/bits/ipcstat.h
+share/wasi-sysroot/include/%%TRIPLE%%/bits/limits.h
+share/wasi-sysroot/include/%%TRIPLE%%/bits/mman.h
+share/wasi-sysroot/include/%%TRIPLE%%/bits/poll.h
+share/wasi-sysroot/include/%%TRIPLE%%/bits/posix.h
+share/wasi-sysroot/include/%%TRIPLE%%/bits/reg.h
+share/wasi-sysroot/include/%%TRIPLE%%/bits/resource.h
+share/wasi-sysroot/include/%%TRIPLE%%/bits/setjmp.h
+share/wasi-sysroot/include/%%TRIPLE%%/bits/signal.h
+share/wasi-sysroot/include/%%TRIPLE%%/bits/socket.h
+share/wasi-sysroot/include/%%TRIPLE%%/bits/stat.h
+share/wasi-sysroot/include/%%TRIPLE%%/bits/stdint.h
+share/wasi-sysroot/include/%%TRIPLE%%/byteswap.h
+share/wasi-sysroot/include/%%TRIPLE%%/complex.h
+share/wasi-sysroot/include/%%TRIPLE%%/cpio.h
+share/wasi-sysroot/include/%%TRIPLE%%/crypt.h
+share/wasi-sysroot/include/%%TRIPLE%%/ctype.h
+share/wasi-sysroot/include/%%TRIPLE%%/dirent.h
+share/wasi-sysroot/include/%%TRIPLE%%/dlfcn.h
+share/wasi-sysroot/include/%%TRIPLE%%/endian.h
+share/wasi-sysroot/include/%%TRIPLE%%/err.h
+share/wasi-sysroot/include/%%TRIPLE%%/errno.h
+share/wasi-sysroot/include/%%TRIPLE%%/fcntl.h
+share/wasi-sysroot/include/%%TRIPLE%%/features.h
+share/wasi-sysroot/include/%%TRIPLE%%/fenv.h
+share/wasi-sysroot/include/%%TRIPLE%%/float.h
+share/wasi-sysroot/include/%%TRIPLE%%/fmtmsg.h
+share/wasi-sysroot/include/%%TRIPLE%%/fnmatch.h
+share/wasi-sysroot/include/%%TRIPLE%%/fts.h
+share/wasi-sysroot/include/%%TRIPLE%%/ftw.h
+share/wasi-sysroot/include/%%TRIPLE%%/getopt.h
+share/wasi-sysroot/include/%%TRIPLE%%/glob.h
+share/wasi-sysroot/include/%%TRIPLE%%/iconv.h
+share/wasi-sysroot/include/%%TRIPLE%%/ifaddrs.h
+share/wasi-sysroot/include/%%TRIPLE%%/inttypes.h
+share/wasi-sysroot/include/%%TRIPLE%%/iso646.h
+share/wasi-sysroot/include/%%TRIPLE%%/langinfo.h
+share/wasi-sysroot/include/%%TRIPLE%%/libgen.h
+share/wasi-sysroot/include/%%TRIPLE%%/limits.h
+share/wasi-sysroot/include/%%TRIPLE%%/locale.h
+share/wasi-sysroot/include/%%TRIPLE%%/malloc.h
+share/wasi-sysroot/include/%%TRIPLE%%/math.h
+share/wasi-sysroot/include/%%TRIPLE%%/memory.h
+share/wasi-sysroot/include/%%TRIPLE%%/monetary.h
+share/wasi-sysroot/include/%%TRIPLE%%/mqueue.h
+share/wasi-sysroot/include/%%TRIPLE%%/netinet/icmp6.h
+share/wasi-sysroot/include/%%TRIPLE%%/netinet/igmp.h
+share/wasi-sysroot/include/%%TRIPLE%%/netinet/in.h
+share/wasi-sysroot/include/%%TRIPLE%%/netinet/in_systm.h
+share/wasi-sysroot/include/%%TRIPLE%%/netinet/ip.h
+share/wasi-sysroot/include/%%TRIPLE%%/netinet/ip6.h
+share/wasi-sysroot/include/%%TRIPLE%%/netinet/ip_icmp.h
+share/wasi-sysroot/include/%%TRIPLE%%/netinet/tcp.h
+share/wasi-sysroot/include/%%TRIPLE%%/netinet/udp.h
+share/wasi-sysroot/include/%%TRIPLE%%/netpacket/packet.h
+share/wasi-sysroot/include/%%TRIPLE%%/nl_types.h
+share/wasi-sysroot/include/%%TRIPLE%%/poll.h
+share/wasi-sysroot/include/%%TRIPLE%%/pthread.h
+share/wasi-sysroot/include/%%TRIPLE%%/regex.h
+share/wasi-sysroot/include/%%TRIPLE%%/sched.h
+share/wasi-sysroot/include/%%TRIPLE%%/search.h
+share/wasi-sysroot/include/%%TRIPLE%%/semaphore.h
+share/wasi-sysroot/include/%%TRIPLE%%/setjmp.h
+share/wasi-sysroot/include/%%TRIPLE%%/signal.h
+share/wasi-sysroot/include/%%TRIPLE%%/stdalign.h
+share/wasi-sysroot/include/%%TRIPLE%%/stdbool.h
+share/wasi-sysroot/include/%%TRIPLE%%/stdc-predef.h
+share/wasi-sysroot/include/%%TRIPLE%%/stdint.h
+share/wasi-sysroot/include/%%TRIPLE%%/stdio.h
+share/wasi-sysroot/include/%%TRIPLE%%/stdio_ext.h
+share/wasi-sysroot/include/%%TRIPLE%%/stdlib.h
+share/wasi-sysroot/include/%%TRIPLE%%/stdnoreturn.h
+share/wasi-sysroot/include/%%TRIPLE%%/string.h
+share/wasi-sysroot/include/%%TRIPLE%%/strings.h
+share/wasi-sysroot/include/%%TRIPLE%%/stropts.h
+share/wasi-sysroot/include/%%TRIPLE%%/sys/dir.h
+share/wasi-sysroot/include/%%TRIPLE%%/sys/errno.h
+share/wasi-sysroot/include/%%TRIPLE%%/sys/eventfd.h
+share/wasi-sysroot/include/%%TRIPLE%%/sys/fcntl.h
+share/wasi-sysroot/include/%%TRIPLE%%/sys/file.h
+share/wasi-sysroot/include/%%TRIPLE%%/sys/ioctl.h
+share/wasi-sysroot/include/%%TRIPLE%%/sys/mman.h
+share/wasi-sysroot/include/%%TRIPLE%%/sys/param.h
+share/wasi-sysroot/include/%%TRIPLE%%/sys/poll.h
+share/wasi-sysroot/include/%%TRIPLE%%/sys/random.h
+share/wasi-sysroot/include/%%TRIPLE%%/sys/reg.h
+share/wasi-sysroot/include/%%TRIPLE%%/sys/resource.h
+share/wasi-sysroot/include/%%TRIPLE%%/sys/select.h
+share/wasi-sysroot/include/%%TRIPLE%%/sys/signal.h
+share/wasi-sysroot/include/%%TRIPLE%%/sys/socket.h
+share/wasi-sysroot/include/%%TRIPLE%%/sys/stat.h
+share/wasi-sysroot/include/%%TRIPLE%%/sys/statvfs.h
+share/wasi-sysroot/include/%%TRIPLE%%/sys/stropts.h
+share/wasi-sysroot/include/%%TRIPLE%%/sys/syscall.h
+share/wasi-sysroot/include/%%TRIPLE%%/sys/sysinfo.h
+share/wasi-sysroot/include/%%TRIPLE%%/sys/time.h
+share/wasi-sysroot/include/%%TRIPLE%%/sys/timeb.h
+share/wasi-sysroot/include/%%TRIPLE%%/sys/times.h
+share/wasi-sysroot/include/%%TRIPLE%%/sys/timex.h
+share/wasi-sysroot/include/%%TRIPLE%%/sys/ttydefaults.h
+share/wasi-sysroot/include/%%TRIPLE%%/sys/types.h
+share/wasi-sysroot/include/%%TRIPLE%%/sys/uio.h
+share/wasi-sysroot/include/%%TRIPLE%%/sys/un.h
+share/wasi-sysroot/include/%%TRIPLE%%/sys/utsname.h
+share/wasi-sysroot/include/%%TRIPLE%%/syscall.h
+share/wasi-sysroot/include/%%TRIPLE%%/sysexits.h
+share/wasi-sysroot/include/%%TRIPLE%%/tar.h
+share/wasi-sysroot/include/%%TRIPLE%%/tgmath.h
+share/wasi-sysroot/include/%%TRIPLE%%/threads.h
+share/wasi-sysroot/include/%%TRIPLE%%/time.h
+share/wasi-sysroot/include/%%TRIPLE%%/uchar.h
+share/wasi-sysroot/include/%%TRIPLE%%/unistd.h
+share/wasi-sysroot/include/%%TRIPLE%%/utime.h
+share/wasi-sysroot/include/%%TRIPLE%%/values.h
+share/wasi-sysroot/include/%%TRIPLE%%/wasi/api.h
+share/wasi-sysroot/include/%%TRIPLE%%/wasi/libc-busywait.h
+share/wasi-sysroot/include/%%TRIPLE%%/wasi/libc-environ.h
+share/wasi-sysroot/include/%%TRIPLE%%/wasi/libc-find-relpath.h
+share/wasi-sysroot/include/%%TRIPLE%%/wasi/libc-nocwd.h
+share/wasi-sysroot/include/%%TRIPLE%%/wasi/libc.h
+share/wasi-sysroot/include/%%TRIPLE%%/wasi/version.h
+share/wasi-sysroot/include/%%TRIPLE%%/wasi/wasip1.h
+share/wasi-sysroot/include/%%TRIPLE%%/wasi/wasip2.h
+share/wasi-sysroot/include/%%TRIPLE%%/wasi/wasip3.h
+share/wasi-sysroot/include/%%TRIPLE%%/wchar.h
+share/wasi-sysroot/include/%%TRIPLE%%/wctype.h
+share/wasi-sysroot/lib/%%TRIPLE%%/crt1-command.o
+share/wasi-sysroot/lib/%%TRIPLE%%/crt1-reactor.o
+share/wasi-sysroot/lib/%%TRIPLE%%/crt1.o
+share/wasi-sysroot/lib/%%TRIPLE%%/libc-printscan-long-double.a
+share/wasi-sysroot/lib/%%TRIPLE%%/libc-printscan-no-floating-point.a
+share/wasi-sysroot/lib/%%TRIPLE%%/libc.a
+share/wasi-sysroot/lib/%%TRIPLE%%/libcrypt.a
+share/wasi-sysroot/lib/%%TRIPLE%%/libdl.a
+share/wasi-sysroot/lib/%%TRIPLE%%/libm.a
+share/wasi-sysroot/lib/%%TRIPLE%%/libpthread.a
+share/wasi-sysroot/lib/%%TRIPLE%%/libresolv.a
+share/wasi-sysroot/lib/%%TRIPLE%%/librt.a
+share/wasi-sysroot/lib/%%TRIPLE%%/libsetjmp.a
+share/wasi-sysroot/lib/%%TRIPLE%%/libutil.a
+share/wasi-sysroot/lib/%%TRIPLE%%/libwasi-emulated-getpid.a
+share/wasi-sysroot/lib/%%TRIPLE%%/libwasi-emulated-mman.a
+share/wasi-sysroot/lib/%%TRIPLE%%/libwasi-emulated-process-clocks.a
+share/wasi-sysroot/lib/%%TRIPLE%%/libwasi-emulated-signal.a
+share/wasi-sysroot/lib/%%TRIPLE%%/libxnet.a
diff --git a/devel/wasi-libc/pkg-plist18 b/devel/wasi-libc/pkg-plist18
index 70134a9ade3b..9451850aff7e 100644
--- a/devel/wasi-libc/pkg-plist18
+++ b/devel/wasi-libc/pkg-plist18
@@ -1,225 +1,225 @@
-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/alloca.h
-share/wasi-sysroot/include/wasm32-wasi/ar.h
-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/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/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/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/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/stdbool.h
-share/wasi-sysroot/include/wasm32-wasi/stdc-predef.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/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/api.h
-share/wasi-sysroot/include/wasm32-wasi/wasi/libc-busywait.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/version.h
-share/wasi-sysroot/include/wasm32-wasi/wasi/wasip1.h
-share/wasi-sysroot/include/wasm32-wasi/wasi/wasip2.h
-share/wasi-sysroot/include/wasm32-wasi/wasi/wasip3.h
-share/wasi-sysroot/include/wasm32-wasi/wchar.h
-share/wasi-sysroot/include/wasm32-wasi/wctype.h
-share/wasi-sysroot/lib/wasm32-wasi/crt1-command.o
-share/wasi-sysroot/lib/wasm32-wasi/crt1-reactor.o
-share/wasi-sysroot/lib/wasm32-wasi/crt1.o
-share/wasi-sysroot/lib/wasm32-wasi/libc-printscan-long-double.a
-share/wasi-sysroot/lib/wasm32-wasi/libc-printscan-no-floating-point.a
-share/wasi-sysroot/lib/wasm32-wasi/libc.a
-share/wasi-sysroot/lib/wasm32-wasi/libcrypt.a
-share/wasi-sysroot/lib/wasm32-wasi/libdl.a
-share/wasi-sysroot/lib/wasm32-wasi/libm.a
-share/wasi-sysroot/lib/wasm32-wasi/libpthread.a
-share/wasi-sysroot/lib/wasm32-wasi/libresolv.a
-share/wasi-sysroot/lib/wasm32-wasi/librt.a
-share/wasi-sysroot/lib/wasm32-wasi/libsetjmp.a
-share/wasi-sysroot/lib/wasm32-wasi/libutil.a
-share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-getpid.a
-share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-mman.a
-share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-process-clocks.a
-share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-signal.a
-share/wasi-sysroot/lib/wasm32-wasi/libxnet.a
+share/wasi-sysroot/include/%%TRIPLE%%/__errno.h
+share/wasi-sysroot/include/%%TRIPLE%%/__errno_values.h
+share/wasi-sysroot/include/%%TRIPLE%%/__fd_set.h
+share/wasi-sysroot/include/%%TRIPLE%%/__function___isatty.h
+share/wasi-sysroot/include/%%TRIPLE%%/__functions_malloc.h
+share/wasi-sysroot/include/%%TRIPLE%%/__functions_memcpy.h
+share/wasi-sysroot/include/%%TRIPLE%%/__header_dirent.h
+share/wasi-sysroot/include/%%TRIPLE%%/__header_fcntl.h
+share/wasi-sysroot/include/%%TRIPLE%%/__header_inttypes.h
+share/wasi-sysroot/include/%%TRIPLE%%/__header_netinet_in.h
+share/wasi-sysroot/include/%%TRIPLE%%/__header_poll.h
+share/wasi-sysroot/include/%%TRIPLE%%/__header_stdlib.h
+share/wasi-sysroot/include/%%TRIPLE%%/__header_string.h
+share/wasi-sysroot/include/%%TRIPLE%%/__header_sys_ioctl.h
+share/wasi-sysroot/include/%%TRIPLE%%/__header_sys_resource.h
+share/wasi-sysroot/include/%%TRIPLE%%/__header_sys_socket.h
+share/wasi-sysroot/include/%%TRIPLE%%/__header_sys_stat.h
+share/wasi-sysroot/include/%%TRIPLE%%/__header_time.h
+share/wasi-sysroot/include/%%TRIPLE%%/__header_unistd.h
+share/wasi-sysroot/include/%%TRIPLE%%/__macro_FD_SETSIZE.h
+share/wasi-sysroot/include/%%TRIPLE%%/__macro_PAGESIZE.h
+share/wasi-sysroot/include/%%TRIPLE%%/__mode_t.h
+share/wasi-sysroot/include/%%TRIPLE%%/__seek.h
+share/wasi-sysroot/include/%%TRIPLE%%/__struct_dirent.h
+share/wasi-sysroot/include/%%TRIPLE%%/__struct_in6_addr.h
+share/wasi-sysroot/include/%%TRIPLE%%/__struct_in_addr.h
+share/wasi-sysroot/include/%%TRIPLE%%/__struct_iovec.h
+share/wasi-sysroot/include/%%TRIPLE%%/__struct_msghdr.h
+share/wasi-sysroot/include/%%TRIPLE%%/__struct_pollfd.h
+share/wasi-sysroot/include/%%TRIPLE%%/__struct_rusage.h
+share/wasi-sysroot/include/%%TRIPLE%%/__struct_sockaddr.h
+share/wasi-sysroot/include/%%TRIPLE%%/__struct_sockaddr_in.h
+share/wasi-sysroot/include/%%TRIPLE%%/__struct_sockaddr_in6.h
+share/wasi-sysroot/include/%%TRIPLE%%/__struct_sockaddr_storage.h
+share/wasi-sysroot/include/%%TRIPLE%%/__struct_sockaddr_un.h
+share/wasi-sysroot/include/%%TRIPLE%%/__struct_stat.h
+share/wasi-sysroot/include/%%TRIPLE%%/__struct_timespec.h
+share/wasi-sysroot/include/%%TRIPLE%%/__struct_timeval.h
+share/wasi-sysroot/include/%%TRIPLE%%/__struct_tm.h
+share/wasi-sysroot/include/%%TRIPLE%%/__struct_tms.h
+share/wasi-sysroot/include/%%TRIPLE%%/__typedef_DIR.h
+share/wasi-sysroot/include/%%TRIPLE%%/__typedef_blkcnt_t.h
+share/wasi-sysroot/include/%%TRIPLE%%/__typedef_blksize_t.h
+share/wasi-sysroot/include/%%TRIPLE%%/__typedef_clock_t.h
+share/wasi-sysroot/include/%%TRIPLE%%/__typedef_clockid_t.h
+share/wasi-sysroot/include/%%TRIPLE%%/__typedef_dev_t.h
+share/wasi-sysroot/include/%%TRIPLE%%/__typedef_fd_set.h
+share/wasi-sysroot/include/%%TRIPLE%%/__typedef_gid_t.h
+share/wasi-sysroot/include/%%TRIPLE%%/__typedef_in_addr_t.h
+share/wasi-sysroot/include/%%TRIPLE%%/__typedef_in_port_t.h
+share/wasi-sysroot/include/%%TRIPLE%%/__typedef_ino_t.h
+share/wasi-sysroot/include/%%TRIPLE%%/__typedef_mode_t.h
+share/wasi-sysroot/include/%%TRIPLE%%/__typedef_nfds_t.h
+share/wasi-sysroot/include/%%TRIPLE%%/__typedef_nlink_t.h
+share/wasi-sysroot/include/%%TRIPLE%%/__typedef_off_t.h
+share/wasi-sysroot/include/%%TRIPLE%%/__typedef_sa_family_t.h
+share/wasi-sysroot/include/%%TRIPLE%%/__typedef_sigset_t.h
+share/wasi-sysroot/include/%%TRIPLE%%/__typedef_socklen_t.h
+share/wasi-sysroot/include/%%TRIPLE%%/__typedef_ssize_t.h
+share/wasi-sysroot/include/%%TRIPLE%%/__typedef_suseconds_t.h
+share/wasi-sysroot/include/%%TRIPLE%%/__typedef_time_t.h
+share/wasi-sysroot/include/%%TRIPLE%%/__typedef_uid_t.h
+share/wasi-sysroot/include/%%TRIPLE%%/alloca.h
+share/wasi-sysroot/include/%%TRIPLE%%/ar.h
+share/wasi-sysroot/include/%%TRIPLE%%/arpa/ftp.h
+share/wasi-sysroot/include/%%TRIPLE%%/arpa/inet.h
+share/wasi-sysroot/include/%%TRIPLE%%/arpa/nameser.h
*** 2232 LINES SKIPPED ***