From 847801f5bef3773d04fcdb0cfba1daa854bbb7d4 Mon Sep 17 00:00:00 2001
From: Yulong Wang <7679871+fs-eire@users.noreply.github.com>
Date: Wed, 26 Jan 2022 14:46:02 -0800
Subject: [PATCH] [wasm] update emscripten v2.0.34 (#10391)

---
 .gitmodules                       | 2 +-
 cmake/CMakeLists.txt              | 1 +
 cmake/external/emsdk              | 2 +-
 cmake/onnxruntime_config.h.in     | 1 +
 cmake/onnxruntime_providers.cmake | 4 ++++
 cmake/onnxruntime_unittests.cmake | 7 +++++++
 tools/ci_build/build.py           | 2 +-
 7 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 5d22836c28..fc01a642c4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -68,7 +68,7 @@
 [submodule "cmake/external/emsdk"]
 	path = cmake/external/emsdk
 	url = https://github.com/emscripten-core/emsdk.git
-	branch = 2.0.26
+	branch = 2.0.34
 [submodule "cmake/external/onnxruntime-extensions"]
 	path = cmake/external/onnxruntime-extensions
 	url = https://github.com/microsoft/onnxruntime-extensions.git
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 185d5c0783..3f1eb8f4fc 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -1019,6 +1019,7 @@ else()
   check_cxx_compiler_flag(-Wdeprecated-anon-enum-enum-conversion HAS_DEPRECATED_ANON_ENUM_ENUM_CONVERSION)
   check_cxx_compiler_flag(-Wundefined-var-template HAS_UNDEFINED_VAR_TEMPLATE)
   check_cxx_compiler_flag(-Wformat-truncation HAS_FORMAT_TRUNCATION)
+  check_cxx_compiler_flag(-Wbitwise-instead-of-logical HAS_BITWISE_INSTEAD_OF_LOGICAL)
 
   if (HAS_TAUTOLOGICAL_POINTER_COMPARE)
     #we may have extra null pointer checkings in debug build, it's not an issue
diff --git a/cmake/external/emsdk b/cmake/external/emsdk
index a3d65c80d3..3acac70a55 160000
--- a/cmake/external/emsdk
+++ b/cmake/external/emsdk
@@ -1 +1 @@
-Subproject commit a3d65c80d32c3e584b7aab41d516a0043b2a5e84
+Subproject commit 3acac70a551c321574732e5bfd67930244bb7151
diff --git a/cmake/onnxruntime_config.h.in b/cmake/onnxruntime_config.h.in
index e31a1ee766..d7cf7fa75c 100644
--- a/cmake/onnxruntime_config.h.in
+++ b/cmake/onnxruntime_config.h.in
@@ -19,4 +19,5 @@
 #cmakedefine HAS_MAYBE_UNINITIALIZED
 #cmakedefine HAS_DEPRECATED_DECLARATIONS
 #cmakedefine HAS_FORMAT_TRUNCATION
+#cmakedefine HAS_BITWISE_INSTEAD_OF_LOGICAL
 #cmakedefine ORT_VERSION "@ORT_VERSION@"
diff --git a/cmake/onnxruntime_providers.cmake b/cmake/onnxruntime_providers.cmake
index 85c0ce3294..058f000924 100644
--- a/cmake/onnxruntime_providers.cmake
+++ b/cmake/onnxruntime_providers.cmake
@@ -236,6 +236,10 @@ if (onnxruntime_REDUCED_OPS_BUILD)
   add_op_reduction_include_dirs(onnxruntime_providers)
 endif()
 
+if (HAS_BITWISE_INSTEAD_OF_LOGICAL)
+  target_compile_options(onnxruntime_providers PRIVATE "-Wno-bitwise-instead-of-logical")
+endif()
+
 if (MSVC)
    target_compile_options(onnxruntime_providers PRIVATE "/bigobj")
    if(onnxruntime_DEV_MODE AND NOT CMAKE_SIZEOF_VOID_P EQUAL 8)
diff --git a/cmake/onnxruntime_unittests.cmake b/cmake/onnxruntime_unittests.cmake
index 341d0a7ad6..56e3181921 100644
--- a/cmake/onnxruntime_unittests.cmake
+++ b/cmake/onnxruntime_unittests.cmake
@@ -817,6 +817,13 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "iOS")
     XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED "NO"
   )
 endif()
+if (onnxruntime_BUILD_WEBASSEMBLY)
+  if (onnxruntime_ENABLE_WEBASSEMBLY_THREADS)
+    set_target_properties(onnx_test_runner PROPERTIES LINK_FLAGS "-s NODERAWFS=1 -s ALLOW_MEMORY_GROWTH=1 -s USE_PTHREADS=1 -s PROXY_TO_PTHREAD=1 -s EXIT_RUNTIME=1")
+  else()
+    set_target_properties(onnx_test_runner PROPERTIES LINK_FLAGS "-s NODERAWFS=1 -s ALLOW_MEMORY_GROWTH=1")
+  endif()
+endif()
 
 target_link_libraries(onnx_test_runner PRIVATE onnx_test_runner_common ${GETOPT_LIB_WIDE} ${onnx_test_libs})
 target_include_directories(onnx_test_runner PRIVATE ${ONNXRUNTIME_ROOT})
diff --git a/tools/ci_build/build.py b/tools/ci_build/build.py
index e4d3375587..c0d2ad04a3 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.26", help="Specify version of emsdk")
+        "--emsdk_version", default="2.0.34", help="Specify version of emsdk")
 
     # Enable onnxruntime-extensions
     parser.add_argument(