diff options
author | Zoltan Varga <vargaz@gmail.com> | 2019-10-23 03:09:07 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-23 03:09:07 +0300 |
commit | 745e5ba3c35c31721e45b6a4772bc524071ff95e (patch) | |
tree | 20b02c993aa36306a39fdb3e228522be8eae446e /sdks | |
parent | d08713198fc89cb35398e0d0e7ed05a1ebec979d (diff) |
[wasm] Bump emscripten to 1.39.0. (#17484)
* [wasm] Bump emscripten to 1.39.0.
* [wasm] Fix threads build.
Diffstat (limited to 'sdks')
-rw-r--r-- | sdks/builds/wasm.mk | 6 | ||||
-rw-r--r-- | sdks/wasm/Makefile | 5 | ||||
-rw-r--r-- | sdks/wasm/packager.cs | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/sdks/builds/wasm.mk b/sdks/builds/wasm.mk index 8e7e142dd3f..e03a0d69ce6 100644 --- a/sdks/builds/wasm.mk +++ b/sdks/builds/wasm.mk @@ -1,7 +1,7 @@ #emcc has lots of bash'isms SHELL:=/bin/bash -EMSCRIPTEN_VERSION=1.38.48 +EMSCRIPTEN_VERSION=1.39.0 EMSCRIPTEN_LOCAL_SDK_DIR=$(TOP)/sdks/builds/toolchains/emsdk EMSCRIPTEN_SDK_DIR ?= $(EMSCRIPTEN_LOCAL_SDK_DIR) @@ -40,8 +40,8 @@ $(EMSCRIPTEN_SDK_DIR)/.emscripten: | $(EMSCRIPTEN_SDK_DIR) touch $@ .stamp-wasm-install-and-select-$(EMSCRIPTEN_VERSION): .stamp-wasm-checkout-and-update-emsdk $(EMSCRIPTEN_SDK_DIR)/.emscripten - cd $(TOP)/sdks/builds/toolchains/emsdk && ./emsdk install $(EMSCRIPTEN_VERSION)-upstream - cd $(TOP)/sdks/builds/toolchains/emsdk && ./emsdk activate --embedded $(EMSCRIPTEN_VERSION)-upstream + cd $(TOP)/sdks/builds/toolchains/emsdk && ./emsdk install $(EMSCRIPTEN_VERSION) + cd $(TOP)/sdks/builds/toolchains/emsdk && ./emsdk activate --embedded $(EMSCRIPTEN_VERSION) cd $(TOP)/sdks/builds/toolchains/emsdk/upstream/emscripten && (patch -N -p1 < $(TOP)/sdks/builds/fix-emscripten-8511.diff; exit 0) cd $(TOP)/sdks/builds/toolchains/emsdk/upstream/emscripten && (patch -N -p1 < $(TOP)/sdks/builds/emscripten-pr-8457.diff; exit 0) touch $@ diff --git a/sdks/wasm/Makefile b/sdks/wasm/Makefile index 88424d61092..e7692922118 100644 --- a/sdks/wasm/Makefile +++ b/sdks/wasm/Makefile @@ -121,6 +121,7 @@ emsdk_env.sh: cd $(EMSCRIPTEN_SDK_DIR) && ./emsdk construct_env $(CURDIR)/emsdk_env.sh MONO_LIBS = $(TOP)/sdks/out/wasm-runtime-release/lib/{libmono-ee-interp.a,libmono-native.a,libmono-icall-table.a,libmonosgen-2.0.a,libmono-ilgen.a} +MONO_THREADS_LIBS = $(TOP)/sdks/out/wasm-runtime-threads-release/lib/{libmono-ee-interp.a,libmono-native.a,libmono-icall-table.a,libmonosgen-2.0.a,libmono-ilgen.a} MONO_DYNAMIC_LIBS = $(TOP)/sdks/out/wasm-runtime-dynamic-release/lib/{libmono-ee-interp.a,libmono-native.a,libmono-icall-table.a,libmonosgen-2.0.a,libmono-ilgen.a} EMCC_FLAGS=-s WASM=1 -s ALLOW_MEMORY_GROWTH=1 -s BINARYEN=1 -s ALIASING_FUNCTION_POINTERS=0 -s NO_EXIT_RUNTIME=1 -s "EXTRA_EXPORTED_RUNTIME_METHODS=['ccall', 'FS_createPath', 'FS_createDataFile', 'cwrap', 'setValue', 'getValue', 'UTF8ToString', 'addFunction']" -s USE_ZLIB=1 -s "EXPORTED_FUNCTIONS=['_putchar']" --source-map-base http://example.com -s WASM_OBJECT_FILES=0 @@ -165,8 +166,8 @@ endef $(eval $(call InterpBuildTemplate,debug,wasm-runtime-release,$(EMCC_DEBUG_FLAGS),$(MONO_LIBS))) $(eval $(call InterpBuildTemplate,release,wasm-runtime-release,$(EMCC_RELEASE_FLAGS),$(MONO_LIBS))) ifdef ENABLE_WASM_THREADS -$(eval $(call InterpBuildTemplate,threads-debug,wasm-runtime-threads-release,$(EMCC_DEBUG_FLAGS) $(EMCC_THREADS_FLAGS),$(MONO_LIBS))) -$(eval $(call InterpBuildTemplate,threads-release,wasm-runtime-threads-release,$(EMCC_RELEASE_FLAGS) $(EMCC_THREADS_FLAGS),$(MONO_LIBS))) +$(eval $(call InterpBuildTemplate,threads-debug,wasm-runtime-threads-release,$(EMCC_DEBUG_FLAGS) $(EMCC_THREADS_FLAGS),$(MONO_THREADS_LIBS))) +$(eval $(call InterpBuildTemplate,threads-release,wasm-runtime-threads-release,$(EMCC_RELEASE_FLAGS) $(EMCC_THREADS_FLAGS),$(MONO_THREADS_LIBS))) endif ifdef ENABLE_WASM_DYNAMIC_RUNTIME $(eval $(call InterpBuildTemplate,release-dynamic,wasm-runtime-dynamic-release,$(EMCC_RELEASE_DYNAMIC_FLAGS),$(MONO_DYNAMIC_LIBS))) diff --git a/sdks/wasm/packager.cs b/sdks/wasm/packager.cs index f12fe290a60..51d5f4f4d21 100644 --- a/sdks/wasm/packager.cs +++ b/sdks/wasm/packager.cs @@ -687,7 +687,6 @@ class Driver { var interp_files = new List<string> { "mono.js", "mono.wasm" }; if (enable_threads) { interp_files.Add ("mono.worker.js"); - interp_files.Add ("mono.js.mem"); } foreach (var fname in interp_files) { File.Delete (Path.Combine (out_prefix, fname)); @@ -881,7 +880,6 @@ class Driver { ninja.WriteLine ("build $appdir/mono.wasm: cpifdiff $wasm_runtime_dir/mono.wasm"); if (enable_threads) { ninja.WriteLine ("build $appdir/mono.worker.js: cpifdiff $wasm_runtime_dir/mono.worker.js"); - ninja.WriteLine ("build $appdir/mono.js.mem: cpifdiff $wasm_runtime_dir/mono.js.mem"); } } if (enable_aot) |