Support wasm64

.github/workflows/main.yml

@@ -143,6 +143,26 @@ jobs:
       # which is required by our malloc implementation.
       if: matrix.os == 'ubuntu-latest' && matrix.clang_version != '10.0.0'
 
+    - name: Build libc + threads
+      # Only build the thread-capable wasi-libc in the latest supported Clang
+      # version; the earliest version does not have all necessary builtins
+      # (e.g., `__builtin_wasm_memory_atomic_notify`).
+      if: matrix.clang_version != '10.0.0'
+      shell: bash
+      run: make -j4 THREAD_MODEL=posix
+
+    - name: Build wasm64 + libc
+      # Build wasm64
+      if: matrix.clang_version != '10.0.0'
+      shell: bash
+      run: make -j4 WASM64=yes
+
+    - name: Build wasm64 + libc + threads
+      # Build wasm64 with thread support
+      if: matrix.clang_version != '10.0.0'
+      shell: bash
+      run: make -j4 WASM64=yes THREAD_MODEL=posix
+
     - uses: actions/[email protected]
       with:
         # Upload the sysroot folder. To avoid action erros, we give it a unique

Makefile

@@ -25,6 +25,8 @@ BUILD_LIBC_TOP_HALF ?= yes
 BUILD_LIBSETJMP ?= yes
 # The directory where we will store intermediate artifacts.
 OBJDIR ?= build/$(TARGET_TRIPLE)
+# 64 bit wasm?
+WASM64 ?= no
 
 # LTO; no, full, or thin
 # Note: thin LTO here is just for experimentation. It has known issues:
@@ -53,19 +55,37 @@ BULK_MEMORY_THRESHOLD ?= 32
 # Variables from this point on are not meant to be overridable via the
 # make command-line.
 
-# Set the default WASI target triple.
-TARGET_TRIPLE = wasm32-wasi
-
 # Threaded version necessitates a different target, as objects from different
 # targets can't be mixed together while linking.
+
 ifeq ($(THREAD_MODEL), posix)
-TARGET_TRIPLE = wasm32-wasi-threads
+THREADS_SUFFIX=-threads
+else
+THREADS_SUFFIX=
 endif
 
-ifeq ($(WASI_SNAPSHOT), p2)
-TARGET_TRIPLE = wasm32-wasip2
+ifeq ($(WASM64), yes)
+WASM_SUFFIX=64
+else
+WASM_SUFFIX=32
+endif
+
+TARGET_TRIPLE = wasm${WASM_SUFFIX}-wasi$(WASI_SNAPSHOT)${THREADS_SUFFIX}
+
+ifeq ($(TARGET_TRIPLE), wasm32-wasi)
+EXPECTED_TARGET_TRIPLE = wasm32-wasip1
+else ifeq ($(TARGET_TRIPLE), wasm32-wasi-threads)
+EXPECTED_TARGET_TRIPLE = wasm32-wasip1-threads
+else ifeq ($(TARGET_TRIPLE), wasm64-wasi)
+EXPECTED_TARGET_TRIPLE = wasm64-wasip1
+else ifeq ($(TARGET_TRIPLE), wasm64-wasi-threads)
+EXPECTED_TARGET_TRIPLE = wasm64-wasip1-threads
+else
+EXPECTED_TARGET_TRIPLE = ${TARGET_TRIPLE}
 endif
 
+EXPECTED_TARGET_DIR = expected/${EXPECTED_TARGET_TRIPLE}
+
 BUILTINS_LIB ?= $(shell ${CC} ${CFLAGS} --print-libgcc-file-name)
 
 # These variables describe the locations of various files and directories in
@@ -371,7 +391,7 @@ LIBC_TOP_HALF_MUSL_SOURCES += \
         thread/sem_timedwait.c \
         thread/sem_trywait.c \
         thread/sem_wait.c \
-        thread/wasm32/wasi_thread_start.s \
+        thread/wasm/wasi_thread_start.S \
     )
 endif
 ifeq ($(THREAD_MODEL), single)
@@ -435,6 +455,7 @@ ifeq ($(THREAD_MODEL), posix)
 # Specify the tls-model until LLVM 15 is released (which should contain
 # https://reviews.llvm.org/D130053).
 CFLAGS += -mthread-model posix -pthread -ftls-model=local-exec
+
 ASMFLAGS += -matomics
 endif
 
@@ -474,7 +495,7 @@ CFLAGS += -isystem "$(SYSROOT_INC)"
 # These variables describe the locations of various files and directories in
 # the build tree.
 objs = $(patsubst %.c,$(OBJDIR)/%.o,$(1))
-asmobjs = $(patsubst %.s,$(OBJDIR)/%.o,$(1))
+asmobjs = $(patsubst %.S,$(OBJDIR)/%.o,$(1))
 DLMALLOC_OBJS = $(call objs,$(DLMALLOC_SOURCES))
 EMMALLOC_OBJS = $(call objs,$(EMMALLOC_SOURCES))
 LIBC_BOTTOM_HALF_ALL_OBJS = $(call objs,$(LIBC_BOTTOM_HALF_ALL_SOURCES))
@@ -759,7 +780,7 @@ $(OBJDIR)/%.o: %.c include_dirs
 	@mkdir -p "$(@D)"
 	$(CC) $(CFLAGS) -MD -MP -o $@ -c $<
 
-$(OBJDIR)/%.o: %.s include_dirs
+$(OBJDIR)/%.o: %.S include_dirs
 	@mkdir -p "$(@D)"
 	$(CC) $(ASMFLAGS) -o $@ -c $<
 
@@ -778,7 +799,7 @@ startup_files $(LIBC_BOTTOM_HALF_ALL_OBJS) $(LIBC_BOTTOM_HALF_ALL_SO_OBJS): CFLA
 $(LIBC_TOP_HALF_ALL_OBJS) $(LIBC_TOP_HALF_ALL_SO_OBJS) $(MUSL_PRINTSCAN_LONG_DOUBLE_OBJS) $(MUSL_PRINTSCAN_LONG_DOUBLE_SO_OBJS) $(MUSL_PRINTSCAN_NO_FLOATING_POINT_OBJS) $(LIBWASI_EMULATED_SIGNAL_MUSL_OBJS) $(LIBWASI_EMULATED_SIGNAL_MUSL_SO_OBJS) $(LIBDL_OBJS) $(LIBDL_SO_OBJS) $(LIBSETJMP_OBJS) $(LIBSETJMP_SO_OBJS): CFLAGS += \
     -I$(LIBC_TOP_HALF_MUSL_SRC_DIR)/include \
     -I$(LIBC_TOP_HALF_MUSL_SRC_DIR)/internal \
-    -I$(LIBC_TOP_HALF_MUSL_DIR)/arch/wasm32 \
+    -I$(LIBC_TOP_HALF_MUSL_DIR)/arch/wasm \
     -I$(LIBC_TOP_HALF_MUSL_DIR)/arch/generic \
     -I$(LIBC_TOP_HALF_HEADERS_PRIVATE) \
     -Wno-parentheses \
@@ -799,7 +820,7 @@ $(LIBWASI_EMULATED_PROCESS_CLOCKS_OBJS) $(LIBWASI_EMULATED_PROCESS_CLOCKS_SO_OBJ
 $(LIBWASI_EMULATED_PTHREAD_OBJS) $(LIBWASI_EMULATED_PTHREAD_SO_OBJS): CFLAGS += \
     -I$(LIBC_TOP_HALF_MUSL_SRC_DIR)/include \
     -I$(LIBC_TOP_HALF_MUSL_SRC_DIR)/internal \
-    -I$(LIBC_TOP_HALF_MUSL_DIR)/arch/wasm32 \
+    -I$(LIBC_TOP_HALF_MUSL_DIR)/arch/wasm \
     -D_WASI_EMULATED_PTHREAD
 
 # emmalloc uses a lot of pointer type-punning, which is UB under strict aliasing,
@@ -817,15 +838,15 @@ include_dirs:
 	# Generate musl's bits/alltypes.h header.
 	mkdir -p "$(SYSROOT_INC)/bits"
 	sed -f $(LIBC_TOP_HALF_MUSL_DIR)/tools/mkalltypes.sed \
-	    $(LIBC_TOP_HALF_MUSL_DIR)/arch/wasm32/bits/alltypes.h.in \
+	    $(LIBC_TOP_HALF_MUSL_DIR)/arch/wasm/bits/alltypes.h.in \
 	    $(LIBC_TOP_HALF_MUSL_DIR)/include/alltypes.h.in \
 	    > "$(SYSROOT_INC)/bits/alltypes.h"
 
 	# Copy in the bulk of musl's public header files.
 	cp -r "$(LIBC_TOP_HALF_MUSL_INC)"/* "$(SYSROOT_INC)"
 	# Copy in the musl's "bits" header files.
 	cp -r "$(LIBC_TOP_HALF_MUSL_DIR)"/arch/generic/bits/* "$(SYSROOT_INC)/bits"
-	cp -r "$(LIBC_TOP_HALF_MUSL_DIR)"/arch/wasm32/bits/* "$(SYSROOT_INC)/bits"
+	cp -r "$(LIBC_TOP_HALF_MUSL_DIR)"/arch/wasm/bits/* "$(SYSROOT_INC)/bits"
 
 	cp "$(MUSL_FTS_SRC_DIR)/fts.h" "$(SYSROOT_INC)/fts.h"
 
@@ -909,17 +930,6 @@ endif
 DEFINED_SYMBOLS = $(SYSROOT_SHARE)/defined-symbols.txt
 UNDEFINED_SYMBOLS = $(SYSROOT_SHARE)/undefined-symbols.txt
 
-ifeq ($(WASI_SNAPSHOT),p2)
-EXPECTED_TARGET_DIR = expected/wasm32-wasip2
-else
-ifeq ($(THREAD_MODEL),posix)
-EXPECTED_TARGET_DIR = expected/wasm32-wasip1-threads
-else
-EXPECTED_TARGET_DIR = expected/wasm32-wasip1
-endif
-endif
-
-
 check-symbols: startup_files libc
 	#
 	# Collect metadata on the sysroot and perform sanity checks.

README.md

@@ -53,6 +53,18 @@ build directions with one addition: `make ... THREAD_MODEL=posix`. This creates
 additional artifacts in `sysroot/lib/wasm32-wasi-threads` to support `--target
 wasm32-wasi-threads`.
 
+## 64 bits support
+
+To enable 64 bits support, follow the above
+build directions with one addition: `make ... WASM64=yes`. This creates
+artifacts in `sysroot/lib/wasm64-wasi` to support `--target
+wasm64-wasi`.
+
+You can build 64 bits with pthread support together with
+'make ... WASM64=yes THREAD_MODEL=posix'. This creates
+artifacts in `sysroot/lib/wasm64-wasi-threads` to support `--target
+wasm64-wasi-threads`.
+
 ## Arch Linux AUR package
 
 For Arch Linux users, there's an official [wasi-libc] package tracking this Git

expected/wasm32-wasip1-threads/predefined-macros.txt

@@ -3011,6 +3011,7 @@
 #define __WASI_FSTFLAGS_MTIM ((__wasi_fstflags_t)(1 << 2))
 #define __WASI_FSTFLAGS_MTIM_NOW ((__wasi_fstflags_t)(1 << 3))
 #define __WASI_LOOKUPFLAGS_SYMLINK_FOLLOW ((__wasi_lookupflags_t)(1 << 0))
+#define __WASI_NOEXCEPT 
 #define __WASI_OFLAGS_CREAT ((__wasi_oflags_t)(1 << 0))
 #define __WASI_OFLAGS_DIRECTORY ((__wasi_oflags_t)(1 << 1))
 #define __WASI_OFLAGS_EXCL ((__wasi_oflags_t)(1 << 2))
@@ -3088,7 +3089,7 @@
 #define __tg_real_remquo(x,y,z) (__RETCAST_2(x, y)( __FLT(x) && __FLT(y) ? remquof(x, y, z) : __LDBL((x)+(y)) ? remquol(x, y, z) : remquo(x, y, z) ))
 #define __tm_gmtoff tm_gmtoff
 #define __tm_zone tm_zone
-#define __va_copy(d,s) __builtin_va_copy(d,s)
+#define __va_copy(d,s) __builtin_va_copy(d, s)
 #define __wasi__ 1
 #define __wasi_api_h 
 #define __wasi_libc_environ_h 

expected/wasm32-wasip1/predefined-macros.txt

@@ -2419,6 +2419,7 @@
 #define _UTIME_H 
 #define _VALUES_H 
 #define _VA_LIST 
+#define _WASI_EMULATED_PTHREAD 
 #define _WCHAR_H 
 #define _WCHAR_T 
 #define _WCTYPE_H 
@@ -3004,6 +3005,7 @@
 #define __WASI_FSTFLAGS_MTIM ((__wasi_fstflags_t)(1 << 2))
 #define __WASI_FSTFLAGS_MTIM_NOW ((__wasi_fstflags_t)(1 << 3))
 #define __WASI_LOOKUPFLAGS_SYMLINK_FOLLOW ((__wasi_lookupflags_t)(1 << 0))
+#define __WASI_NOEXCEPT 
 #define __WASI_OFLAGS_CREAT ((__wasi_oflags_t)(1 << 0))
 #define __WASI_OFLAGS_DIRECTORY ((__wasi_oflags_t)(1 << 1))
 #define __WASI_OFLAGS_EXCL ((__wasi_oflags_t)(1 << 2))
@@ -3389,12 +3391,7 @@
 #define preadv64 preadv
 #define pthread_cleanup_pop(r) _pthread_cleanup_pop(&__cb, (r)); } while(0)
 #define pthread_cleanup_push(f,x) do { struct __ptcb __cb; _pthread_cleanup_push(&__cb, f, x);
-#define pthread_create(...) ({ _Static_assert(0, "This mode of WASI does not have threads enabled; to enable stub functions which always fail, compile with -D_WASI_EMULATED_PTHREAD and link with -lwasi-emulated-pthread"); 0;})
-#define pthread_detach(...) ({ _Static_assert(0, "This mode of WASI does not have threads enabled; to enable stub functions which always fail, compile with -D_WASI_EMULATED_PTHREAD and link with -lwasi-emulated-pthread"); 0;})
 #define pthread_equal(x,y) ((x)==(y))
-#define pthread_join(...) ({ _Static_assert(0, "This mode of WASI does not have threads enabled; to enable stub functions which always fail, compile with -D_WASI_EMULATED_PTHREAD and link with -lwasi-emulated-pthread"); 0;})
-#define pthread_timedjoin_np(...) ({ _Static_assert(0, "This mode of WASI does not have threads enabled; to enable stub functions which always fail, compile with -D_WASI_EMULATED_PTHREAD and link with -lwasi-emulated-pthread"); 0;})
-#define pthread_tryjoin_np(...) ({ _Static_assert(0, "This mode of WASI does not have threads enabled; to enable stub functions which always fail, compile with -D_WASI_EMULATED_PTHREAD and link with -lwasi-emulated-pthread"); 0;})
 #define pwrite64 pwrite
 #define pwritev64 pwritev
 #define readdir64 readdir

expected/wasm32-wasip2/predefined-macros.txt

@@ -2570,6 +2570,7 @@
 #define _UTIME_H 
 #define _VALUES_H 
 #define _VA_LIST 
+#define _WASI_EMULATED_PTHREAD 
 #define _WCHAR_H 
 #define _WCHAR_T 
 #define _WCTYPE_H 
@@ -3156,6 +3157,7 @@
 #define __WASI_FSTFLAGS_MTIM ((__wasi_fstflags_t)(1 << 2))
 #define __WASI_FSTFLAGS_MTIM_NOW ((__wasi_fstflags_t)(1 << 3))
 #define __WASI_LOOKUPFLAGS_SYMLINK_FOLLOW ((__wasi_lookupflags_t)(1 << 0))
+#define __WASI_NOEXCEPT 
 #define __WASI_OFLAGS_CREAT ((__wasi_oflags_t)(1 << 0))
 #define __WASI_OFLAGS_DIRECTORY ((__wasi_oflags_t)(1 << 1))
 #define __WASI_OFLAGS_EXCL ((__wasi_oflags_t)(1 << 2))
@@ -3544,12 +3546,7 @@
 #define preadv64 preadv
 #define pthread_cleanup_pop(r) _pthread_cleanup_pop(&__cb, (r)); } while(0)
 #define pthread_cleanup_push(f,x) do { struct __ptcb __cb; _pthread_cleanup_push(&__cb, f, x);
-#define pthread_create(...) ({ _Static_assert(0, "This mode of WASI does not have threads enabled; to enable stub functions which always fail, compile with -D_WASI_EMULATED_PTHREAD and link with -lwasi-emulated-pthread"); 0;})
-#define pthread_detach(...) ({ _Static_assert(0, "This mode of WASI does not have threads enabled; to enable stub functions which always fail, compile with -D_WASI_EMULATED_PTHREAD and link with -lwasi-emulated-pthread"); 0;})
 #define pthread_equal(x,y) ((x)==(y))
-#define pthread_join(...) ({ _Static_assert(0, "This mode of WASI does not have threads enabled; to enable stub functions which always fail, compile with -D_WASI_EMULATED_PTHREAD and link with -lwasi-emulated-pthread"); 0;})
-#define pthread_timedjoin_np(...) ({ _Static_assert(0, "This mode of WASI does not have threads enabled; to enable stub functions which always fail, compile with -D_WASI_EMULATED_PTHREAD and link with -lwasi-emulated-pthread"); 0;})
-#define pthread_tryjoin_np(...) ({ _Static_assert(0, "This mode of WASI does not have threads enabled; to enable stub functions which always fail, compile with -D_WASI_EMULATED_PTHREAD and link with -lwasi-emulated-pthread"); 0;})
 #define pwrite64 pwrite
 #define pwritev64 pwritev
 #define readdir64 readdir