20 files changed, 79 insertions, 144 deletions

diff --git a/lang/rust/Makefile b/lang/rust/Makefile
index 76655eb93963..6ffbce55165b 100644
--- a/lang/rust/Makefile
+++ b/lang/rust/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	rust
-PORTVERSION?=	1.33.0
-PORTREVISION?=	1
+PORTVERSION?=	1.34.0
+PORTREVISION?=	0
 CATEGORIES=	lang
 MASTER_SITES=	http://static.rust-lang.org/dist/:src \
 		LOCAL/dumbbell/rust:rust_bootstrap \
@@ -42,25 +42,13 @@ ONLY_FOR_ARCHS_REASON=	requires prebuilt bootstrap compiler
 CONFLICTS_INSTALL?=	rust-nightly
 
 # See WRKSRC/src/stage0.txt for this date and version values.
-BOOTSTRAPS_DATE?=		2019-01-17
-BOOTSTRAPS_DATE_aarch64?=	2018-12-20
-BOOTSTRAPS_DATE_armv6?=		2018-12-20
-BOOTSTRAPS_DATE_armv7?=		2018-12-20
-BOOTSTRAPS_DATE_powerpc64?=	2018-12-20
+BOOTSTRAPS_DATE?=		2019-02-28
 
-RUST_BOOTSTRAP_VERSION?=	1.32.0
-RUST_BOOTSTRAP_VERSION_aarch64?=	1.32.0
-RUST_BOOTSTRAP_VERSION_armv6?=	1.32.0
-RUST_BOOTSTRAP_VERSION_armv7?=	1.32.0
-RUST_BOOTSTRAP_VERSION_powerpc64?=	1.32.0
+RUST_BOOTSTRAP_VERSION?=	1.33.0
 RUSTC_BOOTSTRAP=		${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rustc-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET}.tar.gz
 RUST_STD_BOOTSTRAP=		${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rust-std-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET}.tar.gz
 
-CARGO_BOOTSTRAP_VERSION?=	0.33.0
-CARGO_BOOTSTRAP_VERSION_aarch64?=	0.33.0
-CARGO_BOOTSTRAP_VERSION_armv6?=	0.33.0
-CARGO_BOOTSTRAP_VERSION_armv7?=	0.33.0
-CARGO_BOOTSTRAP_VERSION_powerpc64?=	0.33.0
+CARGO_BOOTSTRAP_VERSION?=	0.34.0
 CARGO_BOOTSTRAP=		${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/cargo-${CARGO_BOOTSTRAP_VERSION_${ARCH}:U${CARGO_BOOTSTRAP_VERSION}}-${RUST_TARGET}.tar.gz
 
 CARGO_VENDOR_DIR?=		${WRKSRC}/vendor
@@ -277,7 +265,7 @@ post-install:
 	        }' \
 	        "$$f" >> ${TMPPLIST}; \
 	done
-	${RM} ${STAGEDIR}${PREFIX}/share/doc/rust/*.old
+	${RM} -r ${STAGEDIR}${PREFIX}/share/doc/rust/*.old
 	${SORT} -u < ${TMPPLIST} > ${TMPPLIST}.uniq
 	${MV} ${TMPPLIST}.uniq ${TMPPLIST}
 	@${RM} \
diff --git a/lang/rust/distinfo b/lang/rust/distinfo
index d0183780f3b6..e1373b9dafb1 100644
--- a/lang/rust/distinfo
+++ b/lang/rust/distinfo
@@ -1,27 +1,39 @@
-TIMESTAMP = 1551349163
-SHA256 (rust/rustc-1.33.0-src.tar.xz) = f4b1a72f1a29b23dcc9d7be5f60878f0434560513273906aa93dcd5c0de39b71
-SIZE (rust/rustc-1.33.0-src.tar.xz) = 100635400
-SHA256 (rust/2019-01-17/rustc-1.32.0-x86_64-unknown-freebsd.tar.gz) = a14a0e288be8ce894a85810151a2eb70fc86afa36e4a5fae4e903c744b888687
-SIZE (rust/2019-01-17/rustc-1.32.0-x86_64-unknown-freebsd.tar.gz) = 70385575
-SHA256 (rust/2019-01-17/rust-std-1.32.0-x86_64-unknown-freebsd.tar.gz) = d50f674379791a93764d383153ed6533cea165ede7f233df4e17563bfdab273c
-SIZE (rust/2019-01-17/rust-std-1.32.0-x86_64-unknown-freebsd.tar.gz) = 67069445
-SHA256 (rust/2019-01-17/cargo-0.33.0-x86_64-unknown-freebsd.tar.gz) = e780264949c8e597191f38d4930cad8074890a7a48c04cf10e6864ff0eb4bc8a
-SIZE (rust/2019-01-17/cargo-0.33.0-x86_64-unknown-freebsd.tar.gz) = 6253970
-SHA256 (rust/2019-01-17/rustc-1.32.0-i686-unknown-freebsd.tar.gz) = 7bea209a99b8a3c05a80e55fef293d73a68fa57d58120ed5cd11adc9d6b7ed5c
-SIZE (rust/2019-01-17/rustc-1.32.0-i686-unknown-freebsd.tar.gz) = 71140698
-SHA256 (rust/2019-01-17/rust-std-1.32.0-i686-unknown-freebsd.tar.gz) = 1189726665509f2a5e44fcdbbe70f691e8ffc748404966c9b73abf62b4f9cb82
-SIZE (rust/2019-01-17/rust-std-1.32.0-i686-unknown-freebsd.tar.gz) = 67402728
-SHA256 (rust/2019-01-17/cargo-0.33.0-i686-unknown-freebsd.tar.gz) = cba7cf145100c4e74da1fca20ad272999ec2b55817f26723c3dfc9fd4abd196d
-SIZE (rust/2019-01-17/cargo-0.33.0-i686-unknown-freebsd.tar.gz) = 6017543
-SHA256 (rust/2018-12-20/cargo-0.33.0-aarch64-unknown-freebsd.tar.gz) = a13c3f8c17beb6d19f54ac705d87b6dbb9cd09cd945d0ffbaed1a77e8ac38128
-SHA256 (rust/2018-12-20/cargo-0.33.0-armv6-unknown-freebsd.tar.gz) = 62158d26a9dbc17cfd92882cb48b6ee7a06432b9f18d1f78b90b6973d63be12c
-SHA256 (rust/2018-12-20/cargo-0.33.0-armv7-unknown-freebsd.tar.gz) = bfb8986a11034cac7329037a2f24c07bcd62ba2d91838f6c28955b2ee639e361
-SHA256 (rust/2018-12-20/cargo-0.33.0-powerpc64-unknown-freebsd.tar.gz) = 043a4d68de71b868837bc0e30121d4d95282b0d098a1e13da9375f00dd6e51ef
-SHA256 (rust/2018-12-20/rust-std-1.32.0-aarch64-unknown-freebsd.tar.gz) = c5cb52dab10c19a0bc0548b65a785fdf5765cf43a4a5c6635e44738b9ae69030
-SHA256 (rust/2018-12-20/rust-std-1.32.0-armv6-unknown-freebsd.tar.gz) = 9572c6db3daaaf1fa5dd1b5ddf2a077e55ebf392ed0bc578dcc5a1ffa75e0343
-SHA256 (rust/2018-12-20/rust-std-1.32.0-armv7-unknown-freebsd.tar.gz) = 0ad6c70d4c0d843f61845db77f7d571befa07e4623029e6b3dd3ce9f9d568c6f
-SHA256 (rust/2018-12-20/rust-std-1.32.0-powerpc64-unknown-freebsd.tar.gz) = d619921dfaccf70cde71b4a00f9dc03a8138d3379a6cb4d8729d74d931c2a38b
-SHA256 (rust/2018-12-20/rustc-1.32.0-aarch64-unknown-freebsd.tar.gz) = 3d1ee268ceba35c899c976fa6d539b39f7ef6fc109190662bc5f5bfd5c843d92
-SHA256 (rust/2018-12-20/rustc-1.32.0-armv6-unknown-freebsd.tar.gz) = c2896bc52a2e005077252062e97a4bd3543b9003b78f95ecd83dda0242f0e6b5
-SHA256 (rust/2018-12-20/rustc-1.32.0-armv7-unknown-freebsd.tar.gz) = faf708f0909d4b7e5f8862add9819f5f55cb52b08558760cbdd456e7014df00c
-SHA256 (rust/2018-12-20/rustc-1.32.0-powerpc64-unknown-freebsd.tar.gz) = 83ccfca0e5c5e2df37ea3f4059dfe3e516c4f74045769dac4602a2da2b2ed1a5
+TIMESTAMP = 1555004553
+SHA256 (rust/rustc-1.34.0-src.tar.xz) = a510b3b7ceca370a4b395065039b2a70297e3fb4103b7ff67b1eff771fd98504
+SIZE (rust/rustc-1.34.0-src.tar.xz) = 95055768
+SHA256 (rust/2019-02-28/rustc-1.33.0-aarch64-unknown-freebsd.tar.gz) = 142c3419b0df1bacf97bf6ed6d2d3bcb37a6439b5bf11f258178edac6e3053b3
+SIZE (rust/2019-02-28/rustc-1.33.0-aarch64-unknown-freebsd.tar.gz) = 64575877
+SHA256 (rust/2019-02-28/rust-std-1.33.0-aarch64-unknown-freebsd.tar.gz) = bbb2ec53d4fcade7002665d4c9c64740ddc14a07d3726555c7a2ffe01b07fd9e
+SIZE (rust/2019-02-28/rust-std-1.33.0-aarch64-unknown-freebsd.tar.gz) = 70714457
+SHA256 (rust/2019-02-28/cargo-0.34.0-aarch64-unknown-freebsd.tar.gz) = 92bda14b874591342e7584d94a90ce0bd6532f29d638c89eaa50b9d80a8aa0fb
+SIZE (rust/2019-02-28/cargo-0.34.0-aarch64-unknown-freebsd.tar.gz) = 5823541
+SHA256 (rust/2019-02-28/rustc-1.33.0-x86_64-unknown-freebsd.tar.gz) = 8bfc7fc50c50294cf4ded35360b41b590180401a0d2e84256f5931c7c1ff35cd
+SIZE (rust/2019-02-28/rustc-1.33.0-x86_64-unknown-freebsd.tar.gz) = 74812594
+SHA256 (rust/2019-02-28/rust-std-1.33.0-x86_64-unknown-freebsd.tar.gz) = 8eec7a21a3368890fdf0b826e7bc1928775724c0a4bd14d86304cc7e48309237
+SIZE (rust/2019-02-28/rust-std-1.33.0-x86_64-unknown-freebsd.tar.gz) = 71459727
+SHA256 (rust/2019-02-28/cargo-0.34.0-x86_64-unknown-freebsd.tar.gz) = 0108a0f2e2c4663b4e5cddd5bee04fd7cf5d2c94feb3fc527254a606ee856928
+SIZE (rust/2019-02-28/cargo-0.34.0-x86_64-unknown-freebsd.tar.gz) = 6358006
+SHA256 (rust/2019-02-28/rustc-1.33.0-armv6-unknown-freebsd.tar.gz) = 9119a1c743c0dda2d65727e6436f453ab85428c7587d623e21b473e4df44a3ba
+SIZE (rust/2019-02-28/rustc-1.33.0-armv6-unknown-freebsd.tar.gz) = 67496083
+SHA256 (rust/2019-02-28/rust-std-1.33.0-armv6-unknown-freebsd.tar.gz) = 29ac9b289ae493b6ae5efb2c3dd8bf367466b8f0573007e92d020743eab3d607
+SIZE (rust/2019-02-28/rust-std-1.33.0-armv6-unknown-freebsd.tar.gz) = 72846229
+SHA256 (rust/2019-02-28/cargo-0.34.0-armv6-unknown-freebsd.tar.gz) = 3f518ce75bdc1b7ed2c600a5a6e6f522d608efe66d0dbff442cad16fd68d36e7
+SIZE (rust/2019-02-28/cargo-0.34.0-armv6-unknown-freebsd.tar.gz) = 5993902
+SHA256 (rust/2019-02-28/rustc-1.33.0-armv7-unknown-freebsd.tar.gz) = 9649fa7830648725143dff25e40f1edcacbd50f76a63c84d9b45f264705d2f9a
+SIZE (rust/2019-02-28/rustc-1.33.0-armv7-unknown-freebsd.tar.gz) = 66337581
+SHA256 (rust/2019-02-28/rust-std-1.33.0-armv7-unknown-freebsd.tar.gz) = 3848af717da0a5b87925d34524b74f76225167ea0261fc2c6d6627115469e4e9
+SIZE (rust/2019-02-28/rust-std-1.33.0-armv7-unknown-freebsd.tar.gz) = 72078355
+SHA256 (rust/2019-02-28/cargo-0.34.0-armv7-unknown-freebsd.tar.gz) = 7b6c04ec6eddc09367e9b720c8a126363ecbf4c6d787490498a133e8bdec3c4b
+SIZE (rust/2019-02-28/cargo-0.34.0-armv7-unknown-freebsd.tar.gz) = 5036799
+SHA256 (rust/2019-02-28/rustc-1.33.0-i686-unknown-freebsd.tar.gz) = f788ef1806f6e51c7df05dc2614f8b95d3d1a59177786dc9c895c16c0d5201aa
+SIZE (rust/2019-02-28/rustc-1.33.0-i686-unknown-freebsd.tar.gz) = 76140989
+SHA256 (rust/2019-02-28/rust-std-1.33.0-i686-unknown-freebsd.tar.gz) = 00325440bf2c832f9063042bf8999756466cec23f747b62ad3268a316dae39a9
+SIZE (rust/2019-02-28/rust-std-1.33.0-i686-unknown-freebsd.tar.gz) = 72221278
+SHA256 (rust/2019-02-28/cargo-0.34.0-i686-unknown-freebsd.tar.gz) = 7943c30e3451972ed1a99f26b079c53a1a7317f63ff60cca1ceeebb80a99dc66
+SIZE (rust/2019-02-28/cargo-0.34.0-i686-unknown-freebsd.tar.gz) = 6134900
+SHA256 (rust/2019-02-28/rustc-1.33.0-powerpc64-unknown-freebsd.tar.gz) = 1ad1e9a0ae5fbc279c7ca5079d80bfd6d8e7861811a689902ca83c95fe92b011
+SIZE (rust/2019-02-28/rustc-1.33.0-powerpc64-unknown-freebsd.tar.gz) = 74228636
+SHA256 (rust/2019-02-28/rust-std-1.33.0-powerpc64-unknown-freebsd.tar.gz) = fbd83a5d73329f82180922e4da0aeef529a5c834e5446f7befadb69db2b968f7
+SIZE (rust/2019-02-28/rust-std-1.33.0-powerpc64-unknown-freebsd.tar.gz) = 74552190
+SHA256 (rust/2019-02-28/cargo-0.34.0-powerpc64-unknown-freebsd.tar.gz) = 5bedf357c0ce018f85cbea6ba5f9c380602761ebca295e264afc4fbf92766c68
+SIZE (rust/2019-02-28/cargo-0.34.0-powerpc64-unknown-freebsd.tar.gz) = 6960371
diff --git a/lang/rust/files/patch-src_bootstrap_bootstrap.py b/lang/rust/files/patch-src_bootstrap_bootstrap.py
index 732d6f3b09eb..d566541784b5 100644
--- a/lang/rust/files/patch-src_bootstrap_bootstrap.py
+++ b/lang/rust/files/patch-src_bootstrap_bootstrap.py
@@ -1,16 +1,5 @@
 --- src/bootstrap/bootstrap.py.orig	2019-01-16 09:30:27 UTC
 +++ src/bootstrap/bootstrap.py
-@@ -240,6 +240,10 @@ def default_build_triple():
-         err = "unknown OS type: {}".format(ostype)
-         sys.exit(err)
- 
-+    if cputype == 'powerpc' and ostype == 'unknown-freebsd':
-+        cputype = subprocess.check_output(
-+              ['uname', '-p']).strip().decode(default_encoding)
-+
-     cputype_mapper = {
-         'BePC': 'i686',
-         'aarch64': 'aarch64',
 @@ -269,6 +273,10 @@ def default_build_triple():
          cputype = 'arm'
          if ostype == 'linux-android':
diff --git a/lang/rust/files/patch-src_bootstrap_native.rs b/lang/rust/files/patch-src_bootstrap_native.rs
index d5b747a8ff27..854e36021173 100644
--- a/lang/rust/files/patch-src_bootstrap_native.rs
+++ b/lang/rust/files/patch-src_bootstrap_native.rs
@@ -1,6 +1,6 @@
---- src/bootstrap/native.rs.orig	2019-01-16 09:30:27 UTC
+--- src/bootstrap/native.rs.orig	2019-04-08 12:42:31 UTC
 +++ src/bootstrap/native.rs
-@@ -218,6 +218,10 @@ impl Step for Llvm {
+@@ -209,6 +209,10 @@ impl Step for Llvm {
              }
          }
  
diff --git a/lang/rust/files/patch-src_librustc__llvm_build.rs b/lang/rust/files/patch-src_librustc__llvm_build.rs
index 7ceb1f2275ee..fa2064382f55 100644
--- a/lang/rust/files/patch-src_librustc__llvm_build.rs
+++ b/lang/rust/files/patch-src_librustc__llvm_build.rs
@@ -1,6 +1,6 @@
---- src/librustc_llvm/build.rs.orig	2019-01-16 09:30:27 UTC
+--- src/librustc_llvm/build.rs.orig	2019-04-08 12:42:31 UTC
 +++ src/librustc_llvm/build.rs
-@@ -256,7 +256,10 @@ fn main() {
+@@ -254,7 +254,10 @@ fn main() {
      };
  
      // C++ runtime library
diff --git a/lang/rust/files/patch-src_librustc__target_spec_armv6__unknown__freebsd.rs b/lang/rust/files/patch-src_librustc__target_spec_armv6__unknown__freebsd.rs
index 35f92e3da099..b85acb80cab5 100644
--- a/lang/rust/files/patch-src_librustc__target_spec_armv6__unknown__freebsd.rs
+++ b/lang/rust/files/patch-src_librustc__target_spec_armv6__unknown__freebsd.rs
@@ -1,7 +1,7 @@
---- src/librustc_target/spec/armv6_unknown_freebsd.rs.orig	2019-02-15 13:41:07 UTC
+--- src/librustc_target/spec/armv6_unknown_freebsd.rs.orig	2019-04-08 21:09:22 UTC
 +++ src/librustc_target/spec/armv6_unknown_freebsd.rs
 @@ -0,0 +1,24 @@
-+use spec::{LinkerFlavor, Target, TargetOptions, TargetResult};
++use crate::spec::{LinkerFlavor, Target, TargetOptions, TargetResult};
 +
 +pub fn target() -> TargetResult {
 +    let base = super::freebsd_base::opts();
diff --git a/lang/rust/files/patch-src_librustc__target_spec_armv7__unknown__freebsd.rs b/lang/rust/files/patch-src_librustc__target_spec_armv7__unknown__freebsd.rs
index 674f713b11de..bed0bdb716d7 100644
--- a/lang/rust/files/patch-src_librustc__target_spec_armv7__unknown__freebsd.rs
+++ b/lang/rust/files/patch-src_librustc__target_spec_armv7__unknown__freebsd.rs
@@ -1,7 +1,7 @@
---- src/librustc_target/spec/armv7_unknown_freebsd.rs.orig	2019-02-15 13:41:07 UTC
+--- src/librustc_target/spec/armv7_unknown_freebsd.rs.orig	2019-04-08 21:09:22 UTC
 +++ src/librustc_target/spec/armv7_unknown_freebsd.rs
 @@ -0,0 +1,24 @@
-+use spec::{LinkerFlavor, Target, TargetOptions, TargetResult};
++use crate::spec::{LinkerFlavor, Target, TargetOptions, TargetResult};
 +
 +pub fn target() -> TargetResult {
 +    let base = super::freebsd_base::opts();
diff --git a/lang/rust/files/patch-src_librustc__target_spec_i686__unknown__freebsd.rs b/lang/rust/files/patch-src_librustc__target_spec_i686__unknown__freebsd.rs
index cad081ce0d8c..0d903af64043 100644
--- a/lang/rust/files/patch-src_librustc__target_spec_i686__unknown__freebsd.rs
+++ b/lang/rust/files/patch-src_librustc__target_spec_i686__unknown__freebsd.rs
@@ -1,6 +1,6 @@
---- src/librustc_target/spec/i686_unknown_freebsd.rs.orig	2018-06-19 04:35:53 UTC
+--- src/librustc_target/spec/i686_unknown_freebsd.rs.orig	2019-04-08 12:42:31 UTC
 +++ src/librustc_target/spec/i686_unknown_freebsd.rs
-@@ -12,7 +12,7 @@ use spec::{LinkerFlavor, Target, TargetResult};
+@@ -2,7 +2,7 @@ use crate::spec::{LinkerFlavor, Target, TargetResult};
  
  pub fn target() -> TargetResult {
      let mut base = super::freebsd_base::opts();
diff --git a/lang/rust/files/patch-src_librustc__target_spec_mod.rs b/lang/rust/files/patch-src_librustc__target_spec_mod.rs
index 22ddbe1af50b..e8f95a0c3164 100644
--- a/lang/rust/files/patch-src_librustc__target_spec_mod.rs
+++ b/lang/rust/files/patch-src_librustc__target_spec_mod.rs
@@ -1,13 +1,11 @@
---- src/librustc_target/spec/mod.rs.orig	2019-01-16 09:30:27 UTC
+--- src/librustc_target/spec/mod.rs.orig	2019-04-08 12:42:31 UTC
 +++ src/librustc_target/spec/mod.rs
-@@ -333,7 +333,10 @@ supported_targets! {
+@@ -376,6 +376,8 @@ supported_targets! {
      ("aarch64-linux-android", aarch64_linux_android),
  
      ("aarch64-unknown-freebsd", aarch64_unknown_freebsd),
 +    ("armv6-unknown-freebsd", armv6_unknown_freebsd),
 +    ("armv7-unknown-freebsd", armv7_unknown_freebsd),
      ("i686-unknown-freebsd", i686_unknown_freebsd),
-+    ("powerpc64-unknown-freebsd", powerpc64_unknown_freebsd),
+     ("powerpc64-unknown-freebsd", powerpc64_unknown_freebsd),
      ("x86_64-unknown-freebsd", x86_64_unknown_freebsd),
- 
-     ("i686-unknown-dragonfly", i686_unknown_dragonfly),
diff --git a/lang/rust/files/patch-src_librustc__target_spec_powerpc64__unknown__freebsd.rs b/lang/rust/files/patch-src_librustc__target_spec_powerpc64__unknown__freebsd.rs
deleted file mode 100644
index ce3d3a303165..000000000000
--- a/lang/rust/files/patch-src_librustc__target_spec_powerpc64__unknown__freebsd.rs
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/librustc_target/spec/powerpc64_unknown_freebsd.rs.orig	2019-02-15 13:41:07 UTC
-+++ src/librustc_target/spec/powerpc64_unknown_freebsd.rs
-@@ -0,0 +1,22 @@
-+use spec::{LinkerFlavor, Target, TargetResult};
-+
-+pub fn target() -> TargetResult {
-+    let mut base = super::freebsd_base::opts();
-+    base.cpu = "ppc64".to_string();
-+    base.pre_link_args.get_mut(&LinkerFlavor::Gcc).unwrap().push("-m64".to_string());
-+    base.max_atomic_width = Some(64);
-+
-+    Ok(Target {
-+        llvm_target: "powerpc64-unknown-freebsd".to_string(),
-+        target_endian: "big".to_string(),
-+        target_pointer_width: "64".to_string(),
-+        target_c_int_width: "32".to_string(),
-+        data_layout: "E-m:e-i64:64-n32:64".to_string(),
-+        arch: "powerpc64".to_string(),
-+        target_os: "freebsd".to_string(),
-+        target_env: String::new(),
-+        target_vendor: "unknown".to_string(),
-+        linker_flavor: LinkerFlavor::Gcc,
-+        options: base,
-+    })
-+}
diff --git a/lang/rust/files/patch-src_libstd_sys_unix_stack__overflow.rs b/lang/rust/files/patch-src_libstd_sys_unix_stack__overflow.rs
index d0cd68cef91b..9d0eefb73c51 100644
--- a/lang/rust/files/patch-src_libstd_sys_unix_stack__overflow.rs
+++ b/lang/rust/files/patch-src_libstd_sys_unix_stack__overflow.rs
@@ -1,6 +1,6 @@
---- src/libstd/sys/unix/stack_overflow.rs.orig	2019-01-16 09:30:27 UTC
+--- src/libstd/sys/unix/stack_overflow.rs.orig	2019-04-08 12:42:31 UTC
 +++ src/libstd/sys/unix/stack_overflow.rs
-@@ -151,6 +151,7 @@ mod imp {
+@@ -141,6 +141,7 @@ mod imp {
      #[cfg(any(target_os = "linux",
                target_os = "macos",
                target_os = "bitrig",
@@ -8,7 +8,7 @@
                target_os = "netbsd",
                target_os = "openbsd",
                target_os = "solaris"))]
-@@ -158,8 +159,7 @@ mod imp {
+@@ -148,8 +149,7 @@ mod imp {
          libc::stack_t { ss_sp: get_stackp(), ss_flags: 0, ss_size: SIGSTKSZ }
      }
  
diff --git a/lang/rust/files/patch-src_llvm_utils_llvm-build_llvmbuild_main.py b/lang/rust/files/patch-src_llvm-project_llvm_utils_llvm-build_llvmbuild_main.py
index 7e1810209f10..0b485dbd572f 100644
--- a/lang/rust/files/patch-src_llvm_utils_llvm-build_llvmbuild_main.py
+++ b/lang/rust/files/patch-src_llvm-project_llvm_utils_llvm-build_llvmbuild_main.py
@@ -1,5 +1,5 @@
---- src/llvm/utils/llvm-build/llvmbuild/main.py.orig	2018-12-13 15:33:50 UTC
-+++ src/llvm/utils/llvm-build/llvmbuild/main.py
+--- src/llvm-project/llvm/utils/llvm-build/llvmbuild/main.py.orig	2018-12-13 15:33:50 UTC
++++ src/llvm-project/llvm/utils/llvm-build/llvmbuild/main.py
 @@ -659,6 +659,8 @@ def add_magic_target_components(parser, project, opts)
      # We handle a few special cases of target names here for historical
      # reasons, as these are the names configure currently comes up with.
diff --git a/lang/rust/files/patch-src_stdsimd_stdsimd_arch_detect_os_aarch64.rs b/lang/rust/files/patch-src_stdsimd_crates_std__detect_src_detect_os_aarch64.rs
index 8c2189891167..70c7cbddb1d1 100644
--- a/lang/rust/files/patch-src_stdsimd_stdsimd_arch_detect_os_aarch64.rs
+++ b/lang/rust/files/patch-src_stdsimd_crates_std__detect_src_detect_os_aarch64.rs
@@ -11,8 +11,8 @@ note: lint level defined here
   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   = help: to escape `[` and `]` characters, just add '\' before them like `\[` or `\]`
 
---- src/stdsimd/stdsimd/arch/detect/os/aarch64.rs.orig	2019-02-25 09:19:48 UTC
-+++ src/stdsimd/stdsimd/arch/detect/os/aarch64.rs
+--- src/stdsimd/crates/std_detect/src/detect/os/aarch64.rs.orig	2019-04-08 12:42:49 UTC
++++ src/stdsimd/crates/std_detect/src/detect/os/aarch64.rs
 @@ -6,7 +6,7 @@
  //! AArch64 system registers ID_AA64ISAR0_EL1, ID_AA64PFR0_EL1, ID_AA64ISAR1_EL1
  //! have bits dedicated to features like AdvSIMD, CRC32, AES, atomics (LSE), etc.
diff --git a/lang/rust/files/patch-vendor_backtrace_src_backtrace_libunwind.rs b/lang/rust/files/patch-vendor_backtrace_src_backtrace_libunwind.rs
index 1947ccbac446..5bb3024426e6 100644
--- a/lang/rust/files/patch-vendor_backtrace_src_backtrace_libunwind.rs
+++ b/lang/rust/files/patch-vendor_backtrace_src_backtrace_libunwind.rs
@@ -1,6 +1,6 @@
---- vendor/backtrace/src/backtrace/libunwind.rs.orig	2019-01-16 11:06:07 UTC
+--- vendor/backtrace/src/backtrace/libunwind.rs.orig	2019-04-08 14:18:22 UTC
 +++ vendor/backtrace/src/backtrace/libunwind.rs
-@@ -115,12 +115,14 @@ mod uw {
+@@ -113,12 +113,14 @@ mod uw {
  
          // available since GCC 4.2.0, should be fine for our purpose
          #[cfg(all(not(all(target_os = "android", target_arch = "arm")),
@@ -15,7 +15,7 @@
                    not(all(target_os = "linux", target_arch = "arm"))))]
          pub fn _Unwind_FindEnclosingFunction(pc: *mut c_void)
              -> *mut c_void;
-@@ -130,6 +132,7 @@ mod uw {
+@@ -128,6 +130,7 @@ mod uw {
      // expansion of the macro. This is all copy/pasted directly from the
      // header file with the definition of _Unwind_GetIP.
      #[cfg(any(all(target_os = "android", target_arch = "arm"),
@@ -23,7 +23,7 @@
                all(target_os = "linux", target_arch = "arm")))]
      pub unsafe fn _Unwind_GetIP(ctx: *mut _Unwind_Context) -> libc::uintptr_t {
          #[repr(C)]
-@@ -177,6 +180,7 @@ mod uw {
+@@ -175,6 +178,7 @@ mod uw {
      // This function doesn't exist on Android or ARM/Linux, so make it same
      // to _Unwind_GetIP
      #[cfg(any(all(target_os = "android", target_arch = "arm"),
@@ -31,7 +31,7 @@
                all(target_os = "linux", target_arch = "arm")))]
      pub unsafe fn _Unwind_GetIPInfo(ctx: *mut _Unwind_Context,
                                      ip_before_insn: *mut c_int)
-@@ -189,6 +193,7 @@ mod uw {
+@@ -187,6 +191,7 @@ mod uw {
      // This function also doesn't exist on Android or ARM/Linux, so make it
      // a no-op
      #[cfg(any(target_os = "android",
diff --git a/lang/rust/files/patch-vendor_compiler__builtins_build.rs b/lang/rust/files/patch-vendor_compiler__builtins_build.rs
index 5a2861d298fe..cad9f4ff86a8 100644
--- a/lang/rust/files/patch-vendor_compiler__builtins_build.rs
+++ b/lang/rust/files/patch-vendor_compiler__builtins_build.rs
@@ -1,6 +1,6 @@
---- vendor/compiler_builtins/build.rs.orig	2019-01-16 09:30:44 UTC
+--- vendor/compiler_builtins/build.rs.orig	2019-04-08 14:18:23 UTC
 +++ vendor/compiler_builtins/build.rs
-@@ -308,6 +308,10 @@ mod c {
+@@ -311,6 +311,10 @@ mod c {
                  ],
              );
  
diff --git a/lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_freebsd_mod.rs b/lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_freebsd_mod.rs
index 971cd5452778..80073dbf144d 100644
--- a/lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_freebsd_mod.rs
+++ b/lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_freebsd_mod.rs
@@ -1,6 +1,6 @@
---- vendor/libc/src/unix/bsd/freebsdlike/freebsd/mod.rs.orig	2019-01-16 11:06:08 UTC
+--- vendor/libc/src/unix/bsd/freebsdlike/freebsd/mod.rs.orig	2019-04-08 14:18:24 UTC
 +++ vendor/libc/src/unix/bsd/freebsdlike/freebsd/mod.rs
-@@ -1154,6 +1154,12 @@ cfg_if! {
+@@ -1155,6 +1155,12 @@ cfg_if! {
      } else if #[cfg(target_arch = "aarch64")] {
          mod aarch64;
          pub use self::aarch64::*;
diff --git a/lang/rust/files/patch-vendor_rustc-ap-rustc__target_spec_armv6__unknown__freebsd.rs b/lang/rust/files/patch-vendor_rustc-ap-rustc__target_spec_armv6__unknown__freebsd.rs
index 3d8dbfcc3f61..86505a68352a 100644
--- a/lang/rust/files/patch-vendor_rustc-ap-rustc__target_spec_armv6__unknown__freebsd.rs
+++ b/lang/rust/files/patch-vendor_rustc-ap-rustc__target_spec_armv6__unknown__freebsd.rs
@@ -1,7 +1,7 @@
 --- vendor/rustc-ap-rustc_target/spec/armv6_unknown_freebsd.rs.orig	2019-02-15 13:41:07 UTC
 +++ vendor/rustc-ap-rustc_target/spec/armv6_unknown_freebsd.rs
 @@ -0,0 +1,24 @@
-+use spec::{LinkerFlavor, Target, TargetOptions, TargetResult};
++use crate::spec::{LinkerFlavor, Target, TargetOptions, TargetResult};
 +
 +pub fn target() -> TargetResult {
 +    let base = super::freebsd_base::opts();
diff --git a/lang/rust/files/patch-vendor_rustc-ap-rustc__target_spec_armv7__unknown__freebsd.rs b/lang/rust/files/patch-vendor_rustc-ap-rustc__target_spec_armv7__unknown__freebsd.rs
index 606aeecb682b..8b91ab6a845e 100644
--- a/lang/rust/files/patch-vendor_rustc-ap-rustc__target_spec_armv7__unknown__freebsd.rs
+++ b/lang/rust/files/patch-vendor_rustc-ap-rustc__target_spec_armv7__unknown__freebsd.rs
@@ -1,7 +1,7 @@
 --- vendor/rustc-ap-rustc_target/spec/armv7_unknown_freebsd.rs.orig	2019-02-15 13:41:07 UTC
 +++ vendor/rustc-ap-rustc_target/spec/armv7_unknown_freebsd.rs
 @@ -0,0 +1,24 @@
-+use spec::{LinkerFlavor, Target, TargetOptions, TargetResult};
++use crate::spec::{LinkerFlavor, Target, TargetOptions, TargetResult};
 +
 +pub fn target() -> TargetResult {
 +    let base = super::freebsd_base::opts();
diff --git a/lang/rust/files/patch-vendor_rustc-ap-rustc__target_spec_mod.rs b/lang/rust/files/patch-vendor_rustc-ap-rustc__target_spec_mod.rs
index 11b4e42ac1f5..55c58d1e75be 100644
--- a/lang/rust/files/patch-vendor_rustc-ap-rustc__target_spec_mod.rs
+++ b/lang/rust/files/patch-vendor_rustc-ap-rustc__target_spec_mod.rs
@@ -1,13 +1,11 @@
---- vendor/rustc-ap-rustc_target/spec/mod.rs.orig	2019-01-16 11:06:09 UTC
+--- vendor/rustc-ap-rustc_target/spec/mod.rs.orig	2019-04-08 14:18:26 UTC
 +++ vendor/rustc-ap-rustc_target/spec/mod.rs
-@@ -331,7 +331,10 @@ supported_targets! {
+@@ -368,6 +368,8 @@ supported_targets! {
      ("aarch64-linux-android", aarch64_linux_android),
  
      ("aarch64-unknown-freebsd", aarch64_unknown_freebsd),
 +    ("armv6-unknown-freebsd", armv6_unknown_freebsd),
 +    ("armv7-unknown-freebsd", armv7_unknown_freebsd),
      ("i686-unknown-freebsd", i686_unknown_freebsd),
-+    ("powerpc64-unknown-freebsd", powerpc64_unknown_freebsd),
+     ("powerpc64-unknown-freebsd", powerpc64_unknown_freebsd),
      ("x86_64-unknown-freebsd", x86_64_unknown_freebsd),
- 
-     ("i686-unknown-dragonfly", i686_unknown_dragonfly),
diff --git a/lang/rust/files/patch-vendor_rustc-ap-rustc__target_spec_powerpc64__unknown__freebsd.rs b/lang/rust/files/patch-vendor_rustc-ap-rustc__target_spec_powerpc64__unknown__freebsd.rs
deleted file mode 100644
index 4ed19e5cd2f1..000000000000
--- a/lang/rust/files/patch-vendor_rustc-ap-rustc__target_spec_powerpc64__unknown__freebsd.rs
+++ /dev/null
@@ -1,25 +0,0 @@
---- vendor/rustc-ap-rustc_target/spec/powerpc64_unknown_freebsd.rs.orig	2019-02-15 13:41:07 UTC
-+++ vendor/rustc-ap-rustc_target/spec/powerpc64_unknown_freebsd.rs
-@@ -0,0 +1,22 @@
-+use spec::{LinkerFlavor, Target, TargetResult};
-+
-+pub fn target() -> TargetResult {
-+    let mut base = super::freebsd_base::opts();
-+    base.cpu = "ppc64".to_string();
-+    base.pre_link_args.get_mut(&LinkerFlavor::Gcc).unwrap().push("-m64".to_string());
-+    base.max_atomic_width = Some(64);
-+
-+    Ok(Target {
-+        llvm_target: "powerpc64-unknown-freebsd".to_string(),
-+        target_endian: "big".to_string(),
-+        target_pointer_width: "64".to_string(),
-+        target_c_int_width: "32".to_string(),
-+        data_layout: "E-m:e-i64:64-n32:64".to_string(),
-+        arch: "powerpc64".to_string(),
-+        target_os: "freebsd".to_string(),
-+        target_env: String::new(),
-+        target_vendor: "unknown".to_string(),
-+        linker_flavor: LinkerFlavor::Gcc,
-+        options: base,
-+    })
-+}