Emscripten 3.1.44 (#4073)

pyodide · Aug 26, 2023 · 4d99d07 · 4d99d07
1 parent 7b0af2d
commit 4d99d07
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/Makefile.envs b/Makefile.envs
@@ -1,5 +1,5 @@
 export PYVERSION ?= 3.11.3
-export PYODIDE_EMSCRIPTEN_VERSION ?= 3.1.43
+export PYODIDE_EMSCRIPTEN_VERSION ?= 3.1.44
 
 ifdef CPYTHON_DEBUG
 	export CPYTHON_ABI_FLAGS=d

diff --git a/docs/project/changelog.md b/docs/project/changelog.md
@@ -35,8 +35,8 @@ myst:
 - {{ Enhancement }} Make it possible to use the @example JSDoc directive.
   {pr}`4009`
 
-- {{ Enhancement }} ABI Break: Updated Emscripten to version 3.1.43
-  {pr}`3665`, {pr}`3659`, {pr}`3822`, {pr}`3889`, {pr}`3890`, {pr}`3888`, {pr}`4055`, {pr}`4056`
+- {{ Enhancement }} ABI Break: Updated Emscripten to version 3.1.44
+  {pr}`3665`, {pr}`3659`, {pr}`3822`, {pr}`3889`, {pr}`3890`, {pr}`3888`, {pr}`4055`, {pr}`4056`, {pr}`4073`
 
 - {{ Update }} The docker image now has node v20 instead of node v14.
   {pr}`3819`

diff --git a/emsdk/Makefile b/emsdk/Makefile
@@ -22,6 +22,10 @@ emsdk/.complete: ../Makefile.envs $(wildcard patches/*.patch)
 	touch emsdk/.complete
 
 
+update_struct_info:
+	rm ../src/js/generated_struct_info32.json
+	cd ../src/js && wget "https://raw.githubusercontent.com/emscripten-core/emscripten/$(PYODIDE_EMSCRIPTEN_VERSION)/src/generated_struct_info32.json"
+
 
 clean:
 	rm -rf emsdk
diff --git a/src/core/_pyodide_core.c b/src/core/_pyodide_core.c
@@ -50,6 +50,9 @@ PyInit__pyodide_core(void)
     // Emscripten has a bug where it accidentally exposes an empty object as
     // Module.ERRNO_CODES
     Module.ERRNO_CODES = ERRNO_CODES;
+    // sourmash needs open64 to mean the same thing as open.
+    // Emscripten 3.1.44 seems to have removed it??
+    wasmImports["open64"] = wasmImports["open"];
   });
 
   bool success = false;

diff --git a/src/js/generated_struct_info32.json b/src/js/generated_struct_info32.json
@@ -220,9 +220,7 @@
         "EM_LOG_CONSOLE": 1,
         "EM_LOG_C_STACK": 8,
         "EM_LOG_DEBUG": 256,
-        "EM_LOG_DEMANGLE": 32,
         "EM_LOG_ERROR": 4,
-        "EM_LOG_FUNC_PARAMS": 128,
         "EM_LOG_INFO": 512,
         "EM_LOG_JS_STACK": 16,
         "EM_LOG_NO_PATHS": 64,
@@ -304,15 +302,12 @@
         "F_GETFD": 1,
         "F_GETFL": 3,
         "F_GETLK": 5,
-        "F_GETLK64": 5,
         "F_GETOWN": 9,
         "F_GETOWN_EX": 16,
         "F_SETFD": 2,
         "F_SETFL": 4,
         "F_SETLK": 6,
-        "F_SETLK64": 6,
         "F_SETLKW": 7,
-        "F_SETLKW64": 7,
         "F_SETOWN": 8,
         "F_UNLCK": 2,
         "File::DataFileKind": 1,