From f4b2d3af2b6411d8b85f5c99b65d083185282418 Mon Sep 17 00:00:00 2001
From: Yulong Wang <7679871+fs-eire@users.noreply.github.com>
Date: Mon, 28 Feb 2022 23:52:41 -0800
Subject: [PATCH] Upgrade emsdk to 3.1.3 (#10577)

---
 .gitmodules                                              | 2 +-
 cmake/external/emsdk                                     | 2 +-
 include/onnxruntime/core/common/eigen_common_wrapper.h   | 9 +++++++++
 onnxruntime/core/util/math_cpuonly.h                     | 5 +++++
 tools/ci_build/build.py                                  | 2 +-
 .../github/azure-pipelines/templates/win-wasm-ci.yml     | 2 +-
 6 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 1126c2fdbf..770156842e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -62,7 +62,7 @@
 [submodule "cmake/external/emsdk"]
 	path = cmake/external/emsdk
 	url = https://github.com/emscripten-core/emsdk.git
-	branch = 2.0.34
+	branch = 3.1.3
 [submodule "cmake/external/onnxruntime-extensions"]
 	path = cmake/external/onnxruntime-extensions
 	url = https://github.com/microsoft/onnxruntime-extensions.git
diff --git a/cmake/external/emsdk b/cmake/external/emsdk
index 3acac70a55..fc645b7626 160000
--- a/cmake/external/emsdk
+++ b/cmake/external/emsdk
@@ -1 +1 @@
-Subproject commit 3acac70a551c321574732e5bfd67930244bb7151
+Subproject commit fc645b7626ebf86530dbd82fbece74d457e7ae07
diff --git a/include/onnxruntime/core/common/eigen_common_wrapper.h b/include/onnxruntime/core/common/eigen_common_wrapper.h
index 3ddb4e1e28..20a2757466 100644
--- a/include/onnxruntime/core/common/eigen_common_wrapper.h
+++ b/include/onnxruntime/core/common/eigen_common_wrapper.h
@@ -25,6 +25,15 @@
 #ifdef HAS_CLASS_MEMACCESS
 #pragma GCC diagnostic ignored "-Wclass-memaccess"
 #endif
+
+// cmake/external/eigen\Eigen/src/Core/util/Meta.h:454:25:
+// error: 'result_of<Eigen::internal::scalar_product_op<unsigned long long> (const unsigned long long &, const unsigned long long &)>'
+// is deprecated [-Werror,-Wdeprecated-declarations]
+//   typedef typename std::result_of<T>::type type1;
+#ifdef HAS_DEPRECATED_DECLARATIONS
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
 #elif defined(_MSC_VER)
 // build\windows\debug\external\eigen3\unsupported\eigen\cxx11\src/Tensor/Tensor.h(76):
 // warning C4554: '&': check operator precedence for possible error; use parentheses to clarify precedence
diff --git a/onnxruntime/core/util/math_cpuonly.h b/onnxruntime/core/util/math_cpuonly.h
index 7e70bfc99b..89fe2f61f1 100644
--- a/onnxruntime/core/util/math_cpuonly.h
+++ b/onnxruntime/core/util/math_cpuonly.h
@@ -42,6 +42,11 @@
 #ifdef HAS_CLASS_MEMACCESS
 #pragma GCC diagnostic ignored "-Wclass-memaccess"
 #endif
+
+#ifdef HAS_DEPRECATED_DECLARATIONS
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
 #elif defined(_MSC_VER)
 // build\windows\debug\external\eigen3\unsupported\eigen\cxx11\src/Tensor/Tensor.h(76):
 // warning C4554: '&': check operator precedence for possible error; use parentheses to clarify precedence
diff --git a/tools/ci_build/build.py b/tools/ci_build/build.py
index 7bd961e2af..622ef0ad63 100644
--- a/tools/ci_build/build.py
+++ b/tools/ci_build/build.py
@@ -376,7 +376,7 @@ def parse_arguments():
     parser.add_argument(
         "--wasm_malloc", default="dlmalloc", help="Specify memory allocator for WebAssembly")
     parser.add_argument(
-        "--emsdk_version", default="2.0.34", help="Specify version of emsdk")
+        "--emsdk_version", default="3.1.3", help="Specify version of emsdk")
 
     # Enable onnxruntime-extensions
     parser.add_argument(
diff --git a/tools/ci_build/github/azure-pipelines/templates/win-wasm-ci.yml b/tools/ci_build/github/azure-pipelines/templates/win-wasm-ci.yml
index e480b08c78..9b11971f54 100644
--- a/tools/ci_build/github/azure-pipelines/templates/win-wasm-ci.yml
+++ b/tools/ci_build/github/azure-pipelines/templates/win-wasm-ci.yml
@@ -18,7 +18,7 @@ jobs:
   variables:
     EnvSetupScript: setup_env.bat
     buildArch: x64
-    CommonBuildArgs: '--config ${{ parameters.BuildConfig }} --skip_submodule_sync --cmake_generator "Visual Studio 16 2019" --build_wasm --emsdk_version releases-upstream-823d37b15d1ab61bc9ac0665ceef6951d3703842-64bit ${{ parameters.ExtraBuildArgs }}'
+    CommonBuildArgs: '--config ${{ parameters.BuildConfig }} --skip_submodule_sync --cmake_generator "Visual Studio 16 2019" --build_wasm --emsdk_version releases-upstream-2ddc66235392b37e5b33477fd86cbe01a14b8aa2-64bit ${{ parameters.ExtraBuildArgs }}'
   timeoutInMinutes: 120
   workspace:
     clean: all