Added support for wasm32-wasi target

Author: OtaK

.github/workflows/main.yml

@@ -59,9 +59,9 @@ jobs:
         - target: x86_64-pc-windows-gnu
           rust: stable
           os: ubuntu-latest
-        # - target: asmjs-unknown-emscripten
-        #   rust: stable
-        #   os: ubuntu-latest
+        - target: wasm32-wasi
+          rust: stable
+          os: ubuntu-latest
         - target: i686-pc-windows-msvc
           rust: stable-i686-msvc
           os: windows-2016
@@ -88,6 +88,9 @@ jobs:
     - name: Install Rust (rustup)
       run: rustup update ${{ matrix.rust }} --no-self-update && rustup default ${{ matrix.rust }}
     - run: rustup target add ${{ matrix.target }}
+    - name: Install Cargo-Wasi
+      if: matrix.target == 'wasm32-wasi'
+      run: cargo install cargo-wasi
     - name: Set crt-static
       if: matrix.crt_static == 'yes'
       run: echo RUSTFLAGS=-Ctarget-feature=+crt-static >> $GITHUB_ENV

ci/docker/asmjs-unknown-emscripten/Dockerfile

@@ -0,0 +1,28 @@
+FROM ubuntu:18.04
+
+RUN apt-get update -y && apt-get install -y --no-install-recommends \
+  ca-certificates \
+  curl wget \
+  make \
+  perl \
+  gcc \
+  xz-utils \
+  libc6-dev
+
+# cargo-wasi setup (cargo-wasi depends on wasmtime to be present)
+RUN curl https://wasmtime.dev/install.sh -sSf | bash
+ENV PATH="$PATH:/root/.wasmtime/bin"
+
+# Install WASI-SDK
+ENV WASI_VERSION=14
+ENV WASI_VERSION_FULL=${WASI_VERSION}.0
+RUN wget https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_VERSION}/wasi-sdk-${WASI_VERSION_FULL}-linux.tar.gz
+RUN tar xvf wasi-sdk-${WASI_VERSION_FULL}-linux.tar.gz -C /root
+
+# WASI env setup
+ENV WASI_SDK_PATH=/root/wasi-sdk-${WASI_VERSION_FULL}
+ENV CC_wasm32-wasi="${WASI_SDK_PATH}/bin/clang --sysroot=${WASI_SDK_PATH}/share/wasi-sysroot"
+ENV CARGO_TARGET_WASM32_WASI_LINKER="${WASI_SDK_PATH}/bin/clang"
+
+ENV RUSTFLAGS=-Ctarget-feature=-crt-static
+

ci/docker/wasm32-wasi/Dockerfile

@@ -22,5 +22,5 @@ docker run \
   --env CARGO_HOME=/cargo \
   --workdir /usr/code \
   openssl-src-ci \
-  bash -c "PATH=\$PATH:/rust/bin ci/run.sh $target"
+  bash -c "PATH=\"\$PATH:/rust/bin:/cargo/bin\" ci/run.sh $target"
 

ci/run-docker.sh

@@ -2,17 +2,21 @@
 
 target=$1
 testcrate_dir="$(pwd)/testcrate"
+
+cargo=$([ $target = "wasm32-wasi" ] && echo "cargo wasi" || echo "cargo")
+target_arg=$([ $target = "wasm32-wasi" ] && echo "" || echo "--target $target")
+
 set -ex
 
 if [ "$1" = "aarch64-apple-darwin" ] ; then
   export CARGO_TARGET_AARCH64_APPLE_DARWIN_RUNNER=echo
 fi
 
-cargo test --manifest-path "$testcrate_dir/Cargo.toml" --target $1 -vv
-cargo test --manifest-path "$testcrate_dir/Cargo.toml" --target $1 -vv --release
+$cargo test --manifest-path "$testcrate_dir/Cargo.toml" $target_arg -vvv
+$cargo test --manifest-path "$testcrate_dir/Cargo.toml" $target_arg -vvv --release
 
 if [ "$1" = "x86_64-unknown-linux-gnu" ] ; then
-  cargo test --manifest-path "$testcrate_dir/Cargo.toml" --target $1 -vv --all-features
+  cargo test --manifest-path "$testcrate_dir/Cargo.toml" --target $1 -vvv --all-features
 
   # Run a few tests here:
   #

ci/run.sh

@@ -428,6 +428,42 @@ impl Build {
                 configure.arg("-D__STDC_NO_ATOMICS__");
             }
 
+            if target.contains("wasi") {
+                configure.args([
+                    // Termios isn't available whatsoever on WASM/WASI so we disable that
+                    // fatal error: 'termios.h' file not found
+                    "no-ui-console",
+                    // WASI doesn't support UNIX sockets so we preemptively disable it
+                    "no-sock",
+                    // WASI doesn't have a concept of syslog, so we disable it
+                    // fatal error: 'syslog.h' file not found
+                    "-DNO_SYSLOG",
+                    // WASI doesn't support (p)threads. Disabling preemptively.
+                    "no-threads",
+                    // WASI/WASM aren't really friends with ASM, so we disable it as well.
+                    "no-asm",
+                    // Disables the AFALG engine (AFALG-ENGine)
+                    // Since AFALG depends on `AF_ALG` support on the linux kernel side
+                    // it makes sense that we can't use it.
+                    "no-afalgeng",
+                    "-DOPENSSL_NO_AFALGENG=1",
+                    // wasm lacks signal support; to enable minimal signal emulation, compile with
+                    // -D_WASI_EMULATED_SIGNAL and link with -lwasi-emulated-signal
+                    "-D_WASI_EMULATED_SIGNAL",
+                    // WASI lacks process-associated clocks; to enable emulation of the `times` function using the wall
+                    // clock, which isn't sensitive to whether the program is running or suspended, compile with
+                    // -D_WASI_EMULATED_PROCESS_CLOCKS and link with -lwasi-emulated-process-clocks
+                    "-D_WASI_EMULATED_PROCESS_CLOCKS",
+                    // WASI lacks a true mmap; to enable minimal mmap emulation, compile
+                    // with -D_WASI_EMULATED_MMAN and link with -lwasi-emulated-mman
+                    "-D_WASI_EMULATED_MMAN",
+                    // WASI lacks process identifiers; to enable emulation of the `getpid` function using a
+                    // placeholder value, which doesn't reflect the host PID of the program, compile with
+                    // -D_WASI_EMULATED_GETPID and link with -lwasi-emulated-getpid
+                    "-D_WASI_EMULATED_GETPID",
+                ]);
+            }
+
             if target.contains("musl") {
                 // Hack around openssl/openssl#7207 for now
                 configure.arg("-DOPENSSL_NO_SECURE_MEMORY");
@@ -578,6 +614,11 @@ impl Artifacts {
         println!("cargo:lib={}", self.lib_dir.display());
         if self.target.contains("msvc") {
             println!("cargo:rustc-link-lib=user32");
+        } else if self.target == "wasm32-wasi" {
+            println!("cargo:rustc-link-lib=wasi-emulated-signal");
+            println!("cargo:rustc-link-lib=wasi-emulated-process-clocks");
+            println!("cargo:rustc-link-lib=wasi-emulated-mman");
+            println!("cargo:rustc-link-lib=wasi-emulated-getpid");
         }
     }
 }