diff --git a/debian/patches/kfreebsd/kfreebsd-triple-clang.diff b/debian/patches/kfreebsd/kfreebsd-triple-clang.diff
index 54203683..48616618 100644
--- a/debian/patches/kfreebsd/kfreebsd-triple-clang.diff
+++ b/debian/patches/kfreebsd/kfreebsd-triple-clang.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_9~svn358740/clang/lib/Driver/CMakeLists.txt
+Index: llvm-toolchain-snapshot_10~svn368975/clang/lib/Driver/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_9~svn358740.orig/clang/lib/Driver/CMakeLists.txt
-+++ llvm-toolchain-snapshot_9~svn358740/clang/lib/Driver/CMakeLists.txt
+--- llvm-toolchain-snapshot_10~svn368975.orig/clang/lib/Driver/CMakeLists.txt
++++ llvm-toolchain-snapshot_10~svn368975/clang/lib/Driver/CMakeLists.txt
 @@ -49,6 +49,7 @@ add_clang_library(clangDriver
    ToolChains/HIP.cpp
    ToolChains/Hexagon.cpp
@@ -10,10 +10,10 @@ Index: llvm-toolchain-snapshot_9~svn358740/clang/lib/Driver/CMakeLists.txt
    ToolChains/Linux.cpp
    ToolChains/MipsLinux.cpp
    ToolChains/MinGW.cpp
-Index: llvm-toolchain-snapshot_9~svn358740/clang/lib/Driver/Driver.cpp
+Index: llvm-toolchain-snapshot_10~svn368975/clang/lib/Driver/Driver.cpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn358740.orig/clang/lib/Driver/Driver.cpp
-+++ llvm-toolchain-snapshot_9~svn358740/clang/lib/Driver/Driver.cpp
+--- llvm-toolchain-snapshot_10~svn368975.orig/clang/lib/Driver/Driver.cpp
++++ llvm-toolchain-snapshot_10~svn368975/clang/lib/Driver/Driver.cpp
 @@ -26,6 +26,7 @@
  #include "ToolChains/Haiku.h"
  #include "ToolChains/Hexagon.h"
@@ -22,21 +22,21 @@ Index: llvm-toolchain-snapshot_9~svn358740/clang/lib/Driver/Driver.cpp
  #include "ToolChains/Lanai.h"
  #include "ToolChains/Linux.h"
  #include "ToolChains/MSP430.h"
-@@ -4564,6 +4565,9 @@ const ToolChain &Driver::getToolChain(co
+@@ -4632,6 +4633,9 @@ const ToolChain &Driver::getToolChain(co
      case llvm::Triple::FreeBSD:
-       TC = llvm::make_unique<toolchains::FreeBSD>(*this, Target, Args);
+       TC = std::make_unique<toolchains::FreeBSD>(*this, Target, Args);
        break;
 +    case llvm::Triple::kFreeBSD:
 +      TC = llvm::make_unique<toolchains::kFreeBSD>(*this, Target, Args);
 +      break;
      case llvm::Triple::Minix:
-       TC = llvm::make_unique<toolchains::Minix>(*this, Target, Args);
+       TC = std::make_unique<toolchains::Minix>(*this, Target, Args);
        break;
-Index: llvm-toolchain-snapshot_9~svn358740/clang/lib/Driver/ToolChains/Clang.cpp
+Index: llvm-toolchain-snapshot_10~svn368975/clang/lib/Driver/ToolChains/Clang.cpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn358740.orig/clang/lib/Driver/ToolChains/Clang.cpp
-+++ llvm-toolchain-snapshot_9~svn358740/clang/lib/Driver/ToolChains/Clang.cpp
-@@ -547,7 +547,7 @@ static bool useFramePointerForTargetByDe
+--- llvm-toolchain-snapshot_10~svn368975.orig/clang/lib/Driver/ToolChains/Clang.cpp
++++ llvm-toolchain-snapshot_10~svn368975/clang/lib/Driver/ToolChains/Clang.cpp
+@@ -542,7 +542,7 @@ static bool useFramePointerForTargetByDe
    }
  
    if (Triple.isOSLinux() || Triple.getOS() == llvm::Triple::CloudABI ||
@@ -45,11 +45,11 @@ Index: llvm-toolchain-snapshot_9~svn358740/clang/lib/Driver/ToolChains/Clang.cpp
      switch (Triple.getArch()) {
      // Don't use a frame pointer on linux if optimizing for certain targets.
      case llvm::Triple::mips64:
-Index: llvm-toolchain-snapshot_9~svn358740/clang/lib/Driver/ToolChains/Gnu.cpp
+Index: llvm-toolchain-snapshot_10~svn368975/clang/lib/Driver/ToolChains/Gnu.cpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn358740.orig/clang/lib/Driver/ToolChains/Gnu.cpp
-+++ llvm-toolchain-snapshot_9~svn358740/clang/lib/Driver/ToolChains/Gnu.cpp
-@@ -541,6 +541,20 @@ void tools::gnutools::Linker::ConstructJ
+--- llvm-toolchain-snapshot_10~svn368975.orig/clang/lib/Driver/ToolChains/Gnu.cpp
++++ llvm-toolchain-snapshot_10~svn368975/clang/lib/Driver/ToolChains/Gnu.cpp
+@@ -576,6 +576,20 @@ void tools::gnutools::Linker::ConstructJ
  
        if (!Args.hasArg(options::OPT_nolibc))
          CmdArgs.push_back("-lc");
@@ -70,7 +70,7 @@ Index: llvm-toolchain-snapshot_9~svn358740/clang/lib/Driver/ToolChains/Gnu.cpp
  
        // Add IAMCU specific libs, if needed.
        if (IsIAMCU)
-@@ -1924,7 +1938,8 @@ void Generic_GCC::GCCInstallationDetecto
+@@ -1957,7 +1971,8 @@ void Generic_GCC::GCCInstallationDetecto
        "x86_64-redhat-linux",    "x86_64-suse-linux",
        "x86_64-manbo-linux-gnu", "x86_64-linux-gnu",
        "x86_64-slackware-linux", "x86_64-unknown-linux",
@@ -80,7 +80,7 @@ Index: llvm-toolchain-snapshot_9~svn358740/clang/lib/Driver/ToolChains/Gnu.cpp
    static const char *const X32LibDirs[] = {"/libx32"};
    static const char *const X86LibDirs[] = {"/lib32", "/lib"};
    static const char *const X86Triples[] = {
-@@ -1933,7 +1948,9 @@ void Generic_GCC::GCCInstallationDetecto
+@@ -1966,7 +1981,9 @@ void Generic_GCC::GCCInstallationDetecto
        "i586-redhat-linux",    "i386-redhat-linux",     "i586-suse-linux",
        "i486-slackware-linux", "i686-montavista-linux", "i586-linux-gnu",
        "i686-linux-android",   "i386-gnu",              "i486-gnu",
@@ -91,10 +91,10 @@ Index: llvm-toolchain-snapshot_9~svn358740/clang/lib/Driver/ToolChains/Gnu.cpp
  
    static const char *const MIPSLibDirs[] = {"/lib"};
    static const char *const MIPSTriples[] = {
-Index: llvm-toolchain-snapshot_9~svn358740/clang/lib/Driver/ToolChains/KFreeBSD.cpp
+Index: llvm-toolchain-snapshot_10~svn368975/clang/lib/Driver/ToolChains/KFreeBSD.cpp
 ===================================================================
 --- /dev/null
-+++ llvm-toolchain-snapshot_9~svn358740/clang/lib/Driver/ToolChains/KFreeBSD.cpp
++++ llvm-toolchain-snapshot_10~svn368975/clang/lib/Driver/ToolChains/KFreeBSD.cpp
 @@ -0,0 +1,458 @@
 +//===--- KFreeBSD.cpp - kFreeBSD ToolChain Implementations --------*- C++ -*-===//
 +//
@@ -554,10 +554,10 @@ Index: llvm-toolchain-snapshot_9~svn358740/clang/lib/Driver/ToolChains/KFreeBSD.
 +  return Res;
 +}
 +
-Index: llvm-toolchain-snapshot_9~svn358740/clang/lib/Driver/ToolChains/KFreeBSD.h
+Index: llvm-toolchain-snapshot_10~svn368975/clang/lib/Driver/ToolChains/KFreeBSD.h
 ===================================================================
 --- /dev/null
-+++ llvm-toolchain-snapshot_9~svn358740/clang/lib/Driver/ToolChains/KFreeBSD.h
++++ llvm-toolchain-snapshot_10~svn368975/clang/lib/Driver/ToolChains/KFreeBSD.h
 @@ -0,0 +1,54 @@
 +//===--- KFreeBSD.h - kFreeBSD ToolChain Implementations ----------*- C++ -*-===//
 +//