mirror of https://github.com/pyodide/pyodide.git
Update to emscripten 1.38.44 (#906)
This commit is contained in:
parent
77b2a99697
commit
9472852450
|
@ -1,4 +1,4 @@
|
|||
export EMSCRIPTEN_VERSION = 1.38.43
|
||||
export EMSCRIPTEN_VERSION = 1.38.44
|
||||
export BINARYEN_VERSION = version_84
|
||||
|
||||
export PATH := $(PYODIDE_ROOT)/ccache:$(PYODIDE_ROOT)/emsdk/emsdk:$(PYODIDE_ROOT)/emsdk/emsdk/node/12.18.1_64bit/bin:$(PYODIDE_ROOT)/emsdk/emsdk/binaryen/bin/:$(PYODIDE_ROOT)/emsdk/emsdk/fastcomp/emscripten/:$(PATH)
|
||||
|
|
|
@ -1,8 +1,18 @@
|
|||
diff --git a/emsdk/fastcomp/emscripten/src/support.js b/emsdk/fastcomp/emscripten/src/support.js
|
||||
index 8e1df8e82..4d07d6bef 100644
|
||||
--- a/emsdk/fastcomp/emscripten/src/support.js
|
||||
+++ b/emsdk/fastcomp/emscripten/src/support.js
|
||||
@@ -471,7 +471,18 @@
|
||||
@@ -338,6 +338,11 @@ function relocateExports(exports, memoryBase, tableBase, moduleLocal) {
|
||||
}
|
||||
#endif
|
||||
}
|
||||
+ if (e.startsWith("dynCall_")) {
|
||||
+ if (!Module.hasOwnProperty(e)) {
|
||||
+ Module[e] = value;
|
||||
+ }
|
||||
+ }
|
||||
relocated[e] = value;
|
||||
if (moduleLocal) {
|
||||
#if WASM_BACKEND
|
||||
@@ -510,7 +515,18 @@ function loadWebAssemblyModule(binary, flags) {
|
||||
// present in the dynamic library but not in the main JS,
|
||||
// and the dynamic library cannot provide JS for it. Use
|
||||
// the generic "X" invoke for it.
|
||||
|
@ -10,7 +20,7 @@ index 8e1df8e82..4d07d6bef 100644
|
|||
+ var dynCallName = 'dynCall_' + prop.slice(7);
|
||||
+ return obj[prop] = function() {
|
||||
+ var sp = stackSave();
|
||||
+ try {
|
||||
+ try {
|
||||
+ var args = Array.prototype.slice.call(arguments);
|
||||
+ return Module[dynCallName].apply(null, args);
|
||||
+ } catch(e) {
|
||||
|
@ -22,15 +32,3 @@ index 8e1df8e82..4d07d6bef 100644
|
|||
}
|
||||
// otherwise this is regular function import - call it indirectly
|
||||
return obj[prop] = function() {
|
||||
@@ -530,6 +541,11 @@
|
||||
}
|
||||
#endif
|
||||
}
|
||||
+ if (e.startsWith("dynCall_")) {
|
||||
+ if (!Module.hasOwnProperty(e)) {
|
||||
+ Module[e] = value;
|
||||
+ }
|
||||
+ }
|
||||
exports[e] = value;
|
||||
#if WASM_BACKEND
|
||||
moduleLocal['_' + e] = value;
|
||||
|
|
Loading…
Reference in New Issue