diff --git a/cmake/wasi-sdk-sysroot.cmake b/cmake/wasi-sdk-sysroot.cmake
index 5476980..6e02539 100644
--- a/cmake/wasi-sdk-sysroot.cmake
+++ b/cmake/wasi-sdk-sysroot.cmake
@@ -133,13 +133,9 @@ function(define_wasi_libc_sub target target_suffix lto)
   get_property(directory_cflags DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY COMPILE_OPTIONS)
   set(extra_cflags_list "${WASI_SDK_CPU_CFLAGS} ${CMAKE_C_FLAGS} ${directory_cflags}")
 
-  if(${target} MATCHES p3)
-    list(APPEND extra_cmake_args -DBUILD_SHARED=OFF)
-  endif()
-
-  if(${target} MATCHES p2)
-    # Always enable `-fPIC` for the `wasm32-wasip2` targets. This makes `libc.a`
-    # more flexible and usable in dynamic linking situations.
+  if(${target} MATCHES p2 OR ${target} MATCHES p3)
+    # Always enable `-fPIC` for the `wasm32-wasip2` and `wasm32-wasip3` targets. 
+    # This makes `libc.a` more flexible and usable in dynamic linking situations.
     list(APPEND extra_cflags_list -fPIC)
   endif()
 
@@ -177,6 +173,7 @@ function(define_wasi_libc_sub target target_suffix lto)
       -DBUILTINS_LIB=${libcompiler_rt_a}
       -DUSE_WASM_COMPONENT_LD=OFF
       -DWASI_SDK_VERSION=${wasi_sdk_version}
+      -DBUILD_TESTS=ON
     DEPENDS compiler-rt
     EXCLUDE_FROM_ALL ON
     USES_TERMINAL_CONFIGURE ON
diff --git a/src/llvm-project b/src/llvm-project
index e187d8e..af1eb70 160000
--- a/src/llvm-project
+++ b/src/llvm-project
@@ -1 +1 @@
-Subproject commit e187d8ebd0bbbff468cbe8bbb65185941be71d01
+Subproject commit af1eb70a6f5878ef6f223a5ddc36ab044b27e5fe
diff --git a/src/wasi-libc b/src/wasi-libc
index 53be6e5..ffdf6b0 160000
--- a/src/wasi-libc
+++ b/src/wasi-libc
@@ -1 +1 @@
-Subproject commit 53be6e50da14cf65e10de0065fe1382ec94e1838
+Subproject commit ffdf6b08a7b1ddcc0609a2581ba7bd79e93e1002