qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wasm: remove wasm-jspi memory limit workaround 

Emscripten bug #23834 has been fixed, so the 2GB memory
limit workaround for JSPI is no longer needed.

Pick-to: 6.10
Change-Id: I8d8f12dba428ccb0e9b75164c7fd9ef1a1332c26
Reviewed-by: Even Oscar Andersen <even.oscar.andersen@qt.io>
Reviewed-by: Lorn Potter <lorn.potter@qt.io>
This commit is contained in:
Morten Sørvig 2025-09-19 12:55:41 +02:00 committed by Morten Johan Sørvig
parent 8825bcdbda
commit 8cf3690ed0
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mkspecs/features/wasm/wasm.prf
View File

@ -50,11 +50,7 @@ exists($$QMAKE_QT_CONFIG) {
}
EMCC_LFLAGS += -s INITIAL_MEMORY=$$INITIAL_MEMORY
isEmpty(QT_WASM_MAXIMUM_MEMORY) {
qtConfig(wasm-jspi) {
MAXIMUM_MEMORY = 2GB # Avoid triggering Emscripten bug #23834
} else {
MAXIMUM_MEMORY = 4GB # 32-bit max
}
MAXIMUM_MEMORY = 4GB # 32-bit max
} else {
MAXIMUM_MEMORY = $$QT_WASM_MAXIMUM_MEMORY
}

7
src/corelib/Qt6WasmMacros.cmake
View File

@ -121,12 +121,7 @@ function(_qt_internal_wasm_add_target_helpers target)
if(_tmp_maximumMemory)
set(QT_WASM_MAXIMUM_MEMORY "${_tmp_maximumMemory}")
elseif(NOT DEFINED QT_WASM_MAXIMUM_MEMORY)
if(QT_FEATURE_wasm_jspi)
# Work around Emscripten >2GB and JSPI compatibility issue.
set(QT_WASM_MAXIMUM_MEMORY "2GB")
else()
set(QT_WASM_MAXIMUM_MEMORY "4GB")
endif()
set(QT_WASM_MAXIMUM_MEMORY "4GB")
endif()
target_link_options("${target}" PRIVATE "SHELL:-s MAXIMUM_MEMORY=${QT_WASM_MAXIMUM_MEMORY}")