diff --git a/cmake/wasi-sdk-sysroot.cmake b/cmake/wasi-sdk-sysroot.cmake
index 5d0d43c..a55e4f3 100644
--- a/cmake/wasi-sdk-sysroot.cmake
+++ b/cmake/wasi-sdk-sysroot.cmake
@@ -133,8 +133,8 @@ 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 p2)
-    # Always enable `-fPIC` for the `wasm32-wasip2` target. This makes `libc.a`
+  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()
diff --git a/src/llvm-project b/src/llvm-project
index ff172dc..36ea1df 160000
--- a/src/llvm-project
+++ b/src/llvm-project
@@ -1 +1 @@
-Subproject commit ff172dcbed3deadf1724283a6b34af60fc11b490
+Subproject commit 36ea1dfb7e24cdbcc4d8fb5bacd1d22dd0f470c3
diff --git a/src/wasi-libc b/src/wasi-libc
index 7b8632e..5b95b09 160000
--- a/src/wasi-libc
+++ b/src/wasi-libc
@@ -1 +1 @@
-Subproject commit 7b8632e0c8dc3d6ac44d5fd557137d96ef23cfb8
+Subproject commit 5b95b096c157ad5a201150f146bc1d1ea2817650