diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3cc3a700b..3bd0c2a86 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -18,7 +18,7 @@ jobs:
 
       - restore_cache:
           keys:
-          - v1-emsdk-{{ checksum "emsdk/Makefile" }}-v13-
+          - v1-emsdk-{{ checksum "emsdk/Makefile" }}-v14-
 
       - run:
           name: build
@@ -36,7 +36,7 @@ jobs:
           paths:
             - ./emsdk/emsdk
             - ~/.ccache
-          key: v1-emsdk-{{ checksum "emsdk/Makefile" }}-v13-{{ .BuildNum }}
+          key: v1-emsdk-{{ checksum "emsdk/Makefile" }}-v14-{{ .BuildNum }}
 
       - persist_to_workspace:
           root: .
diff --git a/Makefile.envs b/Makefile.envs
index 3581259b9..6b4820c30 100644
--- a/Makefile.envs
+++ b/Makefile.envs
@@ -1,4 +1,4 @@
-export EMSCRIPTEN_VERSION = 1.38.22
+export EMSCRIPTEN_VERSION = 1.38.30
 
 export PATH := $(PYODIDE_ROOT)/ccache:$(PYODIDE_ROOT)/emsdk/emsdk:$(PYODIDE_ROOT)/emsdk/emsdk/clang/tag-e$(EMSCRIPTEN_VERSION)/build_tag-e$(EMSCRIPTEN_VERSION)_64/bin:$(PYODIDE_ROOT)/emsdk/emsdk/node/8.9.1_64bit/bin:$(PYODIDE_ROOT)/emsdk/emsdk/emscripten/tag-$(EMSCRIPTEN_VERSION):$(PYODIDE_ROOT)/emsdk/emsdk/binaryen/tag-$(EMSCRIPTEN_VERSION)_64bit_binaryen/bin:$(PATH)
 
diff --git a/emsdk/Makefile b/emsdk/Makefile
index c7e750d03..60667ebef 100644
--- a/emsdk/Makefile
+++ b/emsdk/Makefile
@@ -14,11 +14,13 @@ emsdk/.complete:
 		cd emsdk && \
 		./emsdk install --build=Release sdk-tag-$(EMSCRIPTEN_VERSION)-64bit binaryen-tag-$(EMSCRIPTEN_VERSION)-64bit && \
 		cd .. && \
-		(cat patches/*.patch | patch -p1) ; \
+		(cat patches/*.patch | patch -p1) && \
 		cd emsdk/binaryen/tag-$(EMSCRIPTEN_VERSION)_64bit_binaryen/ && \
     make && \
-	  cd ../.. && \
-    cp binaryen/tag-$(EMSCRIPTEN_VERSION)/bin/wasm.js binaryen/tag-$(EMSCRIPTEN_VERSION)_64bit_binaryen/bin && \
+	  cd ../../.. && \
+		cd emsdk/clang/tag-e$(EMSCRIPTEN_VERSION)/build_tag-e$(EMSCRIPTEN_VERSION)_64/ && \
+    make && \
+    cd ../../.. && \
 		./emsdk activate --embedded --build=Release sdk-tag-$(EMSCRIPTEN_VERSION)-64bit binaryen-tag-$(EMSCRIPTEN_VERSION)-64bit && \
     touch .complete \
 	)
diff --git a/emsdk/patches/callHandlers.patch b/emsdk/patches/callHandlers.patch
new file mode 100644
index 000000000..5e81cfb87
--- /dev/null
+++ b/emsdk/patches/callHandlers.patch
@@ -0,0 +1,244 @@
+From https://github.com/emscripten-core/emscripten-fastcomp/pull/25 6
+diff --git a/emsdk/clang/tag-e1.38.30/src/lib/Target/JSBackend/CallHandlers.h b/emsdk/clang/tag-e1.38.30/src/lib/Target/JSBackend/CallHandlers.h
+index e414c0444a7..9c3ae3bf288 100644
+--- a/emsdk/clang/tag-e1.38.80/src/lib/Target/JSBackend/CallHandlers.h
++++ b/emsdk/clang/tag-e1.38.30/src/lib/Target/JSBackend/CallHandlers.h
+@@ -843,17 +843,21 @@ DEF_CALL_HANDLER(emscripten_asm_const_async_on_main_thread, {
+ 
+ DEF_CALL_HANDLER(emscripten_atomic_exchange_u8, {
+   UsesInt8Array = true;
++  if (!CI) return ""; // we are just called from a handler that was called from getFunctionIndex, only to ensure the handler was run at least once
+   return getAssign(CI) + "(Atomics_exchange(HEAP8, " + getValueAsStr(CI->getOperand(0)) + ',' + getValueAsStr(CI->getOperand(1)) + ")|0)";
+ })
+ DEF_CALL_HANDLER(emscripten_atomic_exchange_u16, {
+   UsesInt16Array = true;
++  if (!CI) return ""; // we are just called from a handler that was called from getFunctionIndex, only to ensure the handler was run at least once
+   return getAssign(CI) + "(Atomics_exchange(HEAP16, " + getShiftedPtr(CI->getOperand(0), 2) + ',' + getValueAsStr(CI->getOperand(1)) + ")|0)";
+ })
+ DEF_CALL_HANDLER(emscripten_atomic_exchange_u32, {
+   UsesInt32Array = true;
++  if (!CI) return ""; // we are just called from a handler that was called from getFunctionIndex, only to ensure the handler was run at least once
+   return getAssign(CI) + "(Atomics_exchange(HEAP32, " + getShiftedPtr(CI->getOperand(0), 4) + ',' + getValueAsStr(CI->getOperand(1)) + ")|0)";
+ })
+ DEF_CALL_HANDLER(__atomic_exchange_8, {
++  if (!CI) return ""; // we are just called from a handler that was called from getFunctionIndex, only to ensure the handler was run at least once
+   if (EnablePthreads) {
+     return getAssign(CI) + '(' + (OnlyWebAssembly ? "i64_atomics_exchange" : "_emscripten_atomic_exchange_u64") + '(' + getValueAsStr(CI->getOperand(0)) + ',' + getValueAsStr(CI->getOperand(1)) + ")|0)";
+   } else {
+@@ -863,27 +867,33 @@ DEF_CALL_HANDLER(__atomic_exchange_8, {
+ 
+ DEF_CALL_HANDLER(emscripten_atomic_cas_u8, {
+   UsesInt8Array = true;
++  if (!CI) return ""; // we are just called from a handler that was called from getFunctionIndex, only to ensure the handler was run at least once
+   return getAssign(CI) + "(Atomics_compareExchange(HEAP8, " + getValueAsStr(CI->getOperand(0)) + ',' + getValueAsStr(CI->getOperand(1)) + ',' + getValueAsStr(CI->getOperand(2)) + ")|0)";
+ })
+ DEF_CALL_HANDLER(emscripten_atomic_cas_u16, {
+   UsesInt16Array = true;
++  if (!CI) return ""; // we are just called from a handler that was called from getFunctionIndex, only to ensure the handler was run at least once
+   return getAssign(CI) + "(Atomics_compareExchange(HEAP16, " + getShiftedPtr(CI->getOperand(0), 2) + ',' + getValueAsStr(CI->getOperand(1)) + ',' + getValueAsStr(CI->getOperand(2)) + ")|0)";
+ })
+ DEF_CALL_HANDLER(emscripten_atomic_cas_u32, {
+   UsesInt32Array = true;
++  if (!CI) return ""; // we are just called from a handler that was called from getFunctionIndex, only to ensure the handler was run at least once
+   return getAssign(CI) + "(Atomics_compareExchange(HEAP32, " + getShiftedPtr(CI->getOperand(0), 4) + ',' + getValueAsStr(CI->getOperand(1)) + ',' + getValueAsStr(CI->getOperand(2)) + ")|0)";
+ })
+ 
+ DEF_CALL_HANDLER(emscripten_atomic_load_u8, {
+   UsesInt8Array = true;
++  if (!CI) return ""; // we are just called from a handler that was called from getFunctionIndex, only to ensure the handler was run at least once
+   return getAssign(CI) + "(Atomics_load(HEAP8, " + getValueAsStr(CI->getOperand(0)) + ")|0)";
+ })
+ DEF_CALL_HANDLER(emscripten_atomic_load_u16, {
+   UsesInt16Array = true;
++  if (!CI) return ""; // we are just called from a handler that was called from getFunctionIndex, only to ensure the handler was run at least once
+   return getAssign(CI) + "(Atomics_load(HEAP16, " + getShiftedPtr(CI->getOperand(0), 2) + ")|0)";
+ })
+ DEF_CALL_HANDLER(emscripten_atomic_load_u32, {
+   UsesInt32Array = true;
++  if (!CI) return ""; // we are just called from a handler that was called from getFunctionIndex, only to ensure the handler was run at least once
+   return getAssign(CI) + "(Atomics_load(HEAP32, " + getShiftedPtr(CI->getOperand(0), 4) + ")|0)";
+ })
+ DEF_CALL_HANDLER(emscripten_atomic_load_f32, {
+@@ -891,6 +901,7 @@ DEF_CALL_HANDLER(emscripten_atomic_load_f32, {
+   // we must emulate manually.
+   Declares.insert("_Atomics_load_f32_emulated");
+   UsesMathFround = true;
++  if (!CI) return ""; // we are just called from a handler that was called from getFunctionIndex, only to ensure the handler was run at least once
+   return getAssign(CI) + (PreciseF32 ? "Math_fround(" : "+") + "__Atomics_load_f32_emulated(" + getShiftedPtr(CI->getOperand(0), 4) + (PreciseF32 ? "))" : ")");
+ //  return getAssign(CI) + "Atomics_load(HEAPF32, " + getShiftedPtr(CI->getOperand(0), 4) + ')';
+ })
+@@ -898,6 +909,7 @@ DEF_CALL_HANDLER(emscripten_atomic_load_f64, {
+   // TODO: If https://bugzilla.mozilla.org/show_bug.cgi?id=1131624 is implemented, we could use the commented out version. Until then,
+   // we must emulate manually.
+   Declares.insert("emscripten_atomic_load_f64");
++  if (!CI) return ""; // we are just called from a handler that was called from getFunctionIndex, only to ensure the handler was run at least once
+   return getAssign(CI) + "+_emscripten_atomic_load_f64(" + getShiftedPtr(CI->getOperand(0), 8) + ')';
+ //  return getAssign(CI) + "Atomics_load(HEAPF64, " + getShiftedPtr(CI->getOperand(0), 8) + ')';
+ })
+@@ -906,25 +918,30 @@ DEF_CALL_HANDLER(__atomic_load_8, {
+   if (EnablePthreads && OnlyWebAssembly) op = "i64_atomics_load";
+   else if (OnlyWebAssembly) op = "load8";
+   else op = "_emscripten_atomic_load_u64";
++  if (!CI) return ""; // we are just called from a handler that was called from getFunctionIndex, only to ensure the handler was run at least once
+   return getAssign(CI) + '(' + op + '(' + getValueAsStr(CI->getOperand(0)) + ")|0)";
+ })
+ 
+ DEF_CALL_HANDLER(emscripten_atomic_store_u8, {
+   UsesInt8Array = true;
++  if (!CI) return ""; // we are just called from a handler that was called from getFunctionIndex, only to ensure the handler was run at least once
+   return getAssign(CI) + "(Atomics_store(HEAP8, " + getValueAsStr(CI->getOperand(0)) + ',' + getValueAsStr(CI->getOperand(1)) + ")|0)";
+ })
+ DEF_CALL_HANDLER(emscripten_atomic_store_u16, {
+   UsesInt16Array = true;
++  if (!CI) return ""; // we are just called from a handler that was called from getFunctionIndex, only to ensure the handler was run at least once
+   return getAssign(CI) + "(Atomics_store(HEAP16, " + getShiftedPtr(CI->getOperand(0), 2) + ',' + getValueAsStr(CI->getOperand(1)) + ")|0)";
+ })
+ DEF_CALL_HANDLER(emscripten_atomic_store_u32, {
+   UsesInt32Array = true;
++  if (!CI) return ""; // we are just called from a handler that was called from getFunctionIndex, only to ensure the handler was run at least once
+   return getAssign(CI) + "(Atomics_store(HEAP32, " + getShiftedPtr(CI->getOperand(0), 4) + ',' + getValueAsStr(CI->getOperand(1)) + ")|0)";
+ })
+ DEF_CALL_HANDLER(emscripten_atomic_store_f32, {
+   // TODO: If https://bugzilla.mozilla.org/show_bug.cgi?id=1131613 is implemented, we could use the commented out version. Until then,
+   // we must emulate manually.
+   Declares.insert("emscripten_atomic_store_f32");
++  if (!CI) return ""; // we are just called from a handler that was called from getFunctionIndex, only to ensure the handler was run at least once
+   return getAssign(CI) + "_emscripten_atomic_store_f32(" + getShiftedPtr(CI->getOperand(0), 4) + ',' + getValueAsStr(CI->getOperand(1)) + ')';
+ //  return getAssign(CI) + "Atomics_store(HEAPF32, " + getShiftedPtr(CI->getOperand(0), 4) + ',' + getValueAsStr(CI->getOperand(1)) + ')';
+ })
+@@ -932,6 +949,7 @@ DEF_CALL_HANDLER(emscripten_atomic_store_f64, {
+   // TODO: If https://bugzilla.mozilla.org/show_bug.cgi?id=1131624 is implemented, we could use the commented out version. Until then,
+   // we must emulate manually.
+   Declares.insert("emscripten_atomic_store_f64");
++  if (!CI) return ""; // we are just called from a handler that was called from getFunctionIndex, only to ensure the handler was run at least once
+   return getAssign(CI) + "+_emscripten_atomic_store_f64(" + getShiftedPtr(CI->getOperand(0), 8) + ',' + getValueAsStr(CI->getOperand(1)) + ')';
+ //  return getAssign(CI) + "Atomics_store(HEAPF64, " + getShiftedPtr(CI->getOperand(0), 8) + ',' + getValueAsStr(CI->getOperand(1)) + ')';
+ })
+@@ -940,19 +958,23 @@ DEF_CALL_HANDLER(__atomic_store_8, {
+   if (EnablePthreads && OnlyWebAssembly) op = "i64_atomics_store";
+   else if (OnlyWebAssembly) op = "store8";
+   else op = "_emscripten_atomic_store_u64";
++  if (!CI) return ""; // we are just called from a handler that was called from getFunctionIndex, only to ensure the handler was run at least once
+   return std::string("(") + op + '(' + getValueAsStr(CI->getOperand(0)) + ',' + getValueAsStr(CI->getOperand(1)) + ")|0)";
+ })
+ 
+ DEF_CALL_HANDLER(emscripten_atomic_add_u8, {
+   UsesInt8Array = true;
++  if (!CI) return ""; // we are just called from a handler that was called from getFunctionIndex, only to ensure the handler was run at least once
+   return getAssign(CI) + "(Atomics_add(HEAP8, " + getValueAsStr(CI->getOperand(0)) + ',' + getValueAsStr(CI->getOperand(1)) + ")|0)";
+ })
+ DEF_CALL_HANDLER(emscripten_atomic_add_u16, {
+   UsesInt16Array = true;
++  if (!CI) return ""; // we are just called from a handler that was called from getFunctionIndex, only to ensure the handler was run at least once
+   return getAssign(CI) + "(Atomics_add(HEAP16, " + getShiftedPtr(CI->getOperand(0), 2) + ',' + getValueAsStr(CI->getOperand(1)) + ")|0)";
+ })
+ DEF_CALL_HANDLER(emscripten_atomic_add_u32, {
+   UsesInt32Array = true;
++  if (!CI) return ""; // we are just called from a handler that was called from getFunctionIndex, only to ensure the handler was run at least once
+   return getAssign(CI) + "(Atomics_add(HEAP32, " + getShiftedPtr(CI->getOperand(0), 4) + ',' + getValueAsStr(CI->getOperand(1)) + ")|0)";
+ })
+ DEF_CALL_HANDLER(__atomic_fetch_add_8, {
+@@ -960,19 +982,23 @@ DEF_CALL_HANDLER(__atomic_fetch_add_8, {
+   if (EnablePthreads && OnlyWebAssembly) op = "i64_atomics_add";
+   else if (OnlyWebAssembly) op = "i64_add";
+   else op = "__emscripten_atomic_fetch_and_add_u64";
++  if (!CI) return ""; // we are just called from a handler that was called from getFunctionIndex, only to ensure the handler was run at least once
+   return getAssign(CI) + '(' + op + '(' + getValueAsStr(CI->getOperand(0)) + ',' + getValueAsStr(CI->getOperand(1)) + ")|0)";
+ })
+ 
+ DEF_CALL_HANDLER(emscripten_atomic_sub_u8, {
+   UsesInt8Array = true;
++  if (!CI) return ""; // we are just called from a handler that was called from getFunctionIndex, only to ensure the handler was run at least once
+   return getAssign(CI) + "(Atomics_sub(HEAP8, " + getValueAsStr(CI->getOperand(0)) + ',' + getValueAsStr(CI->getOperand(1)) + ")|0)";
+ })
+ DEF_CALL_HANDLER(emscripten_atomic_sub_u16, {
+   UsesInt16Array = true;
++  if (!CI) return ""; // we are just called from a handler that was called from getFunctionIndex, only to ensure the handler was run at least once
+   return getAssign(CI) + "(Atomics_sub(HEAP16, " + getShiftedPtr(CI->getOperand(0), 2) + ',' + getValueAsStr(CI->getOperand(1)) + ")|0)";
+ })
+ DEF_CALL_HANDLER(emscripten_atomic_sub_u32, {
+   UsesInt32Array = true;
++  if (!CI) return ""; // we are just called from a handler that was called from getFunctionIndex, only to ensure the handler was run at least once
+   return getAssign(CI) + "(Atomics_sub(HEAP32, " + getShiftedPtr(CI->getOperand(0), 4) + ',' + getValueAsStr(CI->getOperand(1)) + ")|0)";
+ })
+ DEF_CALL_HANDLER(__atomic_fetch_sub_8, {
+@@ -980,19 +1006,23 @@ DEF_CALL_HANDLER(__atomic_fetch_sub_8, {
+   if (EnablePthreads && OnlyWebAssembly) op = "i64_atomics_sub";
+   else if (OnlyWebAssembly) op = "i64_sub";
+   else op = "__emscripten_atomic_fetch_and_sub_u64";
++  if (!CI) return ""; // we are just called from a handler that was called from getFunctionIndex, only to ensure the handler was run at least once
+   return getAssign(CI) + '(' + op + '(' + getValueAsStr(CI->getOperand(0)) + ',' + getValueAsStr(CI->getOperand(1)) + ")|0)";
+ })
+ 
+ DEF_CALL_HANDLER(emscripten_atomic_and_u8, {
+   UsesInt8Array = true;
++  if (!CI) return ""; // we are just called from a handler that was called from getFunctionIndex, only to ensure the handler was run at least once
+   return getAssign(CI) + "(Atomics_and(HEAP8, " + getValueAsStr(CI->getOperand(0)) + ',' + getValueAsStr(CI->getOperand(1)) + ")|0)";
+ })
+ DEF_CALL_HANDLER(emscripten_atomic_and_u16, {
+   UsesInt16Array = true;
++  if (!CI) return ""; // we are just called from a handler that was called from getFunctionIndex, only to ensure the handler was run at least once
+   return getAssign(CI) + "(Atomics_and(HEAP16, " + getShiftedPtr(CI->getOperand(0), 2) + ',' + getValueAsStr(CI->getOperand(1)) + ")|0)";
+ })
+ DEF_CALL_HANDLER(emscripten_atomic_and_u32, {
+   UsesInt32Array = true;
++  if (!CI) return ""; // we are just called from a handler that was called from getFunctionIndex, only to ensure the handler was run at least once
+   return getAssign(CI) + "(Atomics_and(HEAP32, " + getShiftedPtr(CI->getOperand(0), 4) + ',' + getValueAsStr(CI->getOperand(1)) + ")|0)";
+ })
+ DEF_CALL_HANDLER(__atomic_fetch_and_8, {
+@@ -1000,19 +1030,23 @@ DEF_CALL_HANDLER(__atomic_fetch_and_8, {
+   if (EnablePthreads && OnlyWebAssembly) op = "i64_atomics_and";
+   else if (OnlyWebAssembly) op = "i64_and";
+   else op = "__emscripten_atomic_fetch_and_and_u64";
++  if (!CI) return ""; // we are just called from a handler that was called from getFunctionIndex, only to ensure the handler was run at least once
+   return getAssign(CI) + '(' + op + '(' + getValueAsStr(CI->getOperand(0)) + ',' + getValueAsStr(CI->getOperand(1)) + ")|0)";
+ })
+ 
+ DEF_CALL_HANDLER(emscripten_atomic_or_u8, {
+   UsesInt8Array = true;
++  if (!CI) return ""; // we are just called from a handler that was called from getFunctionIndex, only to ensure the handler was run at least once
+   return getAssign(CI) + "(Atomics_or(HEAP8, " + getValueAsStr(CI->getOperand(0)) + ',' + getValueAsStr(CI->getOperand(1)) + ")|0)";
+ })
+ DEF_CALL_HANDLER(emscripten_atomic_or_u16, {
+   UsesInt16Array = true;
++  if (!CI) return ""; // we are just called from a handler that was called from getFunctionIndex, only to ensure the handler was run at least once
+   return getAssign(CI) + "(Atomics_or(HEAP16, " + getShiftedPtr(CI->getOperand(0), 2) + ',' + getValueAsStr(CI->getOperand(1)) + ")|0)";
+ })
+ DEF_CALL_HANDLER(emscripten_atomic_or_u32, {
+   UsesInt32Array = true;
++  if (!CI) return ""; // we are just called from a handler that was called from getFunctionIndex, only to ensure the handler was run at least once
+   return getAssign(CI) + "(Atomics_or(HEAP32, " + getShiftedPtr(CI->getOperand(0), 4) + ',' + getValueAsStr(CI->getOperand(1)) + ")|0)";
+ })
+ DEF_CALL_HANDLER(__atomic_fetch_or_8, {
+@@ -1020,19 +1054,23 @@ DEF_CALL_HANDLER(__atomic_fetch_or_8, {
+   if (EnablePthreads && OnlyWebAssembly) op = "i64_atomics_or";
+   else if (OnlyWebAssembly) op = "i64_or";
+   else op = "__emscripten_atomic_fetch_and_or_u64";
++  if (!CI) return ""; // we are just called from a handler that was called from getFunctionIndex, only to ensure the handler was run at least once
+   return getAssign(CI) + '(' + op + '(' + getValueAsStr(CI->getOperand(0)) + ',' + getValueAsStr(CI->getOperand(1)) + ")|0)";
+ })
+ 
+ DEF_CALL_HANDLER(emscripten_atomic_xor_u8, {
+   UsesInt8Array = true;
++  if (!CI) return ""; // we are just called from a handler that was called from getFunctionIndex, only to ensure the handler was run at least once
+   return getAssign(CI) + "(Atomics_xor(HEAP8, " + getValueAsStr(CI->getOperand(0)) + ',' + getValueAsStr(CI->getOperand(1)) + ")|0)";
+ })
+ DEF_CALL_HANDLER(emscripten_atomic_xor_u16, {
+   UsesInt16Array = true;
++  if (!CI) return ""; // we are just called from a handler that was called from getFunctionIndex, only to ensure the handler was run at least once
+   return getAssign(CI) + "(Atomics_xor(HEAP16, " + getShiftedPtr(CI->getOperand(0), 2) + ',' + getValueAsStr(CI->getOperand(1)) + ")|0)";
+ })
+ DEF_CALL_HANDLER(emscripten_atomic_xor_u32, {
+   UsesInt32Array = true;
++  if (!CI) return ""; // we are just called from a handler that was called from getFunctionIndex, only to ensure the handler was run at least once
+   return getAssign(CI) + "(Atomics_xor(HEAP32, " + getShiftedPtr(CI->getOperand(0), 4) + ',' + getValueAsStr(CI->getOperand(1)) + ")|0)";
+ })
+ DEF_CALL_HANDLER(__atomic_fetch_xor_8, {
+@@ -1040,6 +1078,7 @@ DEF_CALL_HANDLER(__atomic_fetch_xor_8, {
+   if (EnablePthreads && OnlyWebAssembly) op = "i64_atomics_xor";
+   else if (OnlyWebAssembly) op = "i64_xor";
+   else op = "__emscripten_atomic_fetch_and_xor_u64";
++  if (!CI) return ""; // we are just called from a handler that was called from getFunctionIndex, only to ensure the handler was run at least once
+   return getAssign(CI) + '(' + op + '(' + getValueAsStr(CI->getOperand(0)) + ',' + getValueAsStr(CI->getOperand(1)) + ")|0)";
+ })
+ 
diff --git a/emsdk/patches/dynCall_so.patch b/emsdk/patches/dynCall_so.patch
index 1775655f7..ab379a938 100644
--- a/emsdk/patches/dynCall_so.patch
+++ b/emsdk/patches/dynCall_so.patch
@@ -1,7 +1,7 @@
-diff --git a/emsdk/emscripten/tag-1.38.22/src/support.js b//emsdk/emscripten/tag-1.38.22/src/support.js
+diff --git a/emsdk/emscripten/tag-1.38.30/src/support.js b//emsdk/emscripten/tag-1.38.30/src/support.js
 index 8e1df8e82..4d07d6bef 100644
---- a/emsdk/emscripten/tag-1.38.22/src/support.js
-+++ b/emsdk/emscripten/tag-1.38.22/src/support.js
+--- a/emsdk/emscripten/tag-1.38.30/src/support.js
++++ b/emsdk/emscripten/tag-1.38.30/src/support.js
 @@ -437,7 +437,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
diff --git a/emsdk/patches/lz4_c.patch b/emsdk/patches/lz4_c.patch
index 62f3a761c..cb64076e3 100644
--- a/emsdk/patches/lz4_c.patch
+++ b/emsdk/patches/lz4_c.patch
@@ -1,7 +1,7 @@
-diff --git a/emsdk/emscripten/tag-1.38.22/src/library_lz4.js b/emsdk/emscripten/tag-1.38.22/src/library_lz4.js
+diff --git a/emsdk/emscripten/tag-1.38.30/src/library_lz4.js b/emsdk/emscripten/tag-1.38.30/src/library_lz4.js
 index 4c3f583b7..5291002a4 100644
---- a/emsdk/emscripten/tag-1.38.22/src/library_lz4.js
-+++ b/emsdk/emscripten/tag-1.38.22/src/library_lz4.js
+--- a/emsdk/emscripten/tag-1.38.30/src/library_lz4.js
++++ b/emsdk/emscripten/tag-1.38.30/src/library_lz4.js
 @@ -5,26 +5,14 @@ mergeInto(LibraryManager.library, {
      DIR_MODE: {{{ cDefine('S_IFDIR') }}} | 511 /* 0777 */,
      FILE_MODE: {{{ cDefine('S_IFREG') }}} | 511 /* 0777 */,
diff --git a/emsdk/patches/num_params.patch b/emsdk/patches/num_params.patch
index c7a89aa2b..9372ae369 100644
--- a/emsdk/patches/num_params.patch
+++ b/emsdk/patches/num_params.patch
@@ -1,13 +1,11 @@
-diff --git a/emsdk/binaryen/master/src/passes/FuncCastEmulation.cpp b/emsdk/binaryen/master/src/passes/FuncCastEmulation.cpp
-index 013e9403..d95fc282 100644
---- a/emsdk/binaryen/tag-1.38.22/src/passes/FuncCastEmulation.cpp
-+++ b/emsdk/binaryen/tag-1.38.22/src/passes/FuncCastEmulation.cpp
-@@ -39,7 +39,7 @@ namespace wasm {
+--- a/emsdk/binaryen/tag-1.38.30/src/passes/FuncCastEmulation.cpp	2019-04-03 11:30:13.556074729 -0400
++++ b/emsdk/binaryen/tag-1.38.30/src/passes/FuncCastEmulation.cpp	2019-04-03 11:30:32.817143862 -0400
+@@ -39,7 +39,7 @@
  // This should be enough for everybody. (As described above, we need this
  // to match when dynamically linking, and also dynamic linking is why we
  // can't just detect this automatically in the module we see.)
--static const int NUM_PARAMS = 15;
+-static const int NUM_PARAMS = 16;
 +static const int NUM_PARAMS = 61;   // needed by scipy.odr._odrpack
-
+ 
  // Converts a value to the ABI type of i64.
  static Expression* toABI(Expression* value, Module* module) {