update emcc version

mbasso · Jun 13, 2018 · fa4cb20 · fa4cb20
1 parent ee882fc
commit fa4cb20
Show file tree

Hide file tree

Showing 17 changed files with 154 additions and 154 deletions.
diff --git a/Makefile b/Makefile
@@ -86,7 +86,8 @@ ASMJS_OPTIONS = \
 	-s NO_EXIT_RUNTIME=1 \
 	-s NO_FILESYSTEM=1 \
 	-s DISABLE_EXCEPTION_CATCHING=2 \
-	-s EXPORTED_RUNTIME_METHODS=[\'UTF8ToString\']
+	-s EXPORTED_RUNTIME_METHODS=[\'UTF8ToString\'] \
+	-s WASM=0
 
 .PHONY: all install clean lint test test_js test_watch build
 

diff --git a/benchmarks/package.json b/benchmarks/package.json
@@ -6,7 +6,7 @@
     "clean": "rimraf lib dist es .nyc_output compiled",
     "compile": "npm run clean && mkdir -p compiled && npm run compile:cpp && npm run compile:asmjs && npm run compile:wasm",
     "compile:cpp": "emcc -O3 -Wall -Werror --bind ../src/cpp/asm-dom.cpp src/index.cpp -o compiled/app.bc && emcc -O3 -Wall -Werror --bind src/index.cpp -o compiled/app.o",
-    "compile:asmjs": "mkdir -p compiled/asmjs && emcc -O3 --bind --memory-init-file 0 --llvm-lto 3 --llvm-opts 3 --js-opts 1 --js-opts 1 --closure 1 -s MODULARIZE=1 -s \"EXPORTED_RUNTIME_METHODS=['UTF8ToString']\" -s AGGRESSIVE_VARIABLE_ELIMINATION=1 -s ELIMINATE_DUPLICATE_FUNCTIONS=1 -s ABORTING_MALLOC=1 -s NO_EXIT_RUNTIME=1 -s NO_FILESYSTEM=1 -s DISABLE_EXCEPTION_CATCHING=2 compiled/app.bc -o compiled/asmjs/app.asm.js",
+    "compile:asmjs": "mkdir -p compiled/asmjs && emcc -O3 --bind --memory-init-file 0 --llvm-lto 3 --llvm-opts 3 --js-opts 1 --js-opts 1 --closure 1 -s MODULARIZE=1 -s \"EXPORTED_RUNTIME_METHODS=['UTF8ToString']\" -s AGGRESSIVE_VARIABLE_ELIMINATION=1 -s ELIMINATE_DUPLICATE_FUNCTIONS=1 -s ABORTING_MALLOC=1 -s NO_EXIT_RUNTIME=1 -s NO_FILESYSTEM=1 -s DISABLE_EXCEPTION_CATCHING=2 -s WASM=0 compiled/app.bc -o compiled/asmjs/app.asm.js",
     "compile:wasm": "mkdir -p compiled/wasm && emcc -O3 --bind --memory-init-file 0 --llvm-lto 3 --llvm-opts 3 --js-opts 1 --js-opts 1 --closure 1 -s MODULARIZE=1 -s ALLOW_MEMORY_GROWTH=1 -s \"EXPORTED_RUNTIME_METHODS=['UTF8ToString']\" -s AGGRESSIVE_VARIABLE_ELIMINATION=1 -s ABORTING_MALLOC=1 -s NO_EXIT_RUNTIME=1 -s NO_FILESYSTEM=1 -s DISABLE_EXCEPTION_CATCHING=2 -s BINARYEN=1 -s \"BINARYEN_TRAP_MODE='allow'\" compiled/app.bc -o compiled/wasm/app.js",
     "start": "npm run compile && webpack-dev-server --env.dev",
     "build": "npm run compile && npm run build:webpack",

diff --git a/compiled/asm-dom.a b/compiled/asm-dom.a
diff --git a/compiled/asm-dom.bc b/compiled/asm-dom.bc
diff --git a/compiled/asm-dom.o b/compiled/asm-dom.o
diff --git a/compiled/asmjs/asm-dom.asm.js b/compiled/asmjs/asm-dom.asm.js
diff --git a/compiled/wasm/asm-dom.js b/compiled/wasm/asm-dom.js
diff --git a/compiled/wasm/asm-dom.wasm b/compiled/wasm/asm-dom.wasm
diff --git a/dist/js/0.asm-dom.js b/dist/js/0.asm-dom.js
diff --git a/dist/js/0.asm-dom.js.br b/dist/js/0.asm-dom.js.br
diff --git a/dist/js/0.asm-dom.js.gz b/dist/js/0.asm-dom.js.gz
diff --git a/dist/js/1.asm-dom.js b/dist/js/1.asm-dom.js
diff --git a/dist/js/1.asm-dom.js.br b/dist/js/1.asm-dom.js.br
diff --git a/dist/js/1.asm-dom.js.gz b/dist/js/1.asm-dom.js.gz
diff --git a/examples/todomvc - cpp/package.json b/examples/todomvc - cpp/package.json
@@ -6,7 +6,7 @@
     "clean": "rimraf lib dist es .nyc_output compiled",
     "compile": "npm run clean && mkdir -p compiled && npm run compile:cpp && npm run compile:asmjs && npm run compile:wasm",
     "compile:cpp": "emcc -O3 -Wall -Werror --bind ../../src/cpp/asm-dom.cpp src/index.cpp -o compiled/app.bc && emcc -O3 -Wall -Werror --bind src/index.cpp -o compiled/app.o",
-    "compile:asmjs": "mkdir -p compiled/asmjs && emcc -O3 --bind --memory-init-file 0 --llvm-lto 3 --llvm-opts 3 --js-opts 1 --closure 1 -s MODULARIZE=1 -s \"EXPORTED_RUNTIME_METHODS=['UTF8ToString']\" -s AGGRESSIVE_VARIABLE_ELIMINATION=1 -s ELIMINATE_DUPLICATE_FUNCTIONS=1 -s ABORTING_MALLOC=1 -s NO_EXIT_RUNTIME=1 -s NO_FILESYSTEM=1 -s DISABLE_EXCEPTION_CATCHING=2 compiled/app.bc -o compiled/asmjs/app.asm.js",
+    "compile:asmjs": "mkdir -p compiled/asmjs && emcc -O3 --bind --memory-init-file 0 --llvm-lto 3 --llvm-opts 3 --js-opts 1 --closure 1 -s MODULARIZE=1 -s \"EXPORTED_RUNTIME_METHODS=['UTF8ToString']\" -s AGGRESSIVE_VARIABLE_ELIMINATION=1 -s ELIMINATE_DUPLICATE_FUNCTIONS=1 -s ABORTING_MALLOC=1 -s NO_EXIT_RUNTIME=1 -s NO_FILESYSTEM=1 -s DISABLE_EXCEPTION_CATCHING=2 -s WASM=0 compiled/app.bc -o compiled/asmjs/app.asm.js",
     "compile:wasm": "mkdir -p compiled/wasm && emcc -O3 --bind --memory-init-file 0 --llvm-lto 3 --llvm-opts 3 --js-opts 1 --closure 1 -s MODULARIZE=1 -s ALLOW_MEMORY_GROWTH=1 -s \"EXPORTED_RUNTIME_METHODS=['UTF8ToString']\" -s AGGRESSIVE_VARIABLE_ELIMINATION=1 -s ABORTING_MALLOC=1 -s NO_EXIT_RUNTIME=1 -s NO_FILESYSTEM=1 -s DISABLE_EXCEPTION_CATCHING=2 -s BINARYEN=1 -s \"BINARYEN_TRAP_MODE='allow'\" compiled/app.bc -o compiled/wasm/app.js",
     "start": "npm run compile && webpack-dev-server --env.dev",
     "build": "npm run compile && npm run build:webpack",

diff --git a/examples/todomvc - cpx/package.json b/examples/todomvc - cpx/package.json
@@ -7,7 +7,7 @@
     "compile": "npm run clean && mkdir -p compiled && npm run compile:cpx && npm run compile:cpp && npm run compile:asmjs && npm run compile:wasm",
     "compile:cpx": "mkdir -p temp && gccx src",
     "compile:cpp": "emcc -O3 -Wall -Werror --bind ../../src/cpp/asm-dom.cpp temp/index.cpp -o compiled/app.bc && emcc -O3 -Wall -Werror --bind temp/index.cpp -o compiled/app.o",
-    "compile:asmjs": "mkdir -p compiled/asmjs && emcc -O3 --bind --memory-init-file 0 --llvm-lto 3 --llvm-opts 3 --js-opts 1 --closure 1 -s MODULARIZE=1 -s \"EXPORTED_RUNTIME_METHODS=['UTF8ToString']\" -s AGGRESSIVE_VARIABLE_ELIMINATION=1 -s ELIMINATE_DUPLICATE_FUNCTIONS=1 -s ABORTING_MALLOC=1 -s NO_EXIT_RUNTIME=1 -s NO_FILESYSTEM=1 -s DISABLE_EXCEPTION_CATCHING=2 compiled/app.bc -o compiled/asmjs/app.asm.js",
+    "compile:asmjs": "mkdir -p compiled/asmjs && emcc -O3 --bind --memory-init-file 0 --llvm-lto 3 --llvm-opts 3 --js-opts 1 --closure 1 -s MODULARIZE=1 -s \"EXPORTED_RUNTIME_METHODS=['UTF8ToString']\" -s AGGRESSIVE_VARIABLE_ELIMINATION=1 -s ELIMINATE_DUPLICATE_FUNCTIONS=1 -s ABORTING_MALLOC=1 -s NO_EXIT_RUNTIME=1 -s NO_FILESYSTEM=1 -s DISABLE_EXCEPTION_CATCHING=2 -s WASM=0 compiled/app.bc -o compiled/asmjs/app.asm.js",
     "compile:wasm": "mkdir -p compiled/wasm && emcc -O3 --bind --memory-init-file 0 --llvm-lto 3 --llvm-opts 3 --js-opts 1 --closure 1 -s MODULARIZE=1 -s ALLOW_MEMORY_GROWTH=1 -s \"EXPORTED_RUNTIME_METHODS=['UTF8ToString']\" -s AGGRESSIVE_VARIABLE_ELIMINATION=1 -s ABORTING_MALLOC=1 -s NO_EXIT_RUNTIME=1 -s NO_FILESYSTEM=1 -s DISABLE_EXCEPTION_CATCHING=2 -s BINARYEN=1 -s \"BINARYEN_TRAP_MODE='allow'\" compiled/app.bc -o compiled/wasm/app.js",
     "start": "npm run compile && webpack-dev-server --env.dev",
     "build": "npm run compile && npm run build:webpack",

diff --git a/examples/webcomponents - cpp/package.json b/examples/webcomponents - cpp/package.json
@@ -6,7 +6,7 @@
     "clean": "rimraf lib dist es .nyc_output compiled",
     "compile": "npm run clean && mkdir -p compiled && npm run compile:cpp && npm run compile:asmjs && npm run compile:wasm",
     "compile:cpp": "emcc -O3 -Wall -Werror --bind ../../src/cpp/asm-dom.cpp src/index.cpp -o compiled/app.bc && emcc -O3 -Wall -Werror --bind src/index.cpp -o compiled/app.o",
-    "compile:asmjs": "mkdir -p compiled/asmjs && emcc -O3 --bind --memory-init-file 0 --llvm-lto 3 --llvm-opts 3 --js-opts 1 --closure 1 -s MODULARIZE=1 -s \"EXPORTED_RUNTIME_METHODS=['UTF8ToString']\" -s AGGRESSIVE_VARIABLE_ELIMINATION=1 -s ELIMINATE_DUPLICATE_FUNCTIONS=1 -s ABORTING_MALLOC=1 -s NO_EXIT_RUNTIME=1 -s NO_FILESYSTEM=1 -s DISABLE_EXCEPTION_CATCHING=2 compiled/app.bc -o compiled/asmjs/app.asm.js",
+    "compile:asmjs": "mkdir -p compiled/asmjs && emcc -O3 --bind --memory-init-file 0 --llvm-lto 3 --llvm-opts 3 --js-opts 1 --closure 1 -s MODULARIZE=1 -s \"EXPORTED_RUNTIME_METHODS=['UTF8ToString']\" -s AGGRESSIVE_VARIABLE_ELIMINATION=1 -s ELIMINATE_DUPLICATE_FUNCTIONS=1 -s ABORTING_MALLOC=1 -s NO_EXIT_RUNTIME=1 -s NO_FILESYSTEM=1 -s DISABLE_EXCEPTION_CATCHING=2 -s WASM=0 compiled/app.bc -o compiled/asmjs/app.asm.js",
     "compile:wasm": "mkdir -p compiled/wasm && emcc -O3 --bind --memory-init-file 0 --llvm-lto 3 --llvm-opts 3 --js-opts 1 --closure 1 -s MODULARIZE=1 -s ALLOW_MEMORY_GROWTH=1 -s \"EXPORTED_RUNTIME_METHODS=['UTF8ToString']\" -s AGGRESSIVE_VARIABLE_ELIMINATION=1 -s ABORTING_MALLOC=1 -s NO_EXIT_RUNTIME=1 -s NO_FILESYSTEM=1 -s DISABLE_EXCEPTION_CATCHING=2 -s BINARYEN=1 -s \"BINARYEN_TRAP_MODE='allow'\" compiled/app.bc -o compiled/wasm/app.js",
     "start": "npm run compile && webpack-dev-server --env.dev",
     "build": "npm run compile && npm run build:webpack",