diff --git a/Makefile b/Makefile
index 45e22f784..b9a3ea2ca 100644
--- a/Makefile
+++ b/Makefile
@@ -164,7 +164,7 @@ build/config.BUILT:
 build: build/llvm.BUILT build/wasi-libc.BUILT build/compiler-rt.BUILT build/libcxxabi.BUILT build/libcxx.BUILT build/config.BUILT
 
 strip: build/llvm.BUILT
-	cd $(PREFIX)/bin; strip clang-9 lld llvm-ar
+	cd $(PREFIX)/bin; strip clang-* clang++-* lld llvm-ar
 
 package: build/package.BUILT
 
diff --git a/src/llvm-project b/src/llvm-project
index c1a0a2133..d32170dbd 160000
--- a/src/llvm-project
+++ b/src/llvm-project
@@ -1 +1 @@
-Subproject commit c1a0a213378a458fbea1a5c77b315c7dce08fd05
+Subproject commit d32170dbd5b0d54436537b6b75beaf44324e0c28
diff --git a/src/wasi-libc b/src/wasi-libc
index 5933c205d..41af0db30 160000
--- a/src/wasi-libc
+++ b/src/wasi-libc
@@ -1 +1 @@
-Subproject commit 5933c205df976a9da0468802f164e5bb4f061b11
+Subproject commit 41af0db30f459241d081f1a8bc232102ed9cfbde