Support wasm64

.github/workflows/main.yml

@@ -118,6 +118,18 @@ jobs:
       shell: bash
       run: make -j4 THREAD_MODEL=posix
 
+    - name: Build wasi64 + libc
+      # Build wasi64
+      if: matrix.clang_version != '10.0.0'
+      shell: bash
+      run: make -j4 BUILD_WASI64=yes
+
+    - name: Build wasi64 + libc + threads
+      # Build wasi64 with thread support
+      if: matrix.clang_version != '10.0.0'
+      shell: bash
+      run: make -j4 BUILD_WASI64=yes THREAD_MODEL=posix
+
   # Disable the headerstest job for now, while WASI transitions from the
   # witx snapshots to wit proposals, and we have a few manual edits to the
   # generated header to make life easier for folks.

Makefile

@@ -22,6 +22,8 @@ BUILD_LIBC_TOP_HALF ?= yes
 # The directory where we will store intermediate artifacts.
 OBJDIR ?= build/$(TARGET_TRIPLE)
 
+BUILD_WASI64 ?= no
+
 # When the length is no larger than this threshold, we consider the
 # overhead of bulk memory opcodes to outweigh the performance benefit,
 # and fall back to the original musl implementation. See
@@ -33,12 +35,20 @@ BULK_MEMORY_THRESHOLD ?= 32
 # make command-line.
 
 # Set the default WASI target triple.
+ifeq (${BUILD_WASI64}, yes)
+TARGET_TRIPLE = wasm64-wasi
+else
 TARGET_TRIPLE = wasm32-wasi
+endif
 
 # Threaded version necessitates a different traget, as objects from different
 # targets can't be mixed together while linking.
 ifeq ($(THREAD_MODEL), posix)
-TARGET_TRIPLE = wasm32-wasi-threads
+    ifeq (${BUILD_WASI64}, yes)
+        TARGET_TRIPLE = wasm64-wasi-threads
+    else
+        TARGET_TRIPLE = wasm32-wasi-threads
+    endif
 endif
 
 BUILTINS_LIB ?= $(shell ${CC} --print-libgcc-file-name)
@@ -197,6 +207,15 @@ LIBC_TOP_HALF_MUSL_SOURCES = \
     $(wildcard $(LIBC_TOP_HALF_MUSL_SRC_DIR)/crypt/*.c)
 
 ifeq ($(THREAD_MODEL), posix)
+
+
+ifeq (${BUILD_WASI64}, yes)
+WASM_THREAD_ASM_FILE = thread/wasm64/wasi_thread_start.s
+else
+WASM_THREAD_ASM_FILE = thread/wasm32/wasi_thread_start.s
+endif
+
+
 LIBC_TOP_HALF_MUSL_SOURCES += \
     $(addprefix $(LIBC_TOP_HALF_MUSL_SRC_DIR)/, \
         env/__init_tls.c \
@@ -277,7 +296,7 @@ LIBC_TOP_HALF_MUSL_SOURCES += \
         thread/sem_timedwait.c \
         thread/sem_trywait.c \
         thread/sem_wait.c \
-        thread/wasm32/wasi_thread_start.s \
+        ${WASM_THREAD_ASM_FILE} \
     )
 endif
 

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 ... BUILD_WASI64=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 ... BUILD_WASI64=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-wasi-threads/predefined-macros.txt

@@ -2956,6 +2956,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))

expected/wasm32-wasi/predefined-macros.txt

@@ -2919,6 +2919,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))