Base commit for using EMSDK 3.1.74 (LTO disabled)

microsoft · Jan 14, 2025 · af1e75f · af1e75f
1 parent 444fceb
commit af1e75f
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 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.74
diff --git a/cgmanifests/generated/cgmanifest.json b/cgmanifests/generated/cgmanifest.json
@@ -6,7 +6,7 @@
       "component": {
         "type": "git",
         "git": {
-          "commitHash": "d52c46520124845b1e0e0525f2759299d840143f",
+          "commitHash": "3d6d8ee910466516a53e665b86458faa81dae9ba",
           "repositoryUrl": "https://github.com/emscripten-core/emsdk.git"
         },
         "comments": "git submodule at cmake/external/emsdk"

diff --git a/cmake/adjust_global_compile_flags.cmake b/cmake/adjust_global_compile_flags.cmake
@@ -29,8 +29,8 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
     # (2) "-flto=thin" does not work correctly for wasm-ld.
     #     we don't set onnxruntime_ENABLE_LTO because it appends flag "-flto=thin"
     #     instead, we manually set CMAKE_CXX_FLAGS "-flto"
-    string(APPEND CMAKE_C_FLAGS " -flto")
-    string(APPEND CMAKE_CXX_FLAGS " -flto")
+    #string(APPEND CMAKE_C_FLAGS " -flto")
+    #string(APPEND CMAKE_CXX_FLAGS " -flto")
   endif()
 
   if (onnxruntime_ENABLE_WEBASSEMBLY_DEBUG_INFO)
@@ -372,4 +372,4 @@ endif()
 
 if (onnxruntime_USE_EXTENSIONS)
     include_directories(${REPO_ROOT}/include/onnxruntime/core/session)
-endif()
+endif()
diff --git a/cmake/external/emsdk b/cmake/external/emsdk
diff --git a/tools/ci_build/build.py b/tools/ci_build/build.py
@@ -478,7 +478,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.74", 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
@@ -86,15 +86,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.74 ccache-git-emscripten-64bit
+          ./emsdk activate 3.1.74 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.74
+          ./emsdk activate 3.1.74
         displayName: 'emsdk install and activate ccache for emscripten'
 
   - template: build-linux-wasm-step.yml
+31 −37		.circleci/config.yml
+17 −17		.flake8
+39 −0		.github/workflows/create-release.yml
+78 −0		.github/workflows/tag-release.yml
+4 −3		README.md
+35 −9		bazel/README.md
+23 −6		bazel/deps.bzl
+19 −17		bazel/emscripten_deps.bzl
+3 −3		bazel/emscripten_toolchain/BUILD.bazel
+0 −0		bazel/emscripten_toolchain/default_config
+7 −6		bazel/emscripten_toolchain/link_wrapper.py
+13 −3		bazel/emscripten_toolchain/toolchain.bzl
+22 −13		bazel/emscripten_toolchain/wasm_cc_binary.bzl
+105 −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
+2 −2		docker/Dockerfile
+31 −1		emscripten-releases-tags.json
+1 −11		emsdk
+0 −21		emsdk.bat
+1 −9		emsdk.ps1
+67 −35		emsdk.py
+2 −0		emsdk_env.fish
+30 −324		emsdk_manifest.json
+16 −8		scripts/create_release.py
+44 −0		scripts/get_emscripten_revision_info.py
+25 −0		scripts/get_release_info.py
+1 −1		scripts/update_bazel_workspace.py
+15 −11		scripts/update_node.py
+12 −22		scripts/update_python.py
+19 −0		scripts/zip.py
+1 −1		test/test.bat
+7 −7		test/test.py
+0 −7		test/test_activation.ps1
+6 −0		test/test_bazel.ps1
+7 −6		test/test_bazel.sh
+7 −6		test/test_bazel_mac.sh
+0 −3		test/test_path_preservation.ps1