summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Misc/NEWS.d/next/Build/2023-10-20-15-29-31.gh-issue-111046.2DxQl8.rst1
-rwxr-xr-xconfigure5
-rw-r--r--configure.ac5
3 files changed, 11 insertions, 0 deletions
diff --git a/Misc/NEWS.d/next/Build/2023-10-20-15-29-31.gh-issue-111046.2DxQl8.rst b/Misc/NEWS.d/next/Build/2023-10-20-15-29-31.gh-issue-111046.2DxQl8.rst
new file mode 100644
index 0000000..446b8b6
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2023-10-20-15-29-31.gh-issue-111046.2DxQl8.rst
@@ -0,0 +1 @@
+For wasi-threads, memory is now exported to fix compatibility issues with some wasm runtimes.
diff --git a/configure b/configure
index c87f518..3bf92dd 100755
--- a/configure
+++ b/configure
@@ -9268,10 +9268,15 @@ then :
# without this, configure fails to find pthread_create, sem_init,
# etc because they are only available in the sysroot for
# wasm32-wasi-threads.
+ # Note: wasi-threads requires --import-memory.
+ # Note: wasi requires --export-memory.
+ # Note: --export-memory is implicit unless --import-memory is given
+ # Note: this requires LLVM >= 16.
as_fn_append CFLAGS " -target wasm32-wasi-threads -pthread"
as_fn_append CFLAGS_NODIST " -target wasm32-wasi-threads -pthread"
as_fn_append LDFLAGS_NODIST " -target wasm32-wasi-threads -pthread"
as_fn_append LDFLAGS_NODIST " -Wl,--import-memory"
+ as_fn_append LDFLAGS_NODIST " -Wl,--export-memory"
as_fn_append LDFLAGS_NODIST " -Wl,--max-memory=10485760"
fi
diff --git a/configure.ac b/configure.ac
index cd69f0e..daa59b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2162,10 +2162,15 @@ AS_CASE([$ac_sys_system],
# without this, configure fails to find pthread_create, sem_init,
# etc because they are only available in the sysroot for
# wasm32-wasi-threads.
+ # Note: wasi-threads requires --import-memory.
+ # Note: wasi requires --export-memory.
+ # Note: --export-memory is implicit unless --import-memory is given
+ # Note: this requires LLVM >= 16.
AS_VAR_APPEND([CFLAGS], [" -target wasm32-wasi-threads -pthread"])
AS_VAR_APPEND([CFLAGS_NODIST], [" -target wasm32-wasi-threads -pthread"])
AS_VAR_APPEND([LDFLAGS_NODIST], [" -target wasm32-wasi-threads -pthread"])
AS_VAR_APPEND([LDFLAGS_NODIST], [" -Wl,--import-memory"])
+ AS_VAR_APPEND([LDFLAGS_NODIST], [" -Wl,--export-memory"])
AS_VAR_APPEND([LDFLAGS_NODIST], [" -Wl,--max-memory=10485760"])
])