Update Emscripten to v2.0.7. (#63)

Signed-off-by: Piotr Sikora <piotrsikora@google.com>

Author: PiotrSikora

Makefile

@@ -18,10 +18,11 @@ ${CPP_API}/libprotobuf.a ${CPP_API}/libprotobuf-lite.a:
 	&& cd wasm-patches && git checkout 4bba8b2f38b5004f87489642b6ca4525ae72fe7f \
 	&& cd .. && git apply wasm-patches/*.patch \
 	&& ./autogen.sh \
-	&& emconfigure ./configure --disable-shared CXXFLAGS="-O3 -flto -s WASM_OBJECT_FILES=0 --llvm-lto 1" \
+	&& emconfigure ./configure --disable-shared CXXFLAGS="-O3 -flto" \
 	&& emmake make \
-	&& cp src/.libs/libprotobuf-lite.a ${CPP_API}/libprotobuf-lite.a \
-	&& cp src/.libs/libprotobuf.a ${CPP_API}/libprotobuf.a
+	&& cd .. \
+	&& cp protobuf-wasm/src/.libs/libprotobuf-lite.a ${CPP_API}/libprotobuf-lite.a \
+	&& cp protobuf-wasm/src/.libs/libprotobuf.a ${CPP_API}/libprotobuf.a
 
 clean:
 	rm -f proxy_wasm_intrinsics.pb.h proxy_wasm_intrinsics_lite.pb.h struct_lite.pb.h ${CPP_API}/libprotobuf.a ${CPP_API}/libprotobuf-lite.a

Makefile.base

@@ -5,7 +5,7 @@ else
 endif
 
 %.wasm: %.cc ${PROXY_WASM_CPP_SDK}/proxy_wasm_intrinsics.h ${PROXY_WASM_CPP_SDK}/proxy_wasm_enums.h ${PROXY_WASM_CPP_SDK}/proxy_wasm_externs.h ${PROXY_WASM_CPP_SDK}/proxy_wasm_api.h ${PROXY_WASM_CPP_SDK}/proxy_wasm_intrinsics.js ${CPP_CONTEXT_LIB}
-	em++ -s STANDALONE_WASM=1 -s EMIT_EMSCRIPTEN_METADATA=1 -s EXPORTED_FUNCTIONS=['_malloc'] --std=c++17 -O3 -flto -s WASM_OBJECT_FILES=0 --llvm-lto 1 -I${PROXY_WASM_CPP_SDK} -I/usr/local/include --js-library ${PROXY_WASM_CPP_SDK}/proxy_wasm_intrinsics.js $*.cc ${PROXY_WASM_CPP_SDK}/proxy_wasm_intrinsics.pb.cc ${CPP_CONTEXT_LIB} ${PROXY_WASM_CPP_SDK}/libprotobuf.a -o $*.wasm
+	em++ --no-entry -s EXPORTED_FUNCTIONS=['_malloc'] --std=c++17 -O3 -flto -I${PROXY_WASM_CPP_SDK} -I/usr/local/include --js-library ${PROXY_WASM_CPP_SDK}/proxy_wasm_intrinsics.js $*.cc ${PROXY_WASM_CPP_SDK}/proxy_wasm_intrinsics.pb.cc ${CPP_CONTEXT_LIB} ${PROXY_WASM_CPP_SDK}/libprotobuf.a -o $*.wasm
 
 clean:
 	rm *.wasm

Makefile.base_lite

@@ -5,7 +5,7 @@ else
 endif
 
 %.wasm %.wat: %.cc ${PROXY_WASM_CPP_SDK}/proxy_wasm_intrinsics.h ${PROXY_WASM_CPP_SDK}/proxy_wasm_enums.h ${PROXY_WASM_CPP_SDK}/proxy_wasm_externs.h ${PROXY_WASM_CPP_SDK}/proxy_wasm_api.h ${PROXY_WASM_CPP_SDK}/proxy_wasm_intrinsics.js ${CPP_CONTEXT_LIB}
-	em++ -s STANDALONE_WASM=1 -s EMIT_EMSCRIPTEN_METADATA=1 -s EXPORTED_FUNCTIONS=['_malloc'] --std=c++17 -O3 -flto -s WASM_OBJECT_FILES=0 --llvm-lto 1 -DPROXY_WASM_PROTOBUF_LITE=1 -I${PROXY_WASM_CPP_SDK} -I/usr/local/include --js-library ${PROXY_WASM_CPP_SDK}/proxy_wasm_intrinsics.js $*.cc ${PROXY_WASM_CPP_SDK}/proxy_wasm_intrinsics_lite.pb.cc ${PROXY_WASM_CPP_SDK}/struct_lite.pb.cc ${CPP_CONTEXT_LIB} ${PROXY_WASM_CPP_SDK}/libprotobuf-lite.a -o $*.wasm
+	em++ --no-entry -s EXPORTED_FUNCTIONS=['_malloc'] --std=c++17 -O3 -flto -DPROXY_WASM_PROTOBUF_LITE=1 -I${PROXY_WASM_CPP_SDK} -I/usr/local/include --js-library ${PROXY_WASM_CPP_SDK}/proxy_wasm_intrinsics.js $*.cc ${PROXY_WASM_CPP_SDK}/proxy_wasm_intrinsics_lite.pb.cc ${PROXY_WASM_CPP_SDK}/struct_lite.pb.cc ${CPP_CONTEXT_LIB} ${PROXY_WASM_CPP_SDK}/libprotobuf-lite.a -o $*.wasm
 
 clean:
 	rm *.wasm

README.md

@@ -110,7 +110,7 @@ all: plugin.wasm
 
 %.wasm %.wat: %.cc ${CPP_API}/proxy_wasm_intrinsics.h ${CPP_API}/proxy_wasm_enums.h ${CPP_API}/proxy_wasm_externs.h ${CPP_API}/proxy_wasm_api.h ${CPP_API}/proxy_wasm_intrinsics.js ${CPP_CONTEXT_LIB}
         ls /root
-                em++ -s STANDALONE_WASM=1 -s EMIT_EMSCRIPTEN_METADATA=1 -s EXPORTED_FUNCTIONS=['_malloc'] --std=c++17 -O3 -flto -s WASM_OBJECT_FILES=0 --llvm-lto 1 -I${CPP_API} -I${CPP_API}/google/protobuf -I/usr/local/include -I${ABSL} --js-library ${CPP_API}/proxy_wasm_intrinsics.js ${ABSL_CPP} $*.cc ${CPP_API}/proxy_wasm_intrinsics.pb.cc ${CPP_CONTEXT_LIB} ${CPP_API}/libprotobuf.a -o $*.wasm
+                em++ --no-entry -s EXPORTED_FUNCTIONS=['_malloc'] --std=c++17 -O3 -flto -I${CPP_API} -I${CPP_API}/google/protobuf -I/usr/local/include -I${ABSL} --js-library ${CPP_API}/proxy_wasm_intrinsics.js ${ABSL_CPP} $*.cc ${CPP_API}/proxy_wasm_intrinsics.pb.cc ${CPP_CONTEXT_LIB} ${CPP_API}/libprotobuf.a -o $*.wasm
 ```
 
 Precompiled abseil libraries are also available, so the above can also be done as:
@@ -126,7 +126,7 @@ all: plugin.wasm
 
 %.wasm %.wat: %.cc ${CPP_API}/proxy_wasm_intrinsics.h ${CPP_API}/proxy_wasm_enums.h ${CPP_API}/proxy_wasm_externs.h ${CPP_API}/proxy_wasm_api.h ${CPP_API}/proxy_wasm_intrinsics.js ${CPP_CONTEXT_LIB}
         ls /root
-                em++ -s STANDALONE_WASM=1 -s EMIT_EMSCRIPTEN_METADATA=1 -s EXPORTED_FUNCTIONS=['_malloc'] --std=c++17 -O3 -flto -s WASM_OBJECT_FILES=0 --llvm-lto 1 -I${CPP_API} -I${CPP_API}/google/protobuf -I/usr/local/include -I${ABSL} --js-library ${CPP_API}/proxy_wasm_intrinsics.js  $*.cc ${CPP_API}/proxy_wasm_intrinsics.pb.cc ${CPP_CONTEXT_LIB} ${CPP_API}/libprotobuf.a ${ABSL_LIBS} -o $*.wasm
+                em++ --no-entry -s EXPORTED_FUNCTIONS=['_malloc'] --std=c++17 -O3 -flto -I${CPP_API} -I${CPP_API}/google/protobuf -I/usr/local/include -I${ABSL} --js-library ${CPP_API}/proxy_wasm_intrinsics.js  $*.cc ${CPP_API}/proxy_wasm_intrinsics.pb.cc ${CPP_CONTEXT_LIB} ${CPP_API}/libprotobuf.a ${ABSL_LIBS} -o $*.wasm
 ```
 
 ### Ownership of the resulting .wasm files
@@ -175,8 +175,8 @@ sudo make install
 git clone https://github.com/emscripten-core/emsdk.git
 cd emsdk
 ./emsdk update-tags
-./emsdk install 1.39.2
-./emsdk activate 1.39.2
+./emsdk install 2.0.7
+./emsdk activate 2.0.7
 
 source ./emsdk\_env.sh
 ```
@@ -189,7 +189,7 @@ It is possible later versions will work, e.g.
 ./emsdk activate latest
 ```
 
-However 1.39.2 is known to work.
+However 2.0.7 is known to work.
 
 ### Rebuilding the libprotobuf.a files
 
@@ -203,10 +203,11 @@ git clone https://github.com/kwonoj/protobuf-wasm wasm-patches
 cd wasm-patches && git checkout 4bba8b2f38b5004f87489642b6ca4525ae72fe7f && cd ..
 git apply wasm-patches/*.patch
 ./autogen.sh
-emconfigure ./configure --disable-shared CXXFLAGS="-O3 -flto -s WASM_OBJECT_FILES=0 --llvm-lto 1"
+emconfigure ./configure --disable-shared CXXFLAGS="-O3 -flto"
 emmake make
-cp src/.libs/libprotobuf-lite.a ${CPP_API}/libprotobuf-lite.a
-cp src/.libs/libprotobuf.a ${CPP_API}/libprotobuf.a
+cd ..
+cp protobuf-wasm/src/.libs/libprotobuf-lite.a ${CPP_API}/libprotobuf-lite.a
+cp protobuf-wasm/src/.libs/libprotobuf.a ${CPP_API}/libprotobuf.a
 ```
 
 ### WAVM binaries

WORKSPACE

@@ -9,11 +9,12 @@ http_archive(
     name = "emscripten_toolchain",
     build_file = "//:emscripten-toolchain.BUILD",
     patch_cmds = [
-        "./emsdk install 1.39.19-upstream",
-        "./emsdk activate --embedded 1.39.19-upstream",
+        "./emsdk install 2.0.7",
+        "./emsdk activate --embedded 2.0.7",
     ],
-    strip_prefix = "emsdk-dec8a63594753fe5f4ad3b47850bf64d66c14a4e",
-    url = "https://github.com/emscripten-core/emsdk/archive/dec8a63594753fe5f4ad3b47850bf64d66c14a4e.tar.gz",
+    strip_prefix = "emsdk-2.0.7",
+    url = "https://github.com/emscripten-core/emsdk/archive/2.0.7.tar.gz",
+    sha256 = "ce7a5c76e8b425aca874cea329fd9ac44b203b777053453b6a37b4496c5ce34f"
 )
 
 # required by com_google_protobuf

libprotobuf-lite.a

@@ -51,16 +51,16 @@ rm -rf protobuf
 git clone https://github.com/emscripten-core/emsdk.git
 cd emsdk
 ./emsdk update-tags
-./emsdk install 1.39.2
-./emsdk activate 1.39.2
+./emsdk install 2.0.7
+./emsdk activate 2.0.7
 source ./emsdk_env.sh
 cd
 
 # abseil (optional)
 git clone https://github.com/abseil/abseil-cpp
 cd abseil-cpp
 git checkout 14550beb3b7b97195e483fb74b5efb906395c31e -b Jul302019 # Jul 30 2019
-emconfigure cmake -DCMAKE_CXX_STANDARD=17 "."
+emcmake cmake -DCMAKE_CXX_STANDARD=17 "."
 emmake make
 cd
 

libprotobuf.a

@@ -131,7 +131,7 @@ def _impl(ctx):
                 actions = [ACTION_NAMES.c_compile, ACTION_NAMES.cpp_compile],
                 flag_groups = [
                     flag_group(
-                        flags = ["-O3", "-ffunction-sections", "-fdata-sections", "--llvm-lto", "1", "-flto"],
+                        flags = ["-O3", "-ffunction-sections", "-fdata-sections", "-flto"],
                     ),
                 ],
             ),
@@ -141,7 +141,7 @@ def _impl(ctx):
                     ACTION_NAMES.cpp_link_nodeps_dynamic_library,
                     ACTION_NAMES.cpp_link_executable,
                 ],
-                flag_groups = [flag_group(flags = ["-O3", "-Wl,--gc-sections", "--llvm-lto", "1", "-flto"])],
+                flag_groups = [flag_group(flags = ["-O3", "-Wl,--gc-sections", "-flto"])],
             ),
         ],
     )

sdk_container.sh

@@ -31,7 +31,9 @@ export EMCC_WASM_BACKEND=1
 
 #echo "$(pwd)/external/emscripten_toolchain/emsdk_env.sh"
 #realpath "external/emscripten_toolchain/emsdk_env.sh"
-source "${EMSCRIPTEN_ROOT}/emsdk_env.sh"
+pushd "${EMSCRIPTEN_ROOT}"
+source "./emsdk_env.sh"
+popd
 
  # the emscripten sdk does some path comparison, so make EM_CACHE an absolute path to make it work. 
 mkdir -p "${TOOLCHAIN_ROOT}/tmp/emscripten_cache"

toolchain/cc_toolchain_config.bzl

@@ -18,14 +18,14 @@ set -euo pipefail
 
 . $(dirname $0)/common.sh
 
-emcc -s EMIT_EMSCRIPTEN_METADATA=1 -s STANDALONE_WASM=1 -s EXPORTED_FUNCTIONS=['_malloc','_free'] "$@"
+emcc --no-entry -s EXPORTED_FUNCTIONS=['_malloc'] "$@"
 
 # clang doesn't support `-no-canonical-system-headers` so sed it
 # find the .d file in the args and fix it:
 
 for arg in "$@"
 do
-    if [ ${arg: -2} == ".d" ]; then
+    if [ "${arg: -2}" == ".d" ]; then
         echo Fixing $arg
         sed -e 's%[^ ]*/external/emscripten_toolchain/upstream/emscripten/system/%external/emscripten_toolchain/upstream/emscripten/system/%' $arg > $arg.tmp
         mv $arg.tmp $arg