From e9e0526cf8a1240ee3d53acd7faff0c9bb358d5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= Date: Sat, 18 Oct 2025 17:11:44 +0200 Subject: [PATCH 1/2] ci: switch to patched QEMU 10.1.1.1 https://github.com/ziglang/qemu-static/releases/tag/10.1.1.1 --- ci/x86_64-linux-debug-llvm.sh | 2 +- ci/x86_64-linux-debug.sh | 2 +- ci/x86_64-linux-release.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/x86_64-linux-debug-llvm.sh b/ci/x86_64-linux-debug-llvm.sh index b3b1278192..e53ebc3281 100755 --- a/ci/x86_64-linux-debug-llvm.sh +++ b/ci/x86_64-linux-debug-llvm.sh @@ -11,7 +11,7 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31" PREFIX="$HOME/deps/$CACHE_BASENAME" ZIG="$PREFIX/bin/zig" -export PATH="$HOME/deps/wasmtime-v29.0.0-x86_64-linux:$HOME/deps/qemu-linux-x86_64-10.1.1/bin:$HOME/local/bin:$PATH" +export PATH="$HOME/deps/wasmtime-v29.0.0-x86_64-linux:$HOME/deps/qemu-linux-x86_64-10.1.1.1/bin:$HOME/local/bin:$PATH" # Override the cache directories because they won't actually help other CI runs # which will be testing alternate versions of zig, and ultimately would just diff --git a/ci/x86_64-linux-debug.sh b/ci/x86_64-linux-debug.sh index 868728367a..2b8406ea06 100755 --- a/ci/x86_64-linux-debug.sh +++ b/ci/x86_64-linux-debug.sh @@ -11,7 +11,7 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31" PREFIX="$HOME/deps/$CACHE_BASENAME" ZIG="$PREFIX/bin/zig" -export PATH="$HOME/deps/wasmtime-v29.0.0-x86_64-linux:$HOME/deps/qemu-linux-x86_64-10.1.1/bin:$HOME/local/bin:$PATH" +export PATH="$HOME/deps/wasmtime-v29.0.0-x86_64-linux:$HOME/deps/qemu-linux-x86_64-10.1.1.1/bin:$HOME/local/bin:$PATH" # Override the cache directories because they won't actually help other CI runs # which will be testing alternate versions of zig, and ultimately would just diff --git a/ci/x86_64-linux-release.sh b/ci/x86_64-linux-release.sh index 78dad0cc1f..6354100d3a 100755 --- a/ci/x86_64-linux-release.sh +++ b/ci/x86_64-linux-release.sh @@ -11,7 +11,7 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31" PREFIX="$HOME/deps/$CACHE_BASENAME" ZIG="$PREFIX/bin/zig" -export PATH="$HOME/deps/wasmtime-v29.0.0-x86_64-linux:$HOME/deps/qemu-linux-x86_64-10.1.1/bin:$HOME/local/bin:$PATH" +export PATH="$HOME/deps/wasmtime-v29.0.0-x86_64-linux:$HOME/deps/qemu-linux-x86_64-10.1.1.1/bin:$HOME/local/bin:$PATH" # Override the cache directories because they won't actually help other CI runs # which will be testing alternate versions of zig, and ultimately would just From 653a1919651f6c9e84e96a6acf8915f57773a7dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= Date: Sat, 18 Oct 2025 20:49:25 +0200 Subject: [PATCH 2/2] Revert "std.Thread: disable test on armeb in addition to thumbeb" This reverts commit a73f246b2963de0024b9b7070448862e855d5a04. --- lib/std/Thread.zig | 5 ----- 1 file changed, 5 deletions(-) diff --git a/lib/std/Thread.zig b/lib/std/Thread.zig index 6cc377b5bd..18f653c3a4 100644 --- a/lib/std/Thread.zig +++ b/lib/std/Thread.zig @@ -1661,11 +1661,6 @@ test "Thread.getCurrentId" { test "thread local storage" { if (builtin.single_threaded) return error.SkipZigTest; - if (builtin.cpu.arch == .armeb or builtin.cpu.arch == .thumbeb) { - // https://github.com/ziglang/zig/issues/24061 - return error.SkipZigTest; - } - const thread1 = try Thread.spawn(.{}, testTls, .{}); const thread2 = try Thread.spawn(.{}, testTls, .{}); try testTls();