add build flag to fix deadlock

add build flag to fix deadlock; set EXEEXT=.html when building wasm target
cisco · Feb 20, 2023 · b2a2660 · b2a2660
1 parent 24a19f8
commit b2a2660
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/Makefile b/Makefile
@@ -194,8 +194,10 @@ endif
 
 test: codec_unittest$(EXEEXT)
 ifeq ($(BUILD_UT_EXE), Yes)
+ifneq (wasm,$(OS))
 	./codec_unittest
 endif
+endif
 
 else
 test:

diff --git a/build/mktargets.py b/build/mktargets.py
@@ -268,16 +268,7 @@ def find_sources():
 if args.binary is not None:
     f.write("%s$(EXEEXT): $(%s_OBJS) $(%s_DEPS)\n"%(args.binary, PREFIX, PREFIX))
     f.write("\t$(QUIET_CXX)$(CXX) $(CXX_LINK_O) $(%s_OBJS) $(%s_LDFLAGS) $(LDFLAGS)\n\n"%(PREFIX, PREFIX))
-    # for wasm build
-    f.write("%s.html: $(%s_OBJS) $(%s_DEPS)\n"%(args.binary, PREFIX, PREFIX))
-    f.write("\t$(QUIET_CXX)$(CXX) $(CXX_LINK_O) $(%s_OBJS) $(%s_LDFLAGS) $(LDFLAGS)\n\n"%(PREFIX, PREFIX))
-
-    f.write("ifeq ($(OS), wasm)\n")
-    f.write("binaries: %s.html\n"%args.binary)
-    f.write("BINARIES += %s.html\n"%args.binary)
-    f.write("else\n")
     f.write("binaries: %s$(EXEEXT)\n"%args.binary)
     f.write("BINARIES += %s$(EXEEXT)\n"%args.binary)
-    f.write("endif")
 
 f.close()
diff --git a/build/platform-wasm.mk b/build/platform-wasm.mk
@@ -1,14 +1,15 @@
 include $(SRC_PATH)build/arch.mk
+EXEEXT = .html
 SHAREDLIBSUFFIX = so
 SHAREDLIBSUFFIXFULLVER=$(SHAREDLIBSUFFIX).$(FULL_VERSION)
 SHAREDLIBSUFFIXMAJORVER=$(SHAREDLIBSUFFIX).$(SHAREDLIB_MAJORVERSION)
 SHLDFLAGS = -Wl,-soname,$(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXMAJORVER)
 CFLAGS += -Wall -fno-strict-aliasing -fPIC -MMD -MP 
 # fix undifined symbol: __stack_chk_guard bug
 # flags needed to build wasm
-CFLAGS += -U_FORTIFY_SOURCE -pthread -DWASMSIMD -msimd128 -sINITIAL_MEMORY=104857600 
-CXXFLAGS += -U_FORTIFY_SOURCE -pthread -DWASMSIMD -msimd128 -sINITIAL_MEMORY=104857600
-LDFLAGS += -U_FORTIFY_SOURCE -pthread -msimd128 -sINITIAL_MEMORY=104857600
+CFLAGS += -U_FORTIFY_SOURCE -pthread -DWASMSIMD -msimd128 -sINITIAL_MEMORY=134217728 -sALLOW_MEMORY_GROWTH -sPROXY_TO_PTHREAD -sEXIT_RUNTIME 
+CXXFLAGS += -U_FORTIFY_SOURCE -pthread -DWASMSIMD -msimd128 -sINITIAL_MEMORY=134217728 -sALLOW_MEMORY_GROWTH -sPROXY_TO_PTHREAD -sEXIT_RUNTIME 
+LDFLAGS += -U_FORTIFY_SOURCE -pthread -msimd128 -sINITIAL_MEMORY=134217728 -sALLOW_MEMORY_GROWTH -sPROXY_TO_PTHREAD -sEXIT_RUNTIME 
 ifeq ($(EMFS), nodefs)
 CFLAGS += -DNODEFS
 CXXFLAGS += -DNODEFS