diff --git a/mk/rt.mk b/mk/rt.mk
index 77bb22b7bfc..d0fc5774589 100644
--- a/mk/rt.mk
+++ b/mk/rt.mk
@@ -247,8 +247,8 @@ $$(COMPRT_LIB_$(1)): $$(COMPRT_DEPS) $$(MKFILE_DEPS)
 		RANLIB="$$(AR_$(1)) s" \
 		CFLAGS="$$(CFG_GCCISH_CFLAGS_$(1))" \
 		TargetTriple=$(1) \
-		triple-runtime
-	$$(Q)cp $$(COMPRT_BUILD_DIR_$(1))/triple/runtime/libcompiler_rt.a $$(COMPRT_LIB_$(1))
+		triple-builtins
+	$$(Q)cp $$(COMPRT_BUILD_DIR_$(1))/triple/builtins/libcompiler_rt.a $$(COMPRT_LIB_$(1))
 
 ################################################################################
 # libbacktrace
diff --git a/src/compiler-rt b/src/compiler-rt
index f4b221571ce..ed112ca1e42 160000
--- a/src/compiler-rt
+++ b/src/compiler-rt
@@ -1 +1 @@
-Subproject commit f4b221571ce6f05714c1f1c6fa48f1393499989c
+Subproject commit ed112ca1e4275e1c5707a898f2bf6164707ba378