From aa9966fe7fabd745c67abf9e19768df9902e5fa7 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 20 Aug 2026 07:30:17 -0700 Subject: [PATCH] Update wasi-sdk-34 in CI Adjust the declaration of `__init_tls_base` on wasip3 targets to match what LLD now emits. --- .github/workflows/main.yml | 8 ++++---- libc-top-half/headers/private/wasi/wasip3_tls.h | 4 ---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a8a75c720..85a03ab24 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -132,19 +132,19 @@ jobs: - name: Test wasm32-wasip3 (debug) os: ubuntu-24.04 - clang_version: wasi-sdk-34.0-rc.2 + clang_version: wasi-sdk-34.0-rc.3 test: true args: -DCMAKE_BUILD_TYPE=Debug -DTARGET_TRIPLE=wasm32-wasip3 - name: Test wasm32-wasip3 coop-threads os: ubuntu-24.04 - clang_version: wasi-sdk-34.0-rc.2 + clang_version: wasi-sdk-34.0-rc.3 test: true args: -DTARGET_TRIPLE=wasm32-wasip3 -DENABLE_COOP_THREADS=ON - name: Test wasm32-wasip3 coop-threads (debug) os: ubuntu-24.04 - clang_version: wasi-sdk-34.0-rc.2 + clang_version: wasi-sdk-34.0-rc.3 test: true args: -DCMAKE_BUILD_TYPE=Debug -DTARGET_TRIPLE=wasm32-wasip3 -DENABLE_COOP_THREADS=ON @@ -309,7 +309,7 @@ jobs: clang_version: wasi-sdk-32.0 - name: wasm32-wasip3 coop-threads args: -DTARGET_TRIPLE=wasm32-wasip3 -DENABLE_COOP_THREADS=ON - clang_version: wasi-sdk-34.0-rc.2 + clang_version: wasi-sdk-34.0-rc.3 steps: - uses: actions/checkout@v6 with: diff --git a/libc-top-half/headers/private/wasi/wasip3_tls.h b/libc-top-half/headers/private/wasi/wasip3_tls.h index 65242ea89..596afa83c 100644 --- a/libc-top-half/headers/private/wasi/wasip3_tls.h +++ b/libc-top-half/headers/private/wasi/wasip3_tls.h @@ -69,11 +69,7 @@ static inline void *__wasilibc_tls_main_thread_base(void) { return (void *)info->main_thread_tls_base; void *ret; __asm__( -#ifdef __PIC__ ".globaltype __init_tls_base, i32\n" -#else - ".globaltype __init_tls_base, i32, immutable\n" -#endif "global.get __init_tls_base\n" "local.set %0\n" : "=r"(ret));