diff --git a/debian/patches/kfreebsd/compiler-rt_lib.diff b/debian/patches/kfreebsd/compiler-rt_lib.diff
index 4b9fd371..1e6c1288 100644
--- a/debian/patches/kfreebsd/compiler-rt_lib.diff
+++ b/debian/patches/kfreebsd/compiler-rt_lib.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
+Index: llvm-toolchain-snapshot_9~svn353106/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
 ===================================================================
---- llvm-toolchain-snapshot_9~svn353038.orig/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
-+++ llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
+--- llvm-toolchain-snapshot_9~svn353106.orig/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
++++ llvm-toolchain-snapshot_9~svn353106/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
 @@ -83,9 +83,14 @@
  extern "C" {
  // <sys/umtx.h> must be included after <errno.h> and <sys/types.h> on
@@ -44,10 +44,10 @@ Index: llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/sanitizer_common/sani
    char *base = (char *)map->l_addr;
    Elf_Ehdr *ehdr = (Elf_Ehdr *)base;
    char *phdrs = base + ehdr->e_phoff;
-Index: llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cc
+Index: llvm-toolchain-snapshot_9~svn353106/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cc
 ===================================================================
---- llvm-toolchain-snapshot_9~svn353038.orig/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cc
-+++ llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cc
+--- llvm-toolchain-snapshot_9~svn353106.orig/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cc
++++ llvm-toolchain-snapshot_9~svn353106/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cc
 @@ -35,10 +35,12 @@
  #include <syslog.h>
  
@@ -75,10 +75,10 @@ Index: llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/sanitizer_common/sani
  #define Elf_Phdr XElf32_Phdr
  #define dl_phdr_info xdl_phdr_info
  #define dl_iterate_phdr(c, b) xdl_iterate_phdr((c), (b))
-Index: llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
+Index: llvm-toolchain-snapshot_9~svn353106/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
 ===================================================================
---- llvm-toolchain-snapshot_9~svn353038.orig/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
-+++ llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
+--- llvm-toolchain-snapshot_9~svn353106.orig/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
++++ llvm-toolchain-snapshot_9~svn353106/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
 @@ -15,7 +15,7 @@
  #if !defined(__linux__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && \
    !defined(__OpenBSD__) && !defined(__APPLE__) && !defined(_WIN32) && \
@@ -118,10 +118,10 @@ Index: llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/sanitizer_common/sani
  
  #if __LP64__ || defined(_WIN64)
  #  define SANITIZER_WORDSIZE 64
-Index: llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/asan/asan_linux.cc
+Index: llvm-toolchain-snapshot_9~svn353106/compiler-rt/lib/asan/asan_linux.cc
 ===================================================================
---- llvm-toolchain-snapshot_9~svn353038.orig/compiler-rt/lib/asan/asan_linux.cc
-+++ llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/asan/asan_linux.cc
+--- llvm-toolchain-snapshot_9~svn353106.orig/compiler-rt/lib/asan/asan_linux.cc
++++ llvm-toolchain-snapshot_9~svn353106/compiler-rt/lib/asan/asan_linux.cc
 @@ -37,7 +37,7 @@
  #include <unistd.h>
  #include <unwind.h>
@@ -152,10 +152,10 @@ Index: llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/asan/asan_linux.cc
  #define ucontext_t xucontext_t
  #endif
  
-Index: llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/ubsan/ubsan_platform.h
+Index: llvm-toolchain-snapshot_9~svn353106/compiler-rt/lib/ubsan/ubsan_platform.h
 ===================================================================
---- llvm-toolchain-snapshot_9~svn353038.orig/compiler-rt/lib/ubsan/ubsan_platform.h
-+++ llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/ubsan/ubsan_platform.h
+--- llvm-toolchain-snapshot_9~svn353106.orig/compiler-rt/lib/ubsan/ubsan_platform.h
++++ llvm-toolchain-snapshot_9~svn353106/compiler-rt/lib/ubsan/ubsan_platform.h
 @@ -14,7 +14,7 @@
  
  // Other platforms should be easy to add, and probably work as-is.
@@ -165,10 +165,10 @@ Index: llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/ubsan/ubsan_platform.
      (defined(__sun__) && defined(__svr4__)) || \
      defined(_WIN32) || defined(__Fuchsia__) || defined(__rtems__)
  # define CAN_SANITIZE_UB 1
-Index: llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/tsan/rtl/tsan_rtl_amd64.S
+Index: llvm-toolchain-snapshot_9~svn353106/compiler-rt/lib/tsan/rtl/tsan_rtl_amd64.S
 ===================================================================
---- llvm-toolchain-snapshot_9~svn353038.orig/compiler-rt/lib/tsan/rtl/tsan_rtl_amd64.S
-+++ llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/tsan/rtl/tsan_rtl_amd64.S
+--- llvm-toolchain-snapshot_9~svn353106.orig/compiler-rt/lib/tsan/rtl/tsan_rtl_amd64.S
++++ llvm-toolchain-snapshot_9~svn353106/compiler-rt/lib/tsan/rtl/tsan_rtl_amd64.S
 @@ -197,7 +197,7 @@ ASM_SYMBOL_INTERCEPTOR(setjmp):
    lea 16(%rsp), %rdi
    mov %rdi, %rsi
@@ -205,10 +205,10 @@ Index: llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/tsan/rtl/tsan_rtl_amd
  /* We do not need executable stack.  */
  /* This note is not needed on NetBSD. */
  .section        .note.GNU-stack,"",@progbits
-Index: llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/fuzzer/FuzzerDefs.h
+Index: llvm-toolchain-snapshot_9~svn353106/compiler-rt/lib/fuzzer/FuzzerDefs.h
 ===================================================================
---- llvm-toolchain-snapshot_9~svn353038.orig/compiler-rt/lib/fuzzer/FuzzerDefs.h
-+++ llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/fuzzer/FuzzerDefs.h
+--- llvm-toolchain-snapshot_9~svn353106.orig/compiler-rt/lib/fuzzer/FuzzerDefs.h
++++ llvm-toolchain-snapshot_9~svn353106/compiler-rt/lib/fuzzer/FuzzerDefs.h
 @@ -27,6 +27,7 @@
  #define LIBFUZZER_LINUX 1
  #define LIBFUZZER_NETBSD 0
@@ -242,10 +242,10 @@ Index: llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/fuzzer/FuzzerDefs.h
  
  #ifdef __x86_64
  #  if __has_attribute(target)
-Index: llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/fuzzer/FuzzerUtilPosix.cpp
+Index: llvm-toolchain-snapshot_9~svn353106/compiler-rt/lib/fuzzer/FuzzerUtilPosix.cpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn353038.orig/compiler-rt/lib/fuzzer/FuzzerUtilPosix.cpp
-+++ llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/fuzzer/FuzzerUtilPosix.cpp
+--- llvm-toolchain-snapshot_9~svn353106.orig/compiler-rt/lib/fuzzer/FuzzerUtilPosix.cpp
++++ llvm-toolchain-snapshot_9~svn353106/compiler-rt/lib/fuzzer/FuzzerUtilPosix.cpp
 @@ -139,7 +139,7 @@ size_t GetPeakRSSMb() {
    if (getrusage(RUSAGE_SELF, &usage))
      return 0;
@@ -255,10 +255,10 @@ Index: llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/fuzzer/FuzzerUtilPosi
      // ru_maxrss is in KiB
      return usage.ru_maxrss >> 10;
    } else if (LIBFUZZER_APPLE) {
-Index: llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/fuzzer/FuzzerExtraCounters.cpp
+Index: llvm-toolchain-snapshot_9~svn353106/compiler-rt/lib/fuzzer/FuzzerExtraCounters.cpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn353038.orig/compiler-rt/lib/fuzzer/FuzzerExtraCounters.cpp
-+++ llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/fuzzer/FuzzerExtraCounters.cpp
+--- llvm-toolchain-snapshot_9~svn353106.orig/compiler-rt/lib/fuzzer/FuzzerExtraCounters.cpp
++++ llvm-toolchain-snapshot_9~svn353106/compiler-rt/lib/fuzzer/FuzzerExtraCounters.cpp
 @@ -11,7 +11,7 @@
  #include "FuzzerDefs.h"
  
@@ -268,10 +268,10 @@ Index: llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/fuzzer/FuzzerExtraCou
  __attribute__((weak)) extern uint8_t __start___libfuzzer_extra_counters;
  __attribute__((weak)) extern uint8_t __stop___libfuzzer_extra_counters;
  
-Index: llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/fuzzer/FuzzerExtFunctionsWeak.cpp
+Index: llvm-toolchain-snapshot_9~svn353106/compiler-rt/lib/fuzzer/FuzzerExtFunctionsWeak.cpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn353038.orig/compiler-rt/lib/fuzzer/FuzzerExtFunctionsWeak.cpp
-+++ llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/fuzzer/FuzzerExtFunctionsWeak.cpp
+--- llvm-toolchain-snapshot_9~svn353106.orig/compiler-rt/lib/fuzzer/FuzzerExtFunctionsWeak.cpp
++++ llvm-toolchain-snapshot_9~svn353106/compiler-rt/lib/fuzzer/FuzzerExtFunctionsWeak.cpp
 @@ -13,7 +13,7 @@
  //===----------------------------------------------------------------------===//
  #include "FuzzerDefs.h"
@@ -281,10 +281,10 @@ Index: llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/fuzzer/FuzzerExtFunct
  
  #include "FuzzerExtFunctions.h"
  #include "FuzzerIO.h"
-Index: llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/fuzzer/FuzzerUtilLinux.cpp
+Index: llvm-toolchain-snapshot_9~svn353106/compiler-rt/lib/fuzzer/FuzzerUtilLinux.cpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn353038.orig/compiler-rt/lib/fuzzer/FuzzerUtilLinux.cpp
-+++ llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/fuzzer/FuzzerUtilLinux.cpp
+--- llvm-toolchain-snapshot_9~svn353106.orig/compiler-rt/lib/fuzzer/FuzzerUtilLinux.cpp
++++ llvm-toolchain-snapshot_9~svn353106/compiler-rt/lib/fuzzer/FuzzerUtilLinux.cpp
 @@ -9,7 +9,7 @@
  //===----------------------------------------------------------------------===//
  #include "FuzzerDefs.h"
@@ -294,10 +294,10 @@ Index: llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/fuzzer/FuzzerUtilLinu
  #include "FuzzerCommand.h"
  
  #include <stdlib.h>
-Index: llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/sanitizer_common/sanitizer_freebsd.h
+Index: llvm-toolchain-snapshot_9~svn353106/compiler-rt/lib/sanitizer_common/sanitizer_freebsd.h
 ===================================================================
---- llvm-toolchain-snapshot_9~svn353038.orig/compiler-rt/lib/sanitizer_common/sanitizer_freebsd.h
-+++ llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/sanitizer_common/sanitizer_freebsd.h
+--- llvm-toolchain-snapshot_9~svn353106.orig/compiler-rt/lib/sanitizer_common/sanitizer_freebsd.h
++++ llvm-toolchain-snapshot_9~svn353106/compiler-rt/lib/sanitizer_common/sanitizer_freebsd.h
 @@ -20,7 +20,7 @@
  // 32-bit mode.
  #if SANITIZER_FREEBSD && (SANITIZER_WORDSIZE == 32)
@@ -307,10 +307,10 @@ Index: llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/sanitizer_common/sani
  #  include <link.h>
  #  include <sys/param.h>
  #  include <ucontext.h>
-Index: llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/sanitizer_common/sanitizer_procmaps_bsd.cc
+Index: llvm-toolchain-snapshot_9~svn353106/compiler-rt/lib/sanitizer_common/sanitizer_procmaps_bsd.cc
 ===================================================================
---- llvm-toolchain-snapshot_9~svn353038.orig/compiler-rt/lib/sanitizer_common/sanitizer_procmaps_bsd.cc
-+++ llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/sanitizer_common/sanitizer_procmaps_bsd.cc
+--- llvm-toolchain-snapshot_9~svn353106.orig/compiler-rt/lib/sanitizer_common/sanitizer_procmaps_bsd.cc
++++ llvm-toolchain-snapshot_9~svn353106/compiler-rt/lib/sanitizer_common/sanitizer_procmaps_bsd.cc
 @@ -37,7 +37,7 @@
  // Fix 'kinfo_vmentry' definition on FreeBSD prior v9.2 in 32-bit mode.
  #if SANITIZER_FREEBSD && (SANITIZER_WORDSIZE == 32)
@@ -320,10 +320,10 @@ Index: llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/sanitizer_common/sani
  #define kinfo_vmentry xkinfo_vmentry
  #endif
  #endif
-Index: llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
+Index: llvm-toolchain-snapshot_9~svn353106/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
 ===================================================================
---- llvm-toolchain-snapshot_9~svn353038.orig/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
-+++ llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
+--- llvm-toolchain-snapshot_9~svn353106.orig/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
++++ llvm-toolchain-snapshot_9~svn353106/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
 @@ -19,7 +19,9 @@
  #include "sanitizer_internal_defs.h"
  #include "sanitizer_platform.h"
@@ -334,10 +334,10 @@ Index: llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/sanitizer_common/sani
  
  #ifndef __GLIBC_PREREQ
  #define __GLIBC_PREREQ(x, y) 0
-Index: llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/sanitizer_common/sanitizer_syscall_generic.inc
+Index: llvm-toolchain-snapshot_9~svn353106/compiler-rt/lib/sanitizer_common/sanitizer_syscall_generic.inc
 ===================================================================
---- llvm-toolchain-snapshot_9~svn353038.orig/compiler-rt/lib/sanitizer_common/sanitizer_syscall_generic.inc
-+++ llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/sanitizer_common/sanitizer_syscall_generic.inc
+--- llvm-toolchain-snapshot_9~svn353106.orig/compiler-rt/lib/sanitizer_common/sanitizer_syscall_generic.inc
++++ llvm-toolchain-snapshot_9~svn353106/compiler-rt/lib/sanitizer_common/sanitizer_syscall_generic.inc
 @@ -19,7 +19,7 @@
  # define SYSCALL(name) __NR_ ## name
  #endif
@@ -347,31 +347,37 @@ Index: llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/sanitizer_common/sani
  # define internal_syscall __syscall
  # else
  # define internal_syscall syscall
-Index: llvm-toolchain-8-8~+rc1/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+Index: llvm-toolchain-snapshot_9~svn353106/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
 ===================================================================
---- llvm-toolchain-8-8~+rc1.orig/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
-+++ llvm-toolchain-8-8~+rc1/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
-@@ -110,9 +110,9 @@ typedef struct user_fpregs elf_fpregset_
+--- llvm-toolchain-snapshot_9~svn353106.orig/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
++++ llvm-toolchain-snapshot_9~svn353106/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+@@ -105,10 +105,14 @@ typedef struct user_fpregs elf_fpregset_
+ #include <wordexp.h>
+ #endif
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if (SANITIZER_LINUX && !SANITIZER_ANDROID) || SANITIZER_KFREEBSD
  #include <glob.h>
  #include <obstack.h>
- #if SANITIZER_KFREEBSD
--# include <mqueue.h>
--#else
- # include <sys/mqueue.h>
++#if SANITIZER_KFREEBSD
+ #include <mqueue.h>
 +#else
-+# include <mqueue.h>
- #endif
++#include <sys/mqueue.h>
++#endif
  #include <net/if_ppp.h>
  #include <netax25/ax25.h>
-@@ -151,9 +151,9 @@ typedef struct user_fpregs elf_fpregset_
+ #include <netipx/ipx.h>
+@@ -145,8 +149,12 @@ typedef struct user_fpregs elf_fpregset_
+ #include <linux/if_ppp.h>
  #endif
  
- #if SANITIZER_KFREEBSD
--# include <link.h>
--#else
- # include <sys/link_elf.h>
+-#if SANITIZER_LINUX
++#if SANITIZER_LINUX || SANITIZER_KFREEBSD
++#if SANITIZER_KFREEBSD
++#include <sys/link.h>
 +#else
-+# include <link.h>
- #endif
- 
- #if SANITIZER_LINUX
+ #include <link.h>
++#endif
+ #include <sys/vfs.h>
+ #include <sys/epoll.h>
+ #include <linux/capability.h>