diff --git a/tools/clang-wasix-eh.cmake_toolchain b/tools/clang-wasix-eh.cmake_toolchain
index 3ca1b057a..ca2ade3b8 100644
--- a/tools/clang-wasix-eh.cmake_toolchain
+++ b/tools/clang-wasix-eh.cmake_toolchain
@@ -1,7 +1,14 @@
 # Cmake toolchain description file for the Makefile for WASI
 cmake_minimum_required(VERSION 3.5.0)
 
-set(COMPILE_FLAGS "-O2 -matomics -mbulk-memory -mmutable-globals -pthread -mthread-model posix -ftls-model=local-exec -fno-trapping-math -D_WASI_EMULATED_MMAN -D_WASI_EMULATED_SIGNAL -D_WASI_EMULATED_PROCESS_CLOCKS -fwasm-exceptions")
+# PIC objects can be linked into side modules that import errno from another module;
+# those need global-dynamic TLS (local-exec can't relocate an imported thread-local).
+if(CMAKE_POSITION_INDEPENDENT_CODE)
+  set(WASIX_TLS_MODEL "global-dynamic")
+else()
+  set(WASIX_TLS_MODEL "local-exec")
+endif()
+set(COMPILE_FLAGS "-O2 -matomics -mbulk-memory -mmutable-globals -pthread -mthread-model posix -ftls-model=${WASIX_TLS_MODEL} -fno-trapping-math -D_WASI_EMULATED_MMAN -D_WASI_EMULATED_SIGNAL -D_WASI_EMULATED_PROCESS_CLOCKS -fwasm-exceptions")
 set(LINK_FLAGS "-lwasi-emulated-mman -lwasi-emulated-process-clocks -lwasi-emulated-getpid -Wl,--shared-memory -Wl,--max-memory=4294967296 -Wl,--import-memory -Wl,--export-dynamic -Wl,--export=__heap_base -Wl,--export=__stack_pointer -Wl,--export=__data_end -Wl,--export=__wasm_init_tls -Wl,--export=__wasm_signal -Wl,--export=__tls_size -Wl,--export=__tls_align -Wl,--export=__tls_base -Wl,-mllvm,--wasm-enable-sjlj")
 
 set(CMAKE_SYSTEM_NAME WASI) # Generic for now, to not trigger a Warning
diff --git a/tools/clang-wasix-exnref-eh.cmake_toolchain b/tools/clang-wasix-exnref-eh.cmake_toolchain
index 21d7d7b5c..aaac448ae 100644
--- a/tools/clang-wasix-exnref-eh.cmake_toolchain
+++ b/tools/clang-wasix-exnref-eh.cmake_toolchain
@@ -1,7 +1,14 @@
 # Cmake toolchain description file for the Makefile for WASI
 cmake_minimum_required(VERSION 3.5.0)
 
-set(COMPILE_FLAGS "-O2 -matomics -mbulk-memory -mmutable-globals -pthread -mthread-model posix -ftls-model=local-exec -fno-trapping-math -D_WASI_EMULATED_MMAN -D_WASI_EMULATED_SIGNAL -D_WASI_EMULATED_PROCESS_CLOCKS -fwasm-exceptions -mllvm --wasm-enable-eh -mllvm --wasm-enable-sjlj -mllvm --wasm-use-legacy-eh=false")
+# PIC objects can be linked into side modules that import errno from another module;
+# those need global-dynamic TLS (local-exec can't relocate an imported thread-local).
+if(CMAKE_POSITION_INDEPENDENT_CODE)
+  set(WASIX_TLS_MODEL "global-dynamic")
+else()
+  set(WASIX_TLS_MODEL "local-exec")
+endif()
+set(COMPILE_FLAGS "-O2 -matomics -mbulk-memory -mmutable-globals -pthread -mthread-model posix -ftls-model=${WASIX_TLS_MODEL} -fno-trapping-math -D_WASI_EMULATED_MMAN -D_WASI_EMULATED_SIGNAL -D_WASI_EMULATED_PROCESS_CLOCKS -fwasm-exceptions -mllvm --wasm-enable-eh -mllvm --wasm-enable-sjlj -mllvm --wasm-use-legacy-eh=false")
 set(LINK_FLAGS "-lwasi-emulated-mman -lwasi-emulated-process-clocks -lwasi-emulated-getpid -Wl,--shared-memory -Wl,--max-memory=4294967296 -Wl,--import-memory -Wl,--export-dynamic -Wl,--export=__heap_base -Wl,--export=__stack_pointer -Wl,--export=__data_end -Wl,--export=__wasm_init_tls -Wl,--export=__wasm_signal -Wl,--export=__tls_size -Wl,--export=__tls_align -Wl,--export=__tls_base -Wl,-mllvm,--wasm-enable-eh -Wl,-mllvm,--wasm-enable-sjlj -Wl,-mllvm,--wasm-use-legacy-eh=false -Wl,-mllvm,--exception-model=wasm")
 
 set(CMAKE_SYSTEM_NAME WASI) # Generic for now, to not trigger a Warning
diff --git a/tools/clang-wasix.cmake_toolchain b/tools/clang-wasix.cmake_toolchain
index 9ce9d92e1..d97a6aa7c 100644
--- a/tools/clang-wasix.cmake_toolchain
+++ b/tools/clang-wasix.cmake_toolchain
@@ -1,7 +1,14 @@
 # Cmake toolchain description file for the Makefile for WASI
 cmake_minimum_required(VERSION 3.5.0)
 
-set(COMPILE_FLAGS "-O2 -matomics -mbulk-memory -mmutable-globals -pthread -mthread-model posix -ftls-model=local-exec -fno-trapping-math -D_WASI_EMULATED_MMAN -D_WASI_EMULATED_SIGNAL -D_WASI_EMULATED_PROCESS_CLOCKS -fno-exceptions -fwasm-exceptions")
+# PIC objects can be linked into side modules that import errno from another module;
+# those need global-dynamic TLS (local-exec can't relocate an imported thread-local).
+if(CMAKE_POSITION_INDEPENDENT_CODE)
+  set(WASIX_TLS_MODEL "global-dynamic")
+else()
+  set(WASIX_TLS_MODEL "local-exec")
+endif()
+set(COMPILE_FLAGS "-O2 -matomics -mbulk-memory -mmutable-globals -pthread -mthread-model posix -ftls-model=${WASIX_TLS_MODEL} -fno-trapping-math -D_WASI_EMULATED_MMAN -D_WASI_EMULATED_SIGNAL -D_WASI_EMULATED_PROCESS_CLOCKS -fno-exceptions -fwasm-exceptions")
 set(LINK_FLAGS "-lwasi-emulated-mman -lwasi-emulated-process-clocks -lwasi-emulated-getpid -fno-exceptions -Wl,--shared-memory -Wl,--max-memory=4294967296 -Wl,--import-memory -Wl,--export-dynamic -Wl,--export=__heap_base -Wl,--export=__stack_pointer -Wl,--export=__data_end -Wl,--export=__wasm_init_tls -Wl,--export=__wasm_signal -Wl,--export=__tls_size -Wl,--export=__tls_align -Wl,--export=__tls_base -Wl,-mllvm,--wasm-enable-sjlj")
 
 set(CMAKE_SYSTEM_NAME WASI) # Generic for now, to not trigger a Warning