diff --git a/src/ci/docker/dist-i686-freebsd/Dockerfile b/src/ci/docker/dist-i686-freebsd/Dockerfile
index 686afc97289b1..673fa4c0c4bc0 100644
--- a/src/ci/docker/dist-i686-freebsd/Dockerfile
+++ b/src/ci/docker/dist-i686-freebsd/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
   clang \
diff --git a/src/dlmalloc b/src/dlmalloc
index d3812c3accaee..a2b424b600235 160000
--- a/src/dlmalloc
+++ b/src/dlmalloc
@@ -1 +1 @@
-Subproject commit d3812c3accaee7ad23068ed4fc089cc05c7a538f
+Subproject commit a2b424b600235af58f453577c2da1b0e1de2ffa5
diff --git a/src/libcompiler_builtins b/src/libcompiler_builtins
index 0a95675bab808..345447948f7a5 160000
--- a/src/libcompiler_builtins
+++ b/src/libcompiler_builtins
@@ -1 +1 @@
-Subproject commit 0a95675bab808c49f86208bacc89c5d9c53ac43f
+Subproject commit 345447948f7a51eca970fa036cefd613d54a4f79
diff --git a/src/llvm b/src/llvm
index bc344d5bc23c6..781c27e4667e1 160000
--- a/src/llvm
+++ b/src/llvm
@@ -1 +1 @@
-Subproject commit bc344d5bc23c61ff9baf82d268a0edf199933cc3
+Subproject commit 781c27e4667e1ad1c3072f24b2939856c1d23009
diff --git a/src/rustllvm/RustWrapper.cpp b/src/rustllvm/RustWrapper.cpp
index 611d63f6a4d14..4dfc4029d75dc 100644
--- a/src/rustllvm/RustWrapper.cpp
+++ b/src/rustllvm/RustWrapper.cpp
@@ -552,9 +552,11 @@ static unsigned fromRust(LLVMRustDIFlags Flags) {
   if (isSet(Flags & LLVMRustDIFlags::FlagRValueReference)) {
     Result |= DINode::DIFlags::FlagRValueReference;
   }
+#if LLVM_VERSION_LE(4, 0)
   if (isSet(Flags & LLVMRustDIFlags::FlagExternalTypeRef)) {
     Result |= DINode::DIFlags::FlagExternalTypeRef;
   }
+#endif
   if (isSet(Flags & LLVMRustDIFlags::FlagIntroducedVirtual)) {
     Result |= DINode::DIFlags::FlagIntroducedVirtual;
   }