From b03fe62ed1ca5e936281eaeb1a4cb815910c6f01 Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Wed, 11 Jan 2023 15:00:24 -0800 Subject: [PATCH 1/2] Change `wasm32-wasi-pthread` to `wasm32-wasi-threads` After some thought, I think that we should rename the `THREAD_MODEL=posix` build to avoid confusion. Why? Though in this project the use of this target does involve pthreads, it will not be so in other standard libraries or languages (see, e.g., https://github.com/rust-lang/compiler-team/issues/574). I think it would be preferable to emphasize the "threads" Wasm-level proposal and the "wasi-threads" proposal rather than the specific details of which threading API is being exposed. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 21b91e0ee..57975a799 100644 --- a/Makefile +++ b/Makefile @@ -38,7 +38,7 @@ 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) -TARGET_TRIPLE = wasm32-wasi-pthread +TARGET_TRIPLE = wasm32-wasi-threads endif # These variables describe the locations of various files and directories in From 3124868d8ebc71efd071f03f139c6d074cabfd5e Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Wed, 11 Jan 2023 15:27:50 -0800 Subject: [PATCH 2/2] fix: rename the `expected` output directory as well --- .../defined-symbols.txt | 0 .../{wasm32-wasi-pthread => wasm32-wasi-threads}/include-all.c | 0 .../predefined-macros.txt | 0 .../undefined-symbols.txt | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename expected/{wasm32-wasi-pthread => wasm32-wasi-threads}/defined-symbols.txt (100%) rename expected/{wasm32-wasi-pthread => wasm32-wasi-threads}/include-all.c (100%) rename expected/{wasm32-wasi-pthread => wasm32-wasi-threads}/predefined-macros.txt (100%) rename expected/{wasm32-wasi-pthread => wasm32-wasi-threads}/undefined-symbols.txt (100%) diff --git a/expected/wasm32-wasi-pthread/defined-symbols.txt b/expected/wasm32-wasi-threads/defined-symbols.txt similarity index 100% rename from expected/wasm32-wasi-pthread/defined-symbols.txt rename to expected/wasm32-wasi-threads/defined-symbols.txt diff --git a/expected/wasm32-wasi-pthread/include-all.c b/expected/wasm32-wasi-threads/include-all.c similarity index 100% rename from expected/wasm32-wasi-pthread/include-all.c rename to expected/wasm32-wasi-threads/include-all.c diff --git a/expected/wasm32-wasi-pthread/predefined-macros.txt b/expected/wasm32-wasi-threads/predefined-macros.txt similarity index 100% rename from expected/wasm32-wasi-pthread/predefined-macros.txt rename to expected/wasm32-wasi-threads/predefined-macros.txt diff --git a/expected/wasm32-wasi-pthread/undefined-symbols.txt b/expected/wasm32-wasi-threads/undefined-symbols.txt similarity index 100% rename from expected/wasm32-wasi-pthread/undefined-symbols.txt rename to expected/wasm32-wasi-threads/undefined-symbols.txt