---

vadimcn · vadimcn · commit a00fdafcd0ce · 2014-04-22T15:50:51.000-07:00
yaml --- r: 111540 b: refs/heads/master c: 6619134 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 7995528dae9d43988bc7deeb89c62e094ed1f511
+refs/heads/master: 6619134d49dc87d61274006be4c0d268658e1c2a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: b5dd3f05fe95168b5569d0f519636149479eb6ac
 refs/heads/try: 38201d7c6bf0c32b0e5bdc8ecd63976ebc1b3a4c
diff --git a/trunk/mk/rt.mk b/trunk/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/trunk/src/compiler-rt b/trunk/src/compiler-rt
@@ -1 +1 @@
-Subproject commit f4b221571ce6f05714c1f1c6fa48f1393499989c
+Subproject commit ed112ca1e4275e1c5707a898f2bf6164707ba378

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-Subproject commit f4b221571ce6f05714c1f1c6fa48f1393499989c`
	`1`	`+Subproject commit ed112ca1e4275e1c5707a898f2bf6164707ba378`