Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename wasm32-wasi-threads target to wasm32-wasi-preview1-threads #434

Closed
wants to merge 1 commit into from
Closed

Rename wasm32-wasi-threads target to wasm32-wasi-preview1-threads #434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,15 @@ jobs:
name: ${{ format( 'sysroot-{0}.tgz', matrix.os) }}
path: sysroot

- name: Build libc + threads
- name: Build libc + threads (wasm32-wasi-preview1-threads)
# Only build the thread-capable wasi-libc in the latest supported Clang
# version; the earliest version does not have all necessary builtins
# (e.g., `__builtin_wasm_memory_atomic_notify`).
if: matrix.clang_version != '10.0.0'
shell: bash
run: make -j4 THREAD_MODEL=posix THREAD_IMPL=wasi-threads

- name: Build libc + threads (wasm32-wasi-threads)
# Only build the thread-capable wasi-libc in the latest supported Clang
# version; the earliest version does not have all necessary builtins
# (e.g., `__builtin_wasm_memory_atomic_notify`).
Expand Down
7 changes: 7 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,15 @@ TARGET_TRIPLE = wasm32-wasi
# Threaded version necessitates a different traget, as objects from different
# targets can't be mixed together while linking.
ifeq ($(THREAD_MODEL), posix)
ifeq ($(THREAD_IMPL), wasi-threads)
TARGET_TRIPLE = wasm32-wasi-preview1-threads
else
# The target tripple is deprecated and only kept for backward compatibility.
# This target will most likely be re-used for implementing thread-spawn proposal
# in the future.
TARGET_TRIPLE = wasm32-wasi-threads
endif
endif

# These variables describe the locations of various files and directories in
# the source tree.
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ cross-compiled builds of compiler-rt, `libc++.a`, and `libc++abi.a`.

To enable pthreads support via the [wasi-threads] proposal, follow the above
build directions with one addition: `make ... THREAD_MODEL=posix`. This creates
additional artifacts in `sysroot/lib/wasm32-wasi-threads` to support `--target
wasm32-wasi-threads`.
additional artifacts in `sysroot/lib/wasm32-wasi-preview1-threads` to support `--target
wasm32-wasi-preview1-threads`.

## Arch Linux AUR package

Expand Down
Loading