Merging upstream version 1.71.1+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 45 insertions, 2 deletions

diff --git a/library/stdarch/ci/build-std-detect.sh b/library/stdarch/ci/build-std-detect.sh
new file mode 100755
index 000000000..e4560b337
--- /dev/null
+++ b/library/stdarch/ci/build-std-detect.sh
@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+
+# Build std_detect on non-Linux & non-x86 targets.
+#
+# In std_detect, non-x86 targets have OS-specific implementations,
+# but we can test only Linux in CI. This script builds targets supported
+# by std_detect but cannot be tested in CI.
+
+set -ex
+cd "$(dirname "$0")"/..
+
+targets=(
+    # Android
+    aarch64-linux-android
+    arm-linux-androideabi
+
+    # FreeBSD
+    aarch64-unknown-freebsd
+    armv6-unknown-freebsd
+    powerpc-unknown-freebsd
+    powerpc64-unknown-freebsd
+
+    # OpenBSD
+    aarch64-unknown-openbsd
+
+    # Windows
+    aarch64-pc-windows-msvc
+)
+
+rustup component add rust-src # for -Z build-std
+
+cd crates/std_detect
+for target in "${targets[@]}"; do
+    if rustup target add "${target}" &>/dev/null; then
+        cargo build --target "${target}"
+    else
+        # tier 3 targets requires -Z build-std.
+        cargo build -Z build-std="core,alloc" --target "${target}"
+    fi
+done
diff --git a/library/stdarch/ci/docker/wasm32-wasi/Dockerfile b/library/stdarch/ci/docker/wasm32-wasi/Dockerfile
index fff41a0eb..5be645507 100644
--- a/library/stdarch/ci/docker/wasm32-wasi/Dockerfile
+++ b/library/stdarch/ci/docker/wasm32-wasi/Dockerfile
@@ -7,8 +7,8 @@ RUN apt-get update -y && apt-get install -y --no-install-recommends \
   xz-utils \
   clang
 
-RUN curl -L https://github.com/bytecodealliance/wasmtime/releases/download/dev/wasmtime-dev-x86_64-linux.tar.xz | tar xJf -
-ENV PATH=$PATH:/wasmtime-dev-x86_64-linux
+RUN curl -L https://github.com/bytecodealliance/wasmtime/releases/download/v8.0.0/wasmtime-v8.0.0-x86_64-linux.tar.xz | tar xJf -
+ENV PATH=$PATH:/wasmtime-v8.0.0-x86_64-linux
 
 ENV CARGO_TARGET_WASM32_WASI_RUNNER="wasmtime \
   --wasm-features=threads,relaxed-simd \
diff --git a/library/stdarch/ci/run.sh b/library/stdarch/ci/run.sh
index 54145a0e7..4bb68069c 100755
--- a/library/stdarch/ci/run.sh
+++ b/library/stdarch/ci/run.sh
@@ -73,6 +73,9 @@ cargo_test() {
         wasm32*)
             cmd="$cmd --nocapture"
             ;;
+        # qemu has an erratic behavior on those tests
+        powerpc64*)
+            cmd="$cmd --skip test_vec_lde_u16 --skip test_vec_lde_u32 --skip test_vec_expte"
     esac
 
     if [ "$SKIP_TESTS" != "" ]; then