Rooba
/
pyodide
mirror of https://github.com/pyodide/pyodide.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update to emscripten 1.38.44 (#906)

This commit is contained in:
Dexter Chua 2020-12-21 13:00:05 +08:00 committed by GitHub
parent 77b2a99697
commit 9472852450
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.envs
View File

@ -1,4 +1,4 @@
export EMSCRIPTEN_VERSION = 1.38.43 export EMSCRIPTEN_VERSION = 1.38.44
export BINARYEN_VERSION = version_84 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) 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)

28
emsdk/patches/dynCall_so.patch
View File

@ -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 --- a/emsdk/fastcomp/emscripten/src/support.js
+++ b/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, // present in the dynamic library but not in the main JS,
// and the dynamic library cannot provide JS for it. Use // and the dynamic library cannot provide JS for it. Use
// the generic "X" invoke for it. // the generic "X" invoke for it.
@ -22,15 +32,3 @@ index 8e1df8e82..4d07d6bef 100644
} }
// otherwise this is regular function import - call it indirectly // otherwise this is regular function import - call it indirectly
return obj[prop] = function() { 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;