Emscripten 4.0.0

Author: hoodmane

Makefile.envs

@@ -1,5 +1,5 @@
 export PYVERSION ?= 3.12.7
-export PYODIDE_EMSCRIPTEN_VERSION ?= 3.1.74
+export PYODIDE_EMSCRIPTEN_VERSION ?= 4.0.0
 export PYODIDE_VERSION ?= 0.28.0.dev0
 export PYODIDE_ABI_VERSION ?= 2025_0
 

emsdk/patches/0001-Add-back-fs.findObject-and-fs.readFile-in-loadLibDat.patch

@@ -1,4 +1,4 @@
-From 380817b0a87d17670635e7d80b123b904a1ff72d Mon Sep 17 00:00:00 2001
+From 1e448f3d748523bcb5635ed29c6557f18693dbb5 Mon Sep 17 00:00:00 2001
 From: Hood Chatham <[email protected]>
 Date: Fri, 2 Jun 2023 11:59:32 -0700
 Subject: [PATCH 1/5] Add back fs.findObject and fs.readFile in loadLibData

emsdk/patches/0002-Add-useful-error-when-symbol-resolution-fails.patch

@@ -1,4 +1,4 @@
-From 264239a38b6093ee50171ae4c8b648d093ace7a1 Mon Sep 17 00:00:00 2001
+From c0af4cd7c23c2677ac83a0a4dbafaddc6d78c7f6 Mon Sep 17 00:00:00 2001
 From: Hood Chatham <[email protected]>
 Date: Fri, 19 May 2023 12:19:00 -0700
 Subject: [PATCH 2/5] Add useful error when symbol resolution fails

emsdk/patches/0003-Changes-for-JSPI.patch

@@ -1,4 +1,4 @@
-From d03c660e0a5ca58581c173f877ef9264a568adb1 Mon Sep 17 00:00:00 2001
+From 4e69d2ad44d6b1a4bf0707827cdd2442bca7fdb5 Mon Sep 17 00:00:00 2001
 From: Hood Chatham <[email protected]>
 Date: Thu, 22 Jun 2023 18:53:22 -0700
 Subject: [PATCH 3/5] Changes for JSPI
@@ -11,10 +11,10 @@ Subject: [PATCH 3/5] Changes for JSPI
  4 files changed, 9 insertions(+), 3 deletions(-)
 
 diff --git a/src/library.js b/src/library.js
-index 607e18e68..cfa2e49a1 100644
+index 14c45f6b1..be4d780d3 100644
 --- a/src/library.js
 +++ b/src/library.js
-@@ -492,7 +492,7 @@ addToLibrary({
+@@ -460,7 +460,7 @@ addToLibrary({
  #if EXCEPTION_STACK_TRACES
      throw new EmscriptenSjLj;
  #else
@@ -45,10 +45,10 @@ index 31ae90318..f06f00904 100644
  #endif
  #if !DISABLE_EXCEPTION_CATCHING
 diff --git a/src/parseTools.mjs b/src/parseTools.mjs
-index fa6da8556..5a0a48548 100644
+index a57593562..976168049 100644
 --- a/src/parseTools.mjs
 +++ b/src/parseTools.mjs
-@@ -585,7 +585,7 @@ function makeThrow(excPtr) {
+@@ -589,7 +589,7 @@ function makeThrow(excPtr) {
      }
      return `assert(false, '${assertInfo}');`;
    }
@@ -58,7 +58,7 @@ index fa6da8556..5a0a48548 100644
 
  function storeException(varName, excPtr) {
 diff --git a/src/preamble.js b/src/preamble.js
-index d097c857f..6a217e022 100644
+index 2a422c490..0fd120445 100644
 --- a/src/preamble.js
 +++ b/src/preamble.js
 @@ -14,6 +14,10 @@
@@ -72,7 +72,7 @@ index d097c857f..6a217e022 100644
  #if RELOCATABLE
  {{{ makeModuleReceiveWithVar('dynamicLibraries', undefined, '[]', true) }}}
  #endif
-@@ -1038,6 +1042,7 @@ function getWasmImports() {
+@@ -1012,6 +1016,7 @@ function getWasmImports() {
  #endif // WASM_ASYNC_COMPILATION
 
    var info = getWasmImports();

emsdk/patches/0004-Raise-when-no-argument-is-given.patch

@@ -1,4 +1,4 @@
-From 1f4e59e310a9dca31087987cf654333d29e42aad Mon Sep 17 00:00:00 2001
+From 1f225481fb33cc6df688262eb2e952994616296e Mon Sep 17 00:00:00 2001
 From: ryanking13 <[email protected]>
 Date: Sat, 20 Jan 2024 19:02:32 +0900
 Subject: [PATCH 4/5] Raise when no argument is given
@@ -13,10 +13,10 @@ Upstream issue: https://github.com/emscripten-core/emscripten/issues/21116
  1 file changed, 3 insertions(+)
 
 diff --git a/emcc.py b/emcc.py
-index 2925985f2..c759defb5 100644
+index a556a6f95..fd7f9195a 100644
 --- a/emcc.py
 +++ b/emcc.py
-@@ -662,6 +662,9 @@ There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR P
+@@ -655,6 +655,9 @@ There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR P
        print(libname)
      return 0
 

emsdk/patches/0005-sdl2_image-wasm-sjlj-variant.patch

@@ -1,4 +1,4 @@
-From 4fb563293d2d52072b6a16b5b7d18021a339eaee Mon Sep 17 00:00:00 2001
+From 124b0986a26ebd8a5533780248fc523ff6875dac Mon Sep 17 00:00:00 2001
 From: Hood Chatham <[email protected]>
 Date: Fri, 31 Jan 2025 11:42:59 +0100
 Subject: [PATCH 5/5] sdl2_image wasm-sjlj variant