Index: lang/rust/Makefile
===================================================================
--- lang/rust/Makefile
+++ lang/rust/Makefile
@@ -9,12 +9,15 @@
 		https://static.rust-lang.org/dist/:rust_bootstrap \
 		LOCAL/tobik/rust:rust_bootstrap \
 		https://static.rust-lang.org/dist/:cargo_bootstrap \
-		LOCAL/tobik/rust:cargo_bootstrap
+		LOCAL/tobik/rust:cargo_bootstrap \
+		https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/:compiler_rt
 DISTNAME?=	${PORTNAME}c-${PORTVERSION}-src
 DISTFILES?=	${NIGHTLY_SUBDIR}${DISTNAME}${EXTRACT_SUFX}:src \
 		${RUSTC_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}.tar.gz:rust_bootstrap \
 		${RUST_STD_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}.tar.gz:rust_bootstrap \
-		${CARGO_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}.tar.gz:cargo_bootstrap
+		${CARGO_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}.tar.gz:cargo_bootstrap \
+		${DISTFILES_${ARCH}}
+DISTFILES_armv6=	compiler-rt-8.0.1.src.tar.xz:compiler_rt
 DIST_SUBDIR?=	rust
 EXTRACT_ONLY?=	${DISTFILES:N*\:*bootstrap:C/:.*//}
 
@@ -107,6 +110,9 @@
 		${WRKSRC}/build/cache/${RUST_STD_BOOTSTRAP}.tar.gz
 	${LN} -sf ${DISTDIR}/${DIST_SUBDIR}/${CARGO_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}.tar.gz \
 		${WRKSRC}/build/cache/${CARGO_BOOTSTRAP}.tar.gz
+.if ${ARCH} == armv6
+	${LN} -sf ${WRKDIR}/compiler-rt-8.0.1.src ${WRKSRC}/src/llvm-project/compiler-rt
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} 's,gdb,${LOCALBASE}/bin/gdb,' ${WRKSRC}/src/etc/rust-gdb
Index: lang/rust/distinfo
===================================================================
--- lang/rust/distinfo
+++ lang/rust/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1565879155
+TIMESTAMP = 1567321430
 SHA256 (rust/rustc-1.37.0-src.tar.xz) = 10abffac50a729cf74cef6dd03193a2f4647541bd19ee9281be9e5b12ca8cdfd
 SIZE (rust/rustc-1.37.0-src.tar.xz) = 98654252
 SHA256 (rust/2019-07-04/rustc-1.36.0-aarch64-unknown-freebsd.tar.gz) = 8eec2d7750c96030b6b95eec2bc9ed1b7194780628d6017f615c2effdcc3b928
@@ -19,27 +19,5 @@
 SIZE (rust/2019-07-04/rust-std-1.36.0-armv6-unknown-freebsd.tar.gz) = 79061925
 SHA256 (rust/2019-07-04/cargo-0.37.0-armv6-unknown-freebsd.tar.gz) = e4fa3e76ab448eb8bfdf323b4de976a6f07c35d0eca91cc2bf480b41faa157ec
 SIZE (rust/2019-07-04/cargo-0.37.0-armv6-unknown-freebsd.tar.gz) = 5544892
-SHA256 (rust/2019-07-04/rustc-1.36.0-armv7-unknown-freebsd.tar.gz) = c652bfb82d0e640e24a91aef39e9eeeedc0bd0b5b828546f9ef47bbae6a279bd
-SIZE (rust/2019-07-04/rustc-1.36.0-armv7-unknown-freebsd.tar.gz) = 70165782
-SHA256 (rust/2019-07-04/rust-std-1.36.0-armv7-unknown-freebsd.tar.gz) = 8750ff6013261b68f692413c7db97fabac6a83583b4c16c2175ebb6a81c1d0c6
-SIZE (rust/2019-07-04/rust-std-1.36.0-armv7-unknown-freebsd.tar.gz) = 78322763
-SHA256 (rust/2019-07-04/cargo-0.37.0-armv7-unknown-freebsd.tar.gz) = f092d15bbfe91423efffa2d20c77e5ca9655aac4c41bd1943cf632aff1a92bf1
-SIZE (rust/2019-07-04/cargo-0.37.0-armv7-unknown-freebsd.tar.gz) = 5463628
-SHA256 (rust/2019-07-04/rustc-1.36.0-i686-unknown-freebsd.tar.gz) = 4ac319c56b360a1c9418cc1862ed86366c79155dbcfdd0a9852b98e0bc4dcd0e
-SIZE (rust/2019-07-04/rustc-1.36.0-i686-unknown-freebsd.tar.gz) = 80314139
-SHA256 (rust/2019-07-04/rust-std-1.36.0-i686-unknown-freebsd.tar.gz) = 3387dff03da9babc28861892f41b08ff58bc51bea2d0e84ac0a045e84999eebf
-SIZE (rust/2019-07-04/rust-std-1.36.0-i686-unknown-freebsd.tar.gz) = 87744414
-SHA256 (rust/2019-07-04/cargo-0.37.0-i686-unknown-freebsd.tar.gz) = 3c4cef06939123951649c9ffcef7ba104cc3bc63c2b3243a7a7228749c58f37c
-SIZE (rust/2019-07-04/cargo-0.37.0-i686-unknown-freebsd.tar.gz) = 6553782
-SHA256 (rust/2019-07-04/rustc-1.36.0-powerpc64-unknown-freebsd-elfv1.tar.gz) = 98b0f27977a5412852044bc7ef2e95dfb5eced140c73a0ed0faf5841cecbaf83
-SIZE (rust/2019-07-04/rustc-1.36.0-powerpc64-unknown-freebsd-elfv1.tar.gz) = 78638311
-SHA256 (rust/2019-07-04/rust-std-1.36.0-powerpc64-unknown-freebsd-elfv1.tar.gz) = 197bb8ce6944eddc7c18d20f7c2721e35abb3458678ef60d287941ca01e244ed
-SIZE (rust/2019-07-04/rust-std-1.36.0-powerpc64-unknown-freebsd-elfv1.tar.gz) = 81520259
-SHA256 (rust/2019-07-04/cargo-0.37.0-powerpc64-unknown-freebsd-elfv1.tar.gz) = 17d9345621caa47015843b811019e16b32020c053fb72c3f3a6909e42d548f6c
-SIZE (rust/2019-07-04/cargo-0.37.0-powerpc64-unknown-freebsd-elfv1.tar.gz) = 7388067
-SHA256 (rust/2019-07-04/rustc-1.36.0-powerpc64-unknown-freebsd-elfv2.tar.gz) = 7581410a224e3649fc75cbb302c46fa0d59d571f3c6b9556682ab1411872db83
-SIZE (rust/2019-07-04/rustc-1.36.0-powerpc64-unknown-freebsd-elfv2.tar.gz) = 72163495
-SHA256 (rust/2019-07-04/rust-std-1.36.0-powerpc64-unknown-freebsd-elfv2.tar.gz) = edd4584a9583fb699dbf23797151d1d78bdf1e1d1389d715acbdefc5fcf5dc7c
-SIZE (rust/2019-07-04/rust-std-1.36.0-powerpc64-unknown-freebsd-elfv2.tar.gz) = 79921640
-SHA256 (rust/2019-07-04/cargo-0.37.0-powerpc64-unknown-freebsd-elfv2.tar.gz) = 408fb3a5b2127ca369d5e5fe5768d475820916aa4e84150bdb939d0d155d5e32
-SIZE (rust/2019-07-04/cargo-0.37.0-powerpc64-unknown-freebsd-elfv2.tar.gz) = 5701853
+SHA256 (rust/compiler-rt-8.0.1.src.tar.xz) = 11828fb4823387d820c6715b25f6b2405e60837d12a7469e7a8882911c721837
+SIZE (rust/compiler-rt-8.0.1.src.tar.xz) = 1954204