From eaaab0f9492adfec7d8656130f7f945b304164cb Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Thu, 7 Nov 2024 15:04:15 -0800 Subject: [PATCH] [3.13] GH-123877: use `wasm32-wasip1` as the target triple for WASI --- .github/workflows/reusable-wasi.yml | 4 ++-- .../next/Build/2024-11-07-15-03-34.gh-issue-123877.9dWXe2.rst | 2 ++ Tools/wasm/wasi.py | 2 +- configure | 4 ++-- configure.ac | 4 ++-- 5 files changed, 9 insertions(+), 7 deletions(-) create mode 100644 Misc/NEWS.d/next/Build/2024-11-07-15-03-34.gh-issue-123877.9dWXe2.rst diff --git a/.github/workflows/reusable-wasi.yml b/.github/workflows/reusable-wasi.yml index ffa143b3457e5a..a1596cefe750a6 100644 --- a/.github/workflows/reusable-wasi.yml +++ b/.github/workflows/reusable-wasi.yml @@ -15,7 +15,7 @@ jobs: WASI_SDK_VERSION: 22 WASI_SDK_PATH: /opt/wasi-sdk CROSS_BUILD_PYTHON: cross-build/build - CROSS_BUILD_WASI: cross-build/wasm32-wasi + CROSS_BUILD_WASI: cross-build/wasm32-wasip1 steps: - uses: actions/checkout@v4 # No problem resolver registered as one doesn't currently exist for Clang. @@ -29,7 +29,7 @@ jobs: with: path: ${{ env.WASI_SDK_PATH }} key: ${{ runner.os }}-wasi-sdk-${{ env.WASI_SDK_VERSION }} - - name: "Install WASI SDK" + - name: "Install WASI SDK" # Hard-coded to x64. if: steps.cache-wasi-sdk.outputs.cache-hit != 'true' run: | mkdir ${{ env.WASI_SDK_PATH }} && \ diff --git a/Misc/NEWS.d/next/Build/2024-11-07-15-03-34.gh-issue-123877.9dWXe2.rst b/Misc/NEWS.d/next/Build/2024-11-07-15-03-34.gh-issue-123877.9dWXe2.rst new file mode 100644 index 00000000000000..5fc04aec4b12e4 --- /dev/null +++ b/Misc/NEWS.d/next/Build/2024-11-07-15-03-34.gh-issue-123877.9dWXe2.rst @@ -0,0 +1,2 @@ +Set ``wasm32-wasip1`` as the WASI target. The old ``wasm32-wasi`` target is +deprecated so it can be used for an eventual WASI 1.0. diff --git a/Tools/wasm/wasi.py b/Tools/wasm/wasi.py index d4394d7dc1d026..765c3e8152d246 100644 --- a/Tools/wasm/wasi.py +++ b/Tools/wasm/wasi.py @@ -20,7 +20,7 @@ CROSS_BUILD_DIR = CHECKOUT / "cross-build" BUILD_DIR = CROSS_BUILD_DIR / "build" -HOST_TRIPLE = "wasm32-wasi" +HOST_TRIPLE = "wasm32-wasip1" HOST_DIR = CROSS_BUILD_DIR / HOST_TRIPLE LOCAL_SETUP = CHECKOUT / "Modules" / "Setup.local" diff --git a/configure b/configure index e1bfd73f24be96..dc4a12b9805862 100755 --- a/configure +++ b/configure @@ -4060,7 +4060,7 @@ then *-*-emscripten) ac_sys_system=Emscripten ;; - *-*-wasi) + *-*-wasi*) ac_sys_system=WASI ;; *) @@ -7058,7 +7058,7 @@ case $host/$ac_cv_cc_name in #( PY_SUPPORT_TIER=2 ;; #( powerpc64le-*-linux-gnu/gcc) : PY_SUPPORT_TIER=2 ;; #( - wasm32-unknown-wasi/clang) : + wasm32-unknown-wasip1/clang) : PY_SUPPORT_TIER=2 ;; #( x86_64-*-linux-gnu/clang) : PY_SUPPORT_TIER=2 ;; #( diff --git a/configure.ac b/configure.ac index cfe9de0f7f3819..407ad94eb5d1a7 100644 --- a/configure.ac +++ b/configure.ac @@ -336,7 +336,7 @@ then *-*-emscripten) ac_sys_system=Emscripten ;; - *-*-wasi) + *-*-wasi*) ac_sys_system=WASI ;; *) @@ -1181,7 +1181,7 @@ AS_CASE([$host/$ac_cv_cc_name], [aarch64-*-linux-gnu/gcc], [PY_SUPPORT_TIER=2], dnl Linux ARM64, glibc, gcc+clang [aarch64-*-linux-gnu/clang], [PY_SUPPORT_TIER=2], [powerpc64le-*-linux-gnu/gcc], [PY_SUPPORT_TIER=2], dnl Linux on PPC64 little endian, glibc, gcc - [wasm32-unknown-wasi/clang], [PY_SUPPORT_TIER=2], dnl WebAssembly System Interface, clang + [wasm32-unknown-wasip1/clang], [PY_SUPPORT_TIER=2], dnl WebAssembly System Interface preview1, clang [x86_64-*-linux-gnu/clang], [PY_SUPPORT_TIER=2], dnl Linux on AMD64, any vendor, glibc, clang [aarch64-pc-windows-msvc/msvc], [PY_SUPPORT_TIER=3], dnl Windows ARM64, MSVC