Upgrade emsdk from 3.1.59 to 3.1.62 (microsoft#21421)

### Description Upgrade EM SDK to 3.1.62. ### Motivation and Context The changes are required to clear wasm64 errors.
Honry · Aug 14, 2024 · 6d8de1f · 6d8de1f
1 parent d82f15d
commit 6d8de1f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -7,4 +7,4 @@
 [submodule "cmake/external/emsdk"]
 	path = cmake/external/emsdk
 	url = https://github.com/emscripten-core/emsdk.git
-	branch = 3.1.59
+	branch = 3.1.62
diff --git a/cgmanifests/generated/cgmanifest.json b/cgmanifests/generated/cgmanifest.json
@@ -6,7 +6,7 @@
       "component": {
         "type": "git",
         "git": {
-          "commitHash": "d52c46520124845b1e0e0525f2759299d840143f",
+          "commitHash": "0fde04880048f743056bed17cb0543a42e040fae",
           "repositoryUrl": "https://github.com/emscripten-core/emsdk.git"
         },
         "comments": "git submodule at cmake/external/emsdk"

diff --git a/cmake/external/emsdk b/cmake/external/emsdk
diff --git a/tools/ci_build/build.py b/tools/ci_build/build.py
@@ -464,7 +464,7 @@ def convert_arg_line_to_args(self, arg_line):
     # WebAssembly build
     parser.add_argument("--build_wasm", action="store_true", help="Build for WebAssembly")
     parser.add_argument("--build_wasm_static_lib", action="store_true", help="Build for WebAssembly static library")
-    parser.add_argument("--emsdk_version", default="3.1.59", help="Specify version of emsdk")
+    parser.add_argument("--emsdk_version", default="3.1.62", help="Specify version of emsdk")
 
     parser.add_argument("--enable_wasm_simd", action="store_true", help="Enable WebAssembly SIMD")
     parser.add_argument("--enable_wasm_threads", action="store_true", help="Enable WebAssembly multi-threads support")

diff --git a/tools/ci_build/github/azure-pipelines/templates/linux-wasm-ci.yml b/tools/ci_build/github/azure-pipelines/templates/linux-wasm-ci.yml
@@ -93,15 +93,15 @@ jobs:
       - script: |
           set -ex
           cd '$(Build.SourcesDirectory)/cmake/external/emsdk'
-          ./emsdk install 3.1.59 ccache-git-emscripten-64bit
-          ./emsdk activate 3.1.59 ccache-git-emscripten-64bit
+          ./emsdk install 3.1.62 ccache-git-emscripten-64bit
+          ./emsdk activate 3.1.62 ccache-git-emscripten-64bit
         displayName: 'emsdk install and activate ccache for emscripten'
   - ${{if eq(parameters.WithCache, false)}}:
       - script: |
           set -ex
           cd '$(Build.SourcesDirectory)/cmake/external/emsdk'
-          ./emsdk install 3.1.59
-          ./emsdk activate 3.1.59
+          ./emsdk install 3.1.62
+          ./emsdk activate 3.1.62
         displayName: 'emsdk install and activate ccache for emscripten'
 
   - template: build-linux-wasm-step.yml
+30 −36		.circleci/config.yml
+1 −1		README.md
+26 −0		bazel/README.md
+1 −0		bazel/emscripten_deps.bzl
+2 −2		bazel/emscripten_toolchain/BUILD.bazel
+0 −0		bazel/emscripten_toolchain/default_config
+6 −5		bazel/emscripten_toolchain/link_wrapper.py
+11 −1		bazel/emscripten_toolchain/toolchain.bzl
+22 −13		bazel/emscripten_toolchain/wasm_cc_binary.bzl
+21 −0		bazel/revisions.bzl
+1 −0		bazel/test_secondary_lto_cache/.bazelrc
+4 −0		bazel/test_secondary_lto_cache/.gitignore
+19 −0		bazel/test_secondary_lto_cache/BUILD
+1 −0		bazel/test_secondary_lto_cache/MODULE.bazel
+30 −0		bazel/test_secondary_lto_cache/WORKSPACE
+6 −0		bazel/test_secondary_lto_cache/hello-world.cc
+95 −1		bazel/toolchains.bzl
+1 −1		docker/Dockerfile
+7 −1		emscripten-releases-tags.json
+1 −8		emsdk
+21 −16		emsdk.py
+55 −7		emsdk_manifest.json
+25 −0		scripts/get_release_info.py
+2 −2		scripts/update_node.py
+6 −0		test/test_bazel.ps1
+7 −6		test/test_bazel.sh
+7 −6		test/test_bazel_mac.sh