add `wasm32-wasi-preview2` target (#457)

Currently, this is identical to the `wasm32-wasi` in all but name.  See #449 for
the next step, which is to incrementally add Preview 2 features,
e.g. `wasi-sockets`.  Per the discussion in that PR, I've split the
`wasi-sysroot/include` directory into per-target directories.  Eventually, we'll
want to build a separate sysroot for each target, but there's currently
uncertainty about how to configure the default sysroot for e.g. clang, so we're
not tackling that yet.

See also #447 for further details.

Signed-off-by: Joel Dice <joel.dice@fermyon.com>

.github/workflows/main.yml

@@ -84,7 +84,9 @@ jobs:
 
     - name: Build libc
       shell: bash
-      run: make -j4
+      run: |
+        make -j4
+        WASI_SNAPSHOT=preview2 make -j4
 
     - name: Test
       shell: bash
@@ -98,6 +100,8 @@ jobs:
         mkdir -p $WASI_DIR
         cp download/lib/wasi/libclang_rt.builtins-wasm32.a $WASI_DIR
         make test
+        rm -r build
+        WASI_SNAPSHOT=preview2 make test
       # The older version of Clang does not provide the expected symbol for the
       # test entrypoints: `undefined symbol: __main_argc_argv`.
       # The older (<15.0.7) version of wasm-ld does not provide `__heap_end`,

Makefile

@@ -15,6 +15,8 @@ SYSROOT ?= $(CURDIR)/sysroot
 INSTALL_DIR ?= /usr/local
 # single or posix; note that pthread support is still a work-in-progress.
 THREAD_MODEL ?= single
+# preview1 or preview2; the latter is not (yet) compatible with multithreading
+WASI_SNAPSHOT ?= preview1
 # dlmalloc or none
 MALLOC_IMPL ?= dlmalloc
 # yes or no
@@ -41,6 +43,10 @@ ifeq ($(THREAD_MODEL), posix)
 TARGET_TRIPLE = wasm32-wasi-threads
 endif
 
+ifeq ($(WASI_SNAPSHOT), preview2)
+TARGET_TRIPLE = wasm32-wasi-preview2
+endif
+
 BUILTINS_LIB ?= $(shell ${CC} --print-libgcc-file-name)
 
 # These variables describe the locations of various files and directories in
@@ -386,7 +392,7 @@ LIBC_BOTTOM_HALF_CRT_OBJS = $(call objs,$(LIBC_BOTTOM_HALF_CRT_SOURCES))
 # These variables describe the locations of various files and
 # directories in the generated sysroot tree.
 SYSROOT_LIB := $(SYSROOT)/lib/$(TARGET_TRIPLE)
-SYSROOT_INC = $(SYSROOT)/include
+SYSROOT_INC = $(SYSROOT)/include/$(TARGET_TRIPLE)
 SYSROOT_SHARE = $(SYSROOT)/share/$(TARGET_TRIPLE)
 
 # Files from musl's include directory that we don't want to install in the
@@ -511,7 +517,7 @@ PIC_OBJS = \
 # to CC.  This is a workaround for a Windows command line size limitation.  See
 # the `%.a` rule below for details.
 $(SYSROOT_LIB)/%.so: $(OBJDIR)/%.so.a $(BUILTINS_LIB)
-	$(CC) -nodefaultlibs -shared --sysroot=$(SYSROOT) \
+	$(CC) --target=$(TARGET_TRIPLE) -nodefaultlibs -shared --sysroot=$(SYSROOT) \
 	-o $@ -Wl,--whole-archive $< -Wl,--no-whole-archive $(BUILTINS_LIB)
 
 $(OBJDIR)/libc.so.a: $(LIBC_SO_OBJS) $(MUSL_PRINTSCAN_LONG_DOUBLE_SO_OBJS)

expected/wasm32-wasi-preview2/include-all.c

@@ -0,0 +1,171 @@
+#include <__errno.h>
+#include <__errno_values.h>
+#include <__fd_set.h>
+#include <__function___isatty.h>
+#include <__functions_malloc.h>
+#include <__functions_memcpy.h>
+#include <__header_dirent.h>
+#include <__header_fcntl.h>
+#include <__header_inttypes.h>
+#include <__header_netinet_in.h>
+#include <__header_poll.h>
+#include <__header_stdlib.h>
+#include <__header_string.h>
+#include <__header_sys_ioctl.h>
+#include <__header_sys_resource.h>
+#include <__header_sys_socket.h>
+#include <__header_sys_stat.h>
+#include <__header_time.h>
+#include <__header_unistd.h>
+#include <__macro_FD_SETSIZE.h>
+#include <__macro_PAGESIZE.h>
+#include <__mode_t.h>
+#include <__seek.h>
+#include <__struct_dirent.h>
+#include <__struct_in6_addr.h>
+#include <__struct_in_addr.h>
+#include <__struct_iovec.h>
+#include <__struct_msghdr.h>
+#include <__struct_pollfd.h>
+#include <__struct_rusage.h>
+#include <__struct_sockaddr.h>
+#include <__struct_sockaddr_in.h>
+#include <__struct_sockaddr_in6.h>
+#include <__struct_sockaddr_storage.h>
+#include <__struct_sockaddr_un.h>
+#include <__struct_stat.h>
+#include <__struct_timespec.h>
+#include <__struct_timeval.h>
+#include <__struct_tm.h>
+#include <__struct_tms.h>
+#include <__typedef_DIR.h>
+#include <__typedef_blkcnt_t.h>
+#include <__typedef_blksize_t.h>
+#include <__typedef_clock_t.h>
+#include <__typedef_clockid_t.h>
+#include <__typedef_dev_t.h>
+#include <__typedef_fd_set.h>
+#include <__typedef_gid_t.h>
+#include <__typedef_in_addr_t.h>
+#include <__typedef_in_port_t.h>
+#include <__typedef_ino_t.h>
+#include <__typedef_mode_t.h>
+#include <__typedef_nfds_t.h>
+#include <__typedef_nlink_t.h>
+#include <__typedef_off_t.h>
+#include <__typedef_sa_family_t.h>
+#include <__typedef_sigset_t.h>
+#include <__typedef_socklen_t.h>
+#include <__typedef_ssize_t.h>
+#include <__typedef_suseconds_t.h>
+#include <__typedef_time_t.h>
+#include <__typedef_uid_t.h>
+#include <alloca.h>
+#include <ar.h>
+#include <arpa/ftp.h>
+#include <arpa/inet.h>
+#include <arpa/nameser.h>
+#include <arpa/nameser_compat.h>
+#include <arpa/telnet.h>
+#include <arpa/tftp.h>
+#include <assert.h>
+#include <byteswap.h>
+#include <complex.h>
+#include <cpio.h>
+#include <crypt.h>
+#include <ctype.h>
+#include <dirent.h>
+#include <dlfcn.h>
+#include <endian.h>
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <features.h>
+#include <fenv.h>
+#include <float.h>
+#include <fmtmsg.h>
+#include <fnmatch.h>
+#include <ftw.h>
+#include <getopt.h>
+#include <glob.h>
+#include <iconv.h>
+#include <ifaddrs.h>
+#include <inttypes.h>
+#include <iso646.h>
+#include <langinfo.h>
+#include <libgen.h>
+#include <limits.h>
+#include <locale.h>
+#include <malloc.h>
+#include <math.h>
+#include <memory.h>
+#include <monetary.h>
+#include <mqueue.h>
+#include <netinet/icmp6.h>
+#include <netinet/igmp.h>
+#include <netinet/in.h>
+#include <netinet/in_systm.h>
+#include <netinet/ip.h>
+#include <netinet/ip6.h>
+#include <netinet/ip_icmp.h>
+#include <netinet/tcp.h>
+#include <netinet/udp.h>
+#include <netpacket/packet.h>
+#include <nl_types.h>
+#include <poll.h>
+#include <regex.h>
+#include <sched.h>
+#include <search.h>
+#include <semaphore.h>
+#include <stdalign.h>
+#include <stdbool.h>
+#include <stdc-predef.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdio_ext.h>
+#include <stdlib.h>
+#include <stdnoreturn.h>
+#include <string.h>
+#include <strings.h>
+#include <stropts.h>
+#include <sys/dir.h>
+#include <sys/errno.h>
+#include <sys/eventfd.h>
+#include <sys/fcntl.h>
+#include <sys/file.h>
+#include <sys/ioctl.h>
+#include <sys/param.h>
+#include <sys/poll.h>
+#include <sys/random.h>
+#include <sys/reg.h>
+#include <sys/select.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/stropts.h>
+#include <sys/syscall.h>
+#include <sys/sysinfo.h>
+#include <sys/time.h>
+#include <sys/timeb.h>
+#include <sys/timex.h>
+#include <sys/ttydefaults.h>
+#include <sys/types.h>
+#include <sys/uio.h>
+#include <sys/un.h>
+#include <sys/utsname.h>
+#include <syscall.h>
+#include <sysexits.h>
+#include <tar.h>
+#include <tgmath.h>
+#include <threads.h>
+#include <time.h>
+#include <uchar.h>
+#include <unistd.h>
+#include <utime.h>
+#include <values.h>
+#include <wasi/api.h>
+#include <wasi/libc-environ.h>
+#include <wasi/libc-find-relpath.h>
+#include <wasi/libc-nocwd.h>
+#include <wasi/libc.h>
+#include <wchar.h>
+#include <wctype.h>

expected/wasm32-wasi-preview2/undefined-symbols.txt

@@ -0,0 +1,68 @@
+__addtf3
+__divtf3
+__eqtf2
+__extenddftf2
+__extendsftf2
+__fixtfdi
+__fixtfsi
+__fixunstfsi
+__floatsitf
+__floatunsitf
+__getf2
+__gttf2
+__heap_base
+__heap_end
+__imported_wasi_snapshot_preview1_args_get
+__imported_wasi_snapshot_preview1_args_sizes_get
+__imported_wasi_snapshot_preview1_clock_res_get
+__imported_wasi_snapshot_preview1_clock_time_get
+__imported_wasi_snapshot_preview1_environ_get
+__imported_wasi_snapshot_preview1_environ_sizes_get
+__imported_wasi_snapshot_preview1_fd_advise
+__imported_wasi_snapshot_preview1_fd_allocate
+__imported_wasi_snapshot_preview1_fd_close
+__imported_wasi_snapshot_preview1_fd_datasync
+__imported_wasi_snapshot_preview1_fd_fdstat_get
+__imported_wasi_snapshot_preview1_fd_fdstat_set_flags
+__imported_wasi_snapshot_preview1_fd_fdstat_set_rights
+__imported_wasi_snapshot_preview1_fd_filestat_get
+__imported_wasi_snapshot_preview1_fd_filestat_set_size
+__imported_wasi_snapshot_preview1_fd_filestat_set_times
+__imported_wasi_snapshot_preview1_fd_pread
+__imported_wasi_snapshot_preview1_fd_prestat_dir_name
+__imported_wasi_snapshot_preview1_fd_prestat_get
+__imported_wasi_snapshot_preview1_fd_pwrite
+__imported_wasi_snapshot_preview1_fd_read
+__imported_wasi_snapshot_preview1_fd_readdir
+__imported_wasi_snapshot_preview1_fd_renumber
+__imported_wasi_snapshot_preview1_fd_seek
+__imported_wasi_snapshot_preview1_fd_sync
+__imported_wasi_snapshot_preview1_fd_tell
+__imported_wasi_snapshot_preview1_fd_write
+__imported_wasi_snapshot_preview1_path_create_directory
+__imported_wasi_snapshot_preview1_path_filestat_get
+__imported_wasi_snapshot_preview1_path_filestat_set_times
+__imported_wasi_snapshot_preview1_path_link
+__imported_wasi_snapshot_preview1_path_open
+__imported_wasi_snapshot_preview1_path_readlink
+__imported_wasi_snapshot_preview1_path_remove_directory
+__imported_wasi_snapshot_preview1_path_rename
+__imported_wasi_snapshot_preview1_path_symlink
+__imported_wasi_snapshot_preview1_path_unlink_file
+__imported_wasi_snapshot_preview1_poll_oneoff
+__imported_wasi_snapshot_preview1_proc_exit
+__imported_wasi_snapshot_preview1_random_get
+__imported_wasi_snapshot_preview1_sched_yield
+__imported_wasi_snapshot_preview1_sock_accept
+__imported_wasi_snapshot_preview1_sock_recv
+__imported_wasi_snapshot_preview1_sock_send
+__imported_wasi_snapshot_preview1_sock_shutdown
+__letf2
+__lttf2
+__netf2
+__stack_pointer
+__subtf3
+__trunctfdf2
+__trunctfsf2
+__unordtf2
+__wasm_call_ctors

test/Makefile

@@ -16,16 +16,28 @@ test: run
 OBJDIR ?= $(CURDIR)/build
 DOWNDIR ?= $(CURDIR)/download
 
+# preview1 or preview2
+WASI_SNAPSHOT ?= preview1
+
 ##### DOWNLOAD #################################################################
 
 LIBC_TEST_URL ?= https://github.com/bytecodealliance/libc-test
 LIBC_TEST = $(DOWNDIR)/libc-test
 LIBRT_URL ?= https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-16/libclang_rt.builtins-wasm32-wasi-16.0.tar.gz
 LIBRT = $(DOWNDIR)/lib/wasi/libclang_rt.builtins-wasm32.a
-WASMTIME_URL ?= https://github.com/bytecodealliance/wasmtime/releases/download/v3.0.0/wasmtime-v3.0.0-x86_64-linux.tar.xz
+WASMTIME_URL ?= https://github.com/bytecodealliance/wasmtime/releases/download/v16.0.0/wasmtime-v16.0.0-x86_64-linux.tar.xz
 WASMTIME = $(DOWNDIR)/$(shell basename $(WASMTIME_URL) .tar.xz)/wasmtime
+WASM_TOOLS_URL ?= https://github.com/bytecodealliance/wasm-tools/releases/download/wasm-tools-1.0.54/wasm-tools-1.0.54-x86_64-linux.tar.gz
+WASM_TOOLS = $(DOWNDIR)/$(shell basename $(WASM_TOOLS_URL) .tar.gz)/wasm-tools
+ADAPTER_URL ?= https://github.com/bytecodealliance/wasmtime/releases/download/v16.0.0/wasi_snapshot_preview1.command.wasm
+ADAPTER = $(DOWNDIR)/wasi_snapshot_preview1.command.wasm
+
+TO_DOWNLOAD = $(LIBC_TEST) $(LIBRT) $(WASMTIME)
+ifeq ($(WASI_SNAPSHOT), preview2)
+TO_DOWNLOAD += $(ADAPTER) $(WASM_TOOLS)
+endif
 
-download: $(LIBC_TEST) $(LIBRT) $(WASMTIME)
+download: $(TO_DOWNLOAD)
 
 $(DOWNDIR):
 	mkdir -p download
@@ -42,6 +54,13 @@ $(WASMTIME): | $(DOWNDIR)
 	wget --no-clobber --directory-prefix=$(DOWNDIR) $(WASMTIME_URL)
 	tar --extract --file=$(DOWNDIR)/$(shell basename $(WASMTIME_URL)) --directory=$(DOWNDIR)/
 
+$(WASM_TOOLS): | $(DOWNDIR)
+	wget --no-clobber --directory-prefix=$(DOWNDIR) $(WASM_TOOLS_URL)
+	tar --extract --file=$(DOWNDIR)/$(shell basename $(WASM_TOOLS_URL)) --directory=$(DOWNDIR)/
+
+$(ADAPTER): | $(DOWNDIR)
+	wget --no-clobber --directory-prefix=$(DOWNDIR) $(ADAPTER_URL)
+
 clean::
 	rm -rf download
 
@@ -110,13 +129,18 @@ WASM_OBJS += $(INFRA_WASM_OBJS)
 DIRS := $(patsubst $(OBJDIR)/%/,%,$(sort $(dir $(WASM_OBJS))))
 OBJDIRS := $(DIRS:%=$(OBJDIR)/%)
 
+TARGET_TRIPLE = wasm32-wasi
+ifeq ($(WASI_SNAPSHOT), preview2)
+TARGET_TRIPLE = wasm32-wasi-preview2
+endif
+
 # Allow $(CC) to be set from the command line; ?= doesn't work for CC because
 # make has a default value for it.
 ifeq ($(origin CC), default)
 CC := clang
 endif
 LDFLAGS ?=
-CFLAGS ?= --target=wasm32-wasi --sysroot=../sysroot
+CFLAGS ?= --target=$(TARGET_TRIPLE) --sysroot=../sysroot
 # Always include the `libc-test` infrastructure headers.
 CFLAGS += -I$(LIBC_TEST)/src/common
 
@@ -130,6 +154,9 @@ build: download $(WASMS)
 $(WASMS): | $(OBJDIRS)
 $(OBJDIR)/%.wasm: $(OBJDIR)/%.wasm.o $(INFRA_WASM_OBJS)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+ifeq ($(WASI_SNAPSHOT), preview2)
+	$(WASM_TOOLS) component new --adapt $(ADAPTER) $@ -o $@
+endif
 
 $(WASM_OBJS): $(LIBC_TEST)/src/common/test.h | $(OBJDIRS)
 $(OBJDIR)/%.wasm.o: $(LIBC_TEST)/src/%.c
@@ -144,6 +171,9 @@ clean::
 ##### RUN ######################################################################
 
 ENGINE ?= $(WASMTIME) run
+ifeq ($(WASI_SNAPSHOT), preview2)
+ENGINE += --wasm component-model
+endif
 ERRS:=$(WASMS:%.wasm=%.wasm.err)
 
 # Use the provided Wasm engine to execute each test, emitting its output into