diff --git a/Makefile b/Makefile
index ee73d73b..9ca4ee8b 100644
--- a/Makefile
+++ b/Makefile
@@ -934,7 +934,7 @@ install: finish
 $(SYSROOT_SHARE)/defined-symbols.txt: startup_files libc
 	mkdir -p "$(SYSROOT_SHARE)"
 	"$(NM)" --defined-only \
-	    $(SYSROOT_LIB)/libc.a $(SYSROOT_LIB)/libwasi-emulated-*.a $(SYSROOT_LIB)/*.o \
+	    $(SYSROOT_LIB)/*.a $(SYSROOT_LIB)/*.o \
 	    |grep ' [[:upper:]] ' \
 	    |sed 's/.* [[:upper:]] //' \
 	    |LC_ALL=C sort \
@@ -946,7 +946,7 @@ $(SYSROOT_SHARE)/undefined-symbols.txt: $(SYSROOT_SHARE)/defined-symbols.txt
 	@# LLVM PR40497, which is fixed in 9.0, but not in 8.0.
 	@# Ignore certain llvm builtin symbols such as those starting with __mul
 	@# since these dependencies can vary between llvm versions.
-	for undef_sym in $$("$(NM)" --undefined-only $(SYSROOT_LIB)/libc.a $(SYSROOT_LIB)/libc-*.a $(SYSROOT_LIB)/*.o |grep ' U ' |sed 's/.* U //' |LC_ALL=C sort |uniq); do \
+	for undef_sym in $$("$(NM)" --undefined-only $(SYSROOT_LIB)/*.a $(SYSROOT_LIB)/*.o |grep ' U ' |sed 's/.* U //' |LC_ALL=C sort |uniq); do \
 	    grep -q '\<'$$undef_sym'\>' "$<" || echo $$undef_sym; \
 	done | grep -E -v "^__mul|__memory_base|__indirect_function_table|__tls_base" > "$@"
 
diff --git a/expected/wasm32-wasip1-threads/defined-symbols.txt b/expected/wasm32-wasip1-threads/defined-symbols.txt
index 2218541b..f7cbd98b 100644
--- a/expected/wasm32-wasip1-threads/defined-symbols.txt
+++ b/expected/wasm32-wasip1-threads/defined-symbols.txt
@@ -20,6 +20,7 @@ __atexit_lockptr
 __c_dot_utf8
 __c_dot_utf8_locale
 __c_locale
+__c_longjmp
 __clock
 __clock_gettime
 __clock_nanosleep
@@ -402,6 +403,9 @@ __wasilibc_tell
 __wasilibc_unlinkat
 __wasilibc_utimens
 __wasm_call_dtors
+__wasm_longjmp
+__wasm_setjmp
+__wasm_setjmp_test
 __wcscoll_l
 __wcsftime_l
 __wcsxfrm_l
@@ -575,6 +579,10 @@ difftime
 dirfd
 dirname
 div
+dlclose
+dlerror
+dlopen
+dlsym
 dprintf
 drand48
 drem
diff --git a/expected/wasm32-wasip1/defined-symbols.txt b/expected/wasm32-wasip1/defined-symbols.txt
index 6e06d64f..83fe8143 100644
--- a/expected/wasm32-wasip1/defined-symbols.txt
+++ b/expected/wasm32-wasip1/defined-symbols.txt
@@ -17,6 +17,7 @@ __assert_fail
 __c_dot_utf8
 __c_dot_utf8_locale
 __c_locale
+__c_longjmp
 __clock
 __clock_gettime
 __clock_nanosleep
@@ -373,6 +374,9 @@ __wasilibc_tell
 __wasilibc_unlinkat
 __wasilibc_utimens
 __wasm_call_dtors
+__wasm_longjmp
+__wasm_setjmp
+__wasm_setjmp_test
 __wcscoll_l
 __wcsftime_l
 __wcsxfrm_l
@@ -546,6 +550,10 @@ difftime
 dirfd
 dirname
 div
+dlclose
+dlerror
+dlopen
+dlsym
 dprintf
 drand48
 drem
diff --git a/expected/wasm32-wasip2/defined-symbols.txt b/expected/wasm32-wasip2/defined-symbols.txt
index 35e5c391..36eaee69 100644
--- a/expected/wasm32-wasip2/defined-symbols.txt
+++ b/expected/wasm32-wasip2/defined-symbols.txt
@@ -18,6 +18,7 @@ __assert_fail
 __c_dot_utf8
 __c_dot_utf8_locale
 __c_locale
+__c_longjmp
 __clock
 __clock_gettime
 __clock_nanosleep
@@ -389,6 +390,9 @@ __wasilibc_tell
 __wasilibc_unlinkat
 __wasilibc_utimens
 __wasm_call_dtors
+__wasm_longjmp
+__wasm_setjmp
+__wasm_setjmp_test
 __wcscoll_l
 __wcsftime_l
 __wcsxfrm_l
@@ -568,6 +572,10 @@ difftime
 dirfd
 dirname
 div
+dlclose
+dlerror
+dlopen
+dlsym
 dprintf
 drand48
 drem