Merge branch 'main' into wasm32-wasip1

.github/workflows/main.yml

@@ -79,7 +79,7 @@ jobs:
       # bump depth (or even better, the submodule), in case of "error:
       # Server does not allow request for unadvertised object" in the
       # future.
-      - run: git submodule update --init --depth 32 --jobs 3
+      - run: git submodule update --init --depth 64 --jobs 3
 
       # Persist ccache-based caches across builds. This directory is configured
       # via the CCACHE_DIR env var below for ccache to use.
@@ -265,7 +265,7 @@ jobs:
           fetch-depth: 0
       - run: git fetch --tags --force
         name: Force-fetch tags to work around actions/checkout#290
-      - run: git submodule update --init --depth 32 --jobs 3
+      - run: git submodule update --init --depth 64 --jobs 3
       - name: Setup `wasmtime` for tests
         uses: bytecodealliance/actions/wasmtime/setup@v1
         with:

ci/build.sh

@@ -47,4 +47,5 @@ if [ "$WASI_SDK_CI_SKIP_TESTS" = "1" ]; then
 fi
 
 # Run tests to ensure that the sysroot works.
-ctest --output-on-failure --parallel 10 --test-dir $build_dir/sysroot/tests
+ctest --output-on-failure --parallel 10 --test-dir $build_dir/sysroot/tests \
+  --timeout 60

cmake/wasi-sdk-sysroot.cmake

@@ -5,6 +5,16 @@ if(NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE RelWithDebInfo)
 endif()
 
+if(NOT CMAKE_C_COMPILER_ID MATCHES Clang)
+  message(FATAL_ERROR "C compiler ${CMAKE_C_COMPILER} is not `Clang`, it is ${CMAKE_C_COMPILER_ID}")
+endif()
+
+set(minimum_clang_required 18.0.0)
+
+if(CMAKE_C_COMPILER_VERSION VERSION_LESS ${minimum_clang_required})
+  message(FATAL_ERROR "compiler version ${CMAKE_C_COMPILER_VERSION} is less than the required version ${minimum_clang_required}")
+endif()
+
 find_program(MAKE make REQUIRED)
 
 option(WASI_SDK_DEBUG_PREFIX_MAP "Pass `-fdebug-prefix-map` for built artifacts" ON)

tests/CMakeLists.txt

@@ -48,6 +48,7 @@ function(add_testcase runwasi test)
       # as well.
       if(NOT(CMAKE_C_COMPILER MATCHES ${target}))
         target_compile_options(${target_name} PRIVATE --target=${target})
+        target_link_options(${target_name} PRIVATE --target=${target})
       endif()
 
       # Apply test-specific compile options and link flags.
@@ -79,6 +80,7 @@ function(add_testcase runwasi test)
       # Apply target-specific options.
       if(target MATCHES threads)
         target_compile_options(${target_name} PRIVATE -pthread)
+        target_link_options(${target_name} PRIVATE -pthread)
       endif()
 
       if(runwasi)

tests/general/sigabrt.c.stderr.expected

@@ -3,4 +3,4 @@ Program received fatal signal: Aborted
 Error: failed to run main module `sigabrt.c.---.wasm`
 
 Caused by:
-    0: failed to invoke command default
+    0: failed to invoke ---

tests/general/sigabrt.c.stderr.expected.filter

@@ -4,4 +4,5 @@ set -euo pipefail
 cat \
     | sed -e 's/main module `.*sigabrt\.c\.wasm`/main module `sigabrt.c.---.wasm`/' \
     | sed -e 's/source location: @[[:xdigit:]]*$/source location: @----/' \
+    | sed -e 's/failed to invoke.*/failed to invoke ---/' \
     | head -n 6