Avoid use of -sLLD_REPORT_UNDEFINED=0

This reverts commit e42c903.
hoodmane · Dec 25, 2022 · d1798d8 · d1798d8
1 parent 8bcb426
commit d1798d8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/build.sh b/build.sh
@@ -38,8 +38,6 @@ export LDFLAGS="-L$TARGET/lib -O3 -sEXPORTED_FUNCTIONS=_main,_malloc,_free -sALL
 if [ "$WASM_BIGINT" = "true" ]; then
   export LDFLAGS+=" -sWASM_BIGINT"
 fi
-# Ensure the `ffi_call` symbol can be found at link time
-export LDFLAGS+=" -sLLD_REPORT_UNDEFINED=0"
 
 # Build paths
 export CPATH="$TARGET/include"

diff --git a/src/wasm32/ffi.c b/src/wasm32/ffi.c
@@ -170,7 +170,7 @@ unbox_small_structs, (ffi_type type_ptr), {
 
 EM_JS_MACROS(
 void,
-ffi_call, (ffi_cif * cif, ffi_fp fn, void *rvalue, void **avalue),
+ffi_call_helper, (ffi_cif *cif, ffi_fp fn, void *rvalue, void **avalue),
 {
   var abi = CIF__ABI(cif);
   var nargs = CIF__NARGS(cif);
@@ -392,6 +392,10 @@ ffi_call, (ffi_cif * cif, ffi_fp fn, void *rvalue, void **avalue),
   }
 });
 
+void ffi_call(ffi_cif *cif, void (*fn)(void), void *rvalue, void **avalue) {
+  ffi_call_helper(cif, fn, rvalue, avalue);
+}
+
 #define CLOSURE__wrapper(addr) DEREF_U32(addr, 0)
 #define CLOSURE__cif(addr) DEREF_U32(addr, 1)
 #define CLOSURE__fun(addr) DEREF_U32(addr, 2)

diff --git a/testsuite/emscripten-test-stuff/node-tests.sh b/testsuite/emscripten-test-stuff/node-tests.sh
@@ -23,8 +23,6 @@ export LDFLAGS="-O3 -sEXPORTED_FUNCTIONS=_main,_malloc,_free -sALLOW_TABLE_GROWT
 if [ "$WASM_BIGINT" = "true" ]; then
   export LDFLAGS+=" -sWASM_BIGINT"
 fi
-# Ensure the `ffi_call` symbol can be found at link time
-export LDFLAGS+=" -sLLD_REPORT_UNDEFINED=0"
 
 # Specific variables for cross-compilation
 export CHOST="wasm32-unknown-linux" # wasm32-unknown-emscripten