From 2befabf144e74fe85baa1a5b61b0438049a6bb7c Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Fri, 19 Apr 2019 08:50:01 +0200
Subject: [PATCH] refresh of the patches

---
 debian/patches/hurd/hurd-EIEIO-undef.diff     |   8 +-
 debian/patches/hurd/hurd-pathmax.diff         |  26 ++---
 debian/patches/hurd/impl-path-hurd.diff       |   8 +-
 debian/patches/kfreebsd/CMakeLists.txt.diff   |   8 +-
 .../kfreebsd/clang_lib_Basic_Targets.diff     |  20 ++--
 debian/patches/kfreebsd/compiler-rt_lib.diff  | 102 +++++++++---------
 .../kfreebsd/include_llvm_ADT_Triple.h.diff   |  10 +-
 .../kfreebsd-libcxx-threads-detection.diff    |   8 +-
 debian/patches/kfreebsd/kfreebsd-openmp.diff  |  42 ++++----
 .../kfreebsd/kfreebsd-triple-clang.diff       |  42 ++++----
 debian/patches/kfreebsd/kfreebsd-triple.diff  |   6 +-
 debian/patches/kfreebsd/lib_Support.diff      |  16 +--
 debian/patches/kfreebsd/lib_Target_X86.diff   |  16 +--
 debian/patches/lldb-soname.diff               |  14 +--
 14 files changed, 163 insertions(+), 163 deletions(-)

diff --git a/debian/patches/hurd/hurd-EIEIO-undef.diff b/debian/patches/hurd/hurd-EIEIO-undef.diff
index 3b98ad92..8a183a47 100644
--- a/debian/patches/hurd/hurd-EIEIO-undef.diff
+++ b/debian/patches/hurd/hurd-EIEIO-undef.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_3.9~svn268880/utils/TableGen/CodeEmitterGen.cpp
+Index: llvm-toolchain-snapshot_9~svn358740/utils/TableGen/CodeEmitterGen.cpp
 ===================================================================
---- llvm-toolchain-snapshot_3.9~svn268880.orig/utils/TableGen/CodeEmitterGen.cpp
-+++ llvm-toolchain-snapshot_3.9~svn268880/utils/TableGen/CodeEmitterGen.cpp
-@@ -229,6 +229,9 @@ void CodeEmitterGen::run(raw_ostream &o)
+--- llvm-toolchain-snapshot_9~svn358740.orig/utils/TableGen/CodeEmitterGen.cpp
++++ llvm-toolchain-snapshot_9~svn358740/utils/TableGen/CodeEmitterGen.cpp
+@@ -247,6 +247,9 @@ void CodeEmitterGen::run(raw_ostream &o)
    ArrayRef<const CodeGenInstruction*> NumberedInstructions =
      Target.getInstructionsByEnumValue();
  
diff --git a/debian/patches/hurd/hurd-pathmax.diff b/debian/patches/hurd/hurd-pathmax.diff
index 4f647bb9..08b76edc 100644
--- a/debian/patches/hurd/hurd-pathmax.diff
+++ b/debian/patches/hurd/hurd-pathmax.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_9~svn353687/clang/lib/Basic/FileManager.cpp
+Index: llvm-toolchain-snapshot_9~svn358740/clang/lib/Basic/FileManager.cpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn353687.orig/clang/lib/Basic/FileManager.cpp
-+++ llvm-toolchain-snapshot_9~svn353687/clang/lib/Basic/FileManager.cpp
-@@ -458,6 +458,12 @@ void FileManager::invalidateCache(const
+--- llvm-toolchain-snapshot_9~svn358740.orig/clang/lib/Basic/FileManager.cpp
++++ llvm-toolchain-snapshot_9~svn358740/clang/lib/Basic/FileManager.cpp
+@@ -465,6 +465,12 @@ void FileManager::invalidateCache(const
    UniqueRealFiles.erase(Entry->getUniqueID());
  }
  
@@ -15,10 +15,10 @@ Index: llvm-toolchain-snapshot_9~svn353687/clang/lib/Basic/FileManager.cpp
  void FileManager::GetUniqueIDMapping(
                     SmallVectorImpl<const FileEntry *> &UIDToFiles) const {
    UIDToFiles.clear();
-Index: llvm-toolchain-snapshot_9~svn353687/lldb/include/lldb/lldb-defines.h
+Index: llvm-toolchain-snapshot_9~svn358740/lldb/include/lldb/lldb-defines.h
 ===================================================================
---- llvm-toolchain-snapshot_9~svn353687.orig/lldb/include/lldb/lldb-defines.h
-+++ llvm-toolchain-snapshot_9~svn353687/lldb/include/lldb/lldb-defines.h
+--- llvm-toolchain-snapshot_9~svn358740.orig/lldb/include/lldb/lldb-defines.h
++++ llvm-toolchain-snapshot_9~svn358740/lldb/include/lldb/lldb-defines.h
 @@ -27,6 +27,11 @@
  #define INT32_MAX 2147483647
  #endif
@@ -31,10 +31,10 @@ Index: llvm-toolchain-snapshot_9~svn353687/lldb/include/lldb/lldb-defines.h
  #if !defined(UINT32_MAX)
  #define UINT32_MAX 4294967295U
  #endif
-Index: llvm-toolchain-snapshot_9~svn353687/tools/dsymutil/DwarfLinker.cpp
+Index: llvm-toolchain-snapshot_9~svn358740/tools/dsymutil/DwarfLinker.cpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn353687.orig/tools/dsymutil/DwarfLinker.cpp
-+++ llvm-toolchain-snapshot_9~svn353687/tools/dsymutil/DwarfLinker.cpp
+--- llvm-toolchain-snapshot_9~svn358740.orig/tools/dsymutil/DwarfLinker.cpp
++++ llvm-toolchain-snapshot_9~svn358740/tools/dsymutil/DwarfLinker.cpp
 @@ -100,6 +100,11 @@
  #include <utility>
  #include <vector>
@@ -47,10 +47,10 @@ Index: llvm-toolchain-snapshot_9~svn353687/tools/dsymutil/DwarfLinker.cpp
  namespace llvm {
  namespace dsymutil {
  
-Index: llvm-toolchain-snapshot_9~svn353687/polly/lib/External/ppcg/cuda_common.c
+Index: llvm-toolchain-snapshot_9~svn358740/polly/lib/External/ppcg/cuda_common.c
 ===================================================================
---- llvm-toolchain-snapshot_9~svn353687.orig/polly/lib/External/ppcg/cuda_common.c
-+++ llvm-toolchain-snapshot_9~svn353687/polly/lib/External/ppcg/cuda_common.c
+--- llvm-toolchain-snapshot_9~svn358740.orig/polly/lib/External/ppcg/cuda_common.c
++++ llvm-toolchain-snapshot_9~svn358740/polly/lib/External/ppcg/cuda_common.c
 @@ -15,6 +15,11 @@
  #include "cuda_common.h"
  #include "ppcg.h"
diff --git a/debian/patches/hurd/impl-path-hurd.diff b/debian/patches/hurd/impl-path-hurd.diff
index 4d7b7a6b..43cc64b0 100644
--- a/debian/patches/hurd/impl-path-hurd.diff
+++ b/debian/patches/hurd/impl-path-hurd.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_7~svn334230/lib/Support/Unix/Path.inc
+Index: llvm-toolchain-snapshot_9~svn358740/lib/Support/Unix/Path.inc
 ===================================================================
---- llvm-toolchain-snapshot_7~svn334230.orig/lib/Support/Unix/Path.inc
-+++ llvm-toolchain-snapshot_7~svn334230/lib/Support/Unix/Path.inc
-@@ -175,7 +175,7 @@ std::string getMainExecutable(const char
+--- llvm-toolchain-snapshot_9~svn358740.orig/lib/Support/Unix/Path.inc
++++ llvm-toolchain-snapshot_9~svn358740/lib/Support/Unix/Path.inc
+@@ -189,7 +189,7 @@ std::string getMainExecutable(const char
  
    if (getprogpath(exe_path, argv0) != NULL)
      return exe_path;
diff --git a/debian/patches/kfreebsd/CMakeLists.txt.diff b/debian/patches/kfreebsd/CMakeLists.txt.diff
index 30ec60e8..b1616f9a 100644
--- a/debian/patches/kfreebsd/CMakeLists.txt.diff
+++ b/debian/patches/kfreebsd/CMakeLists.txt.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-7-7.0.1/CMakeLists.txt
+Index: llvm-toolchain-snapshot_9~svn358740/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-7-7.0.1.orig/CMakeLists.txt
-+++ llvm-toolchain-7-7.0.1/CMakeLists.txt
-@@ -821,7 +821,7 @@ if(LLVM_TARGET_IS_CROSSCOMPILE_HOST)
+--- llvm-toolchain-snapshot_9~svn358740.orig/CMakeLists.txt
++++ llvm-toolchain-snapshot_9~svn358740/CMakeLists.txt
+@@ -872,7 +872,7 @@ if(LLVM_TARGET_IS_CROSSCOMPILE_HOST)
  # (this is a variable that CrossCompile sets on recursive invocations)
  endif()
  
diff --git a/debian/patches/kfreebsd/clang_lib_Basic_Targets.diff b/debian/patches/kfreebsd/clang_lib_Basic_Targets.diff
index 8361b819..ec903636 100644
--- a/debian/patches/kfreebsd/clang_lib_Basic_Targets.diff
+++ b/debian/patches/kfreebsd/clang_lib_Basic_Targets.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-7-7.0.1/clang/lib/Basic/Targets.cpp
+Index: llvm-toolchain-snapshot_9~svn358740/clang/lib/Basic/Targets.cpp
 ===================================================================
---- llvm-toolchain-7-7.0.1.orig/clang/lib/Basic/Targets.cpp
-+++ llvm-toolchain-7-7.0.1/clang/lib/Basic/Targets.cpp
-@@ -469,8 +469,8 @@ TargetInfo *AllocateTarget(const llvm::T
+--- llvm-toolchain-snapshot_9~svn358740.orig/clang/lib/Basic/Targets.cpp
++++ llvm-toolchain-snapshot_9~svn358740/clang/lib/Basic/Targets.cpp
+@@ -472,8 +472,8 @@ TargetInfo *AllocateTarget(const llvm::T
        return new OpenBSDI386TargetInfo(Triple, Opts);
      case llvm::Triple::FreeBSD:
        return new FreeBSDTargetInfo<X86_32TargetInfo>(Triple, Opts);
@@ -13,7 +13,7 @@ Index: llvm-toolchain-7-7.0.1/clang/lib/Basic/Targets.cpp
      case llvm::Triple::Minix:
        return new MinixTargetInfo<X86_32TargetInfo>(Triple, Opts);
      case llvm::Triple::Solaris:
-@@ -528,8 +528,8 @@ TargetInfo *AllocateTarget(const llvm::T
+@@ -531,8 +531,8 @@ TargetInfo *AllocateTarget(const llvm::T
        return new FreeBSDTargetInfo<X86_64TargetInfo>(Triple, Opts);
      case llvm::Triple::Fuchsia:
        return new FuchsiaTargetInfo<X86_64TargetInfo>(Triple, Opts);
@@ -24,11 +24,11 @@ Index: llvm-toolchain-7-7.0.1/clang/lib/Basic/Targets.cpp
      case llvm::Triple::Solaris:
        return new SolarisTargetInfo<X86_64TargetInfo>(Triple, Opts);
      case llvm::Triple::Win32: {
-Index: llvm-toolchain-7-7.0.1/clang/lib/Basic/Targets/OSTargets.h
+Index: llvm-toolchain-snapshot_9~svn358740/clang/lib/Basic/Targets/OSTargets.h
 ===================================================================
---- llvm-toolchain-7-7.0.1.orig/clang/lib/Basic/Targets/OSTargets.h
-+++ llvm-toolchain-7-7.0.1/clang/lib/Basic/Targets/OSTargets.h
-@@ -226,7 +226,7 @@ public:
+--- llvm-toolchain-snapshot_9~svn358740.orig/clang/lib/Basic/Targets/OSTargets.h
++++ llvm-toolchain-snapshot_9~svn358740/clang/lib/Basic/Targets/OSTargets.h
+@@ -234,7 +234,7 @@ public:
  
  // GNU/kFreeBSD Target
  template <typename Target>
@@ -37,7 +37,7 @@ Index: llvm-toolchain-7-7.0.1/clang/lib/Basic/Targets/OSTargets.h
  protected:
    void getOSDefines(const LangOptions &Opts, const llvm::Triple &Triple,
                      MacroBuilder &Builder) const override {
-@@ -243,7 +243,7 @@ protected:
+@@ -251,7 +251,7 @@ protected:
    }
  
  public:
diff --git a/debian/patches/kfreebsd/compiler-rt_lib.diff b/debian/patches/kfreebsd/compiler-rt_lib.diff
index e4168df4..dd786bbd 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~svn354727/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
+Index: llvm-toolchain-snapshot_9~svn358740/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
 ===================================================================
---- llvm-toolchain-snapshot_9~svn354727.orig/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
-+++ llvm-toolchain-snapshot_9~svn354727/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
+--- llvm-toolchain-snapshot_9~svn358740.orig/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
++++ llvm-toolchain-snapshot_9~svn358740/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
@@ -17,7 +17,7 @@ Index: llvm-toolchain-snapshot_9~svn354727/compiler-rt/lib/sanitizer_common/sani
  #endif  // SANITIZER_FREEBSD
  
  #if SANITIZER_NETBSD
-@@ -467,10 +472,12 @@ bool FileExists(const char *filename) {
+@@ -461,10 +466,12 @@ bool FileExists(const char *filename) {
  
  #if !SANITIZER_NETBSD
  tid_t GetTid() {
@@ -31,7 +31,7 @@ Index: llvm-toolchain-snapshot_9~svn354727/compiler-rt/lib/sanitizer_common/sani
  #elif SANITIZER_OPENBSD
    return internal_syscall(SYSCALL(getthrid));
  #elif SANITIZER_SOLARIS
-@@ -1166,10 +1173,10 @@ bool LibraryNameIs(const char *full_name
+@@ -1144,10 +1151,10 @@ bool LibraryNameIs(const char *full_name
  // Call cb for each region mapped by map.
  void ForEachMappedRegion(link_map *map, void (*cb)(const void *, uptr)) {
    CHECK_NE(map, nullptr);
@@ -44,10 +44,10 @@ Index: llvm-toolchain-snapshot_9~svn354727/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~svn354727/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cc
+Index: llvm-toolchain-snapshot_9~svn358740/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cc
 ===================================================================
---- llvm-toolchain-snapshot_9~svn354727.orig/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cc
-+++ llvm-toolchain-snapshot_9~svn354727/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cc
+--- llvm-toolchain-snapshot_9~svn358740.orig/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cc
++++ llvm-toolchain-snapshot_9~svn358740/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cc
 @@ -35,10 +35,12 @@
  #include <syslog.h>
  
@@ -63,7 +63,7 @@ Index: llvm-toolchain-snapshot_9~svn354727/compiler-rt/lib/sanitizer_common/sani
  #endif
  
  #if SANITIZER_OPENBSD
-@@ -527,9 +529,9 @@ void GetThreadStackAndTls(bool main, upt
+@@ -528,9 +530,9 @@ void GetThreadStackAndTls(bool main, upt
  #endif
  }
  
@@ -75,10 +75,10 @@ Index: llvm-toolchain-snapshot_9~svn354727/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~svn354727/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
+Index: llvm-toolchain-snapshot_9~svn358740/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
 ===================================================================
---- llvm-toolchain-snapshot_9~svn354727.orig/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
-+++ llvm-toolchain-snapshot_9~svn354727/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
+--- llvm-toolchain-snapshot_9~svn358740.orig/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
++++ llvm-toolchain-snapshot_9~svn358740/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~svn354727/compiler-rt/lib/sanitizer_common/sani
  
  #if __LP64__ || defined(_WIN64)
  #  define SANITIZER_WORDSIZE 64
-Index: llvm-toolchain-snapshot_9~svn354727/compiler-rt/lib/asan/asan_linux.cc
+Index: llvm-toolchain-snapshot_9~svn358740/compiler-rt/lib/asan/asan_linux.cc
 ===================================================================
---- llvm-toolchain-snapshot_9~svn354727.orig/compiler-rt/lib/asan/asan_linux.cc
-+++ llvm-toolchain-snapshot_9~svn354727/compiler-rt/lib/asan/asan_linux.cc
+--- llvm-toolchain-snapshot_9~svn358740.orig/compiler-rt/lib/asan/asan_linux.cc
++++ llvm-toolchain-snapshot_9~svn358740/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~svn354727/compiler-rt/lib/asan/asan_linux.cc
  #define ucontext_t xucontext_t
  #endif
  
-Index: llvm-toolchain-snapshot_9~svn354727/compiler-rt/lib/ubsan/ubsan_platform.h
+Index: llvm-toolchain-snapshot_9~svn358740/compiler-rt/lib/ubsan/ubsan_platform.h
 ===================================================================
---- llvm-toolchain-snapshot_9~svn354727.orig/compiler-rt/lib/ubsan/ubsan_platform.h
-+++ llvm-toolchain-snapshot_9~svn354727/compiler-rt/lib/ubsan/ubsan_platform.h
+--- llvm-toolchain-snapshot_9~svn358740.orig/compiler-rt/lib/ubsan/ubsan_platform.h
++++ llvm-toolchain-snapshot_9~svn358740/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~svn354727/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~svn354727/compiler-rt/lib/tsan/rtl/tsan_rtl_amd64.S
+Index: llvm-toolchain-snapshot_9~svn358740/compiler-rt/lib/tsan/rtl/tsan_rtl_amd64.S
 ===================================================================
---- llvm-toolchain-snapshot_9~svn354727.orig/compiler-rt/lib/tsan/rtl/tsan_rtl_amd64.S
-+++ llvm-toolchain-snapshot_9~svn354727/compiler-rt/lib/tsan/rtl/tsan_rtl_amd64.S
+--- llvm-toolchain-snapshot_9~svn358740.orig/compiler-rt/lib/tsan/rtl/tsan_rtl_amd64.S
++++ llvm-toolchain-snapshot_9~svn358740/compiler-rt/lib/tsan/rtl/tsan_rtl_amd64.S
 @@ -197,7 +197,7 @@ ASM_SYMBOL_INTERCEPTOR(setjmp):
    lea 16(%rsp), %rdi
    mov %rdi, %rsi
@@ -196,10 +196,10 @@ Index: llvm-toolchain-snapshot_9~svn354727/compiler-rt/lib/tsan/rtl/tsan_rtl_amd
    lea 32(%rsp), %rdi
    mov %rdi, %rsi
    xor %fs:0x30, %rsi  // magic mangling of rsp (see libc setjmp)
-Index: llvm-toolchain-snapshot_9~svn354727/compiler-rt/lib/fuzzer/FuzzerDefs.h
+Index: llvm-toolchain-snapshot_9~svn358740/compiler-rt/lib/fuzzer/FuzzerDefs.h
 ===================================================================
---- llvm-toolchain-snapshot_9~svn354727.orig/compiler-rt/lib/fuzzer/FuzzerDefs.h
-+++ llvm-toolchain-snapshot_9~svn354727/compiler-rt/lib/fuzzer/FuzzerDefs.h
+--- llvm-toolchain-snapshot_9~svn358740.orig/compiler-rt/lib/fuzzer/FuzzerDefs.h
++++ llvm-toolchain-snapshot_9~svn358740/compiler-rt/lib/fuzzer/FuzzerDefs.h
 @@ -27,6 +27,7 @@
  #define LIBFUZZER_LINUX 1
  #define LIBFUZZER_NETBSD 0
@@ -233,10 +233,10 @@ Index: llvm-toolchain-snapshot_9~svn354727/compiler-rt/lib/fuzzer/FuzzerDefs.h
  
  #ifdef __x86_64
  #  if __has_attribute(target)
-Index: llvm-toolchain-snapshot_9~svn354727/compiler-rt/lib/fuzzer/FuzzerUtilPosix.cpp
+Index: llvm-toolchain-snapshot_9~svn358740/compiler-rt/lib/fuzzer/FuzzerUtilPosix.cpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn354727.orig/compiler-rt/lib/fuzzer/FuzzerUtilPosix.cpp
-+++ llvm-toolchain-snapshot_9~svn354727/compiler-rt/lib/fuzzer/FuzzerUtilPosix.cpp
+--- llvm-toolchain-snapshot_9~svn358740.orig/compiler-rt/lib/fuzzer/FuzzerUtilPosix.cpp
++++ llvm-toolchain-snapshot_9~svn358740/compiler-rt/lib/fuzzer/FuzzerUtilPosix.cpp
 @@ -139,7 +139,7 @@ size_t GetPeakRSSMb() {
    if (getrusage(RUSAGE_SELF, &usage))
      return 0;
@@ -246,10 +246,10 @@ Index: llvm-toolchain-snapshot_9~svn354727/compiler-rt/lib/fuzzer/FuzzerUtilPosi
      // ru_maxrss is in KiB
      return usage.ru_maxrss >> 10;
    } else if (LIBFUZZER_APPLE) {
-Index: llvm-toolchain-snapshot_9~svn354727/compiler-rt/lib/fuzzer/FuzzerExtraCounters.cpp
+Index: llvm-toolchain-snapshot_9~svn358740/compiler-rt/lib/fuzzer/FuzzerExtraCounters.cpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn354727.orig/compiler-rt/lib/fuzzer/FuzzerExtraCounters.cpp
-+++ llvm-toolchain-snapshot_9~svn354727/compiler-rt/lib/fuzzer/FuzzerExtraCounters.cpp
+--- llvm-toolchain-snapshot_9~svn358740.orig/compiler-rt/lib/fuzzer/FuzzerExtraCounters.cpp
++++ llvm-toolchain-snapshot_9~svn358740/compiler-rt/lib/fuzzer/FuzzerExtraCounters.cpp
 @@ -11,7 +11,7 @@
  #include "FuzzerDefs.h"
  
@@ -259,10 +259,10 @@ Index: llvm-toolchain-snapshot_9~svn354727/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~svn354727/compiler-rt/lib/fuzzer/FuzzerExtFunctionsWeak.cpp
+Index: llvm-toolchain-snapshot_9~svn358740/compiler-rt/lib/fuzzer/FuzzerExtFunctionsWeak.cpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn354727.orig/compiler-rt/lib/fuzzer/FuzzerExtFunctionsWeak.cpp
-+++ llvm-toolchain-snapshot_9~svn354727/compiler-rt/lib/fuzzer/FuzzerExtFunctionsWeak.cpp
+--- llvm-toolchain-snapshot_9~svn358740.orig/compiler-rt/lib/fuzzer/FuzzerExtFunctionsWeak.cpp
++++ llvm-toolchain-snapshot_9~svn358740/compiler-rt/lib/fuzzer/FuzzerExtFunctionsWeak.cpp
 @@ -13,7 +13,7 @@
  //===----------------------------------------------------------------------===//
  #include "FuzzerDefs.h"
@@ -272,10 +272,10 @@ Index: llvm-toolchain-snapshot_9~svn354727/compiler-rt/lib/fuzzer/FuzzerExtFunct
  
  #include "FuzzerExtFunctions.h"
  #include "FuzzerIO.h"
-Index: llvm-toolchain-snapshot_9~svn354727/compiler-rt/lib/fuzzer/FuzzerUtilLinux.cpp
+Index: llvm-toolchain-snapshot_9~svn358740/compiler-rt/lib/fuzzer/FuzzerUtilLinux.cpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn354727.orig/compiler-rt/lib/fuzzer/FuzzerUtilLinux.cpp
-+++ llvm-toolchain-snapshot_9~svn354727/compiler-rt/lib/fuzzer/FuzzerUtilLinux.cpp
+--- llvm-toolchain-snapshot_9~svn358740.orig/compiler-rt/lib/fuzzer/FuzzerUtilLinux.cpp
++++ llvm-toolchain-snapshot_9~svn358740/compiler-rt/lib/fuzzer/FuzzerUtilLinux.cpp
 @@ -9,7 +9,7 @@
  //===----------------------------------------------------------------------===//
  #include "FuzzerDefs.h"
@@ -285,10 +285,10 @@ Index: llvm-toolchain-snapshot_9~svn354727/compiler-rt/lib/fuzzer/FuzzerUtilLinu
  #include "FuzzerCommand.h"
  
  #include <stdlib.h>
-Index: llvm-toolchain-snapshot_9~svn354727/compiler-rt/lib/sanitizer_common/sanitizer_freebsd.h
+Index: llvm-toolchain-snapshot_9~svn358740/compiler-rt/lib/sanitizer_common/sanitizer_freebsd.h
 ===================================================================
---- llvm-toolchain-snapshot_9~svn354727.orig/compiler-rt/lib/sanitizer_common/sanitizer_freebsd.h
-+++ llvm-toolchain-snapshot_9~svn354727/compiler-rt/lib/sanitizer_common/sanitizer_freebsd.h
+--- llvm-toolchain-snapshot_9~svn358740.orig/compiler-rt/lib/sanitizer_common/sanitizer_freebsd.h
++++ llvm-toolchain-snapshot_9~svn358740/compiler-rt/lib/sanitizer_common/sanitizer_freebsd.h
 @@ -20,7 +20,7 @@
  // 32-bit mode.
  #if SANITIZER_FREEBSD && (SANITIZER_WORDSIZE == 32)
@@ -298,10 +298,10 @@ Index: llvm-toolchain-snapshot_9~svn354727/compiler-rt/lib/sanitizer_common/sani
  #  include <link.h>
  #  include <sys/param.h>
  #  include <ucontext.h>
-Index: llvm-toolchain-snapshot_9~svn354727/compiler-rt/lib/sanitizer_common/sanitizer_procmaps_bsd.cc
+Index: llvm-toolchain-snapshot_9~svn358740/compiler-rt/lib/sanitizer_common/sanitizer_procmaps_bsd.cc
 ===================================================================
---- llvm-toolchain-snapshot_9~svn354727.orig/compiler-rt/lib/sanitizer_common/sanitizer_procmaps_bsd.cc
-+++ llvm-toolchain-snapshot_9~svn354727/compiler-rt/lib/sanitizer_common/sanitizer_procmaps_bsd.cc
+--- llvm-toolchain-snapshot_9~svn358740.orig/compiler-rt/lib/sanitizer_common/sanitizer_procmaps_bsd.cc
++++ llvm-toolchain-snapshot_9~svn358740/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)
@@ -311,10 +311,10 @@ Index: llvm-toolchain-snapshot_9~svn354727/compiler-rt/lib/sanitizer_common/sani
  #define kinfo_vmentry xkinfo_vmentry
  #endif
  #endif
-Index: llvm-toolchain-snapshot_9~svn354727/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
+Index: llvm-toolchain-snapshot_9~svn358740/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
 ===================================================================
---- llvm-toolchain-snapshot_9~svn354727.orig/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
-+++ llvm-toolchain-snapshot_9~svn354727/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
+--- llvm-toolchain-snapshot_9~svn358740.orig/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
++++ llvm-toolchain-snapshot_9~svn358740/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
 @@ -19,7 +19,9 @@
  #include "sanitizer_internal_defs.h"
  #include "sanitizer_platform.h"
@@ -325,10 +325,10 @@ Index: llvm-toolchain-snapshot_9~svn354727/compiler-rt/lib/sanitizer_common/sani
  
  #ifndef __GLIBC_PREREQ
  #define __GLIBC_PREREQ(x, y) 0
-Index: llvm-toolchain-snapshot_9~svn354727/compiler-rt/lib/sanitizer_common/sanitizer_syscall_generic.inc
+Index: llvm-toolchain-snapshot_9~svn358740/compiler-rt/lib/sanitizer_common/sanitizer_syscall_generic.inc
 ===================================================================
---- llvm-toolchain-snapshot_9~svn354727.orig/compiler-rt/lib/sanitizer_common/sanitizer_syscall_generic.inc
-+++ llvm-toolchain-snapshot_9~svn354727/compiler-rt/lib/sanitizer_common/sanitizer_syscall_generic.inc
+--- llvm-toolchain-snapshot_9~svn358740.orig/compiler-rt/lib/sanitizer_common/sanitizer_syscall_generic.inc
++++ llvm-toolchain-snapshot_9~svn358740/compiler-rt/lib/sanitizer_common/sanitizer_syscall_generic.inc
 @@ -19,7 +19,7 @@
  # define SYSCALL(name) __NR_ ## name
  #endif
@@ -338,10 +338,10 @@ Index: llvm-toolchain-snapshot_9~svn354727/compiler-rt/lib/sanitizer_common/sani
  # define internal_syscall __syscall
  # else
  # define internal_syscall syscall
-Index: llvm-toolchain-snapshot_9~svn354727/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+Index: llvm-toolchain-snapshot_9~svn358740/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
 ===================================================================
---- llvm-toolchain-snapshot_9~svn354727.orig/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
-+++ llvm-toolchain-snapshot_9~svn354727/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+--- llvm-toolchain-snapshot_9~svn358740.orig/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
++++ llvm-toolchain-snapshot_9~svn358740/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
 @@ -105,10 +105,14 @@ typedef struct user_fpregs elf_fpregset_
  #include <wordexp.h>
  #endif
diff --git a/debian/patches/kfreebsd/include_llvm_ADT_Triple.h.diff b/debian/patches/kfreebsd/include_llvm_ADT_Triple.h.diff
index 9b7210a0..9c1fc7aa 100644
--- a/debian/patches/kfreebsd/include_llvm_ADT_Triple.h.diff
+++ b/debian/patches/kfreebsd/include_llvm_ADT_Triple.h.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_9~svn353038/include/llvm/ADT/Triple.h
+Index: llvm-toolchain-snapshot_9~svn358740/include/llvm/ADT/Triple.h
 ===================================================================
---- llvm-toolchain-snapshot_9~svn353038.orig/include/llvm/ADT/Triple.h
-+++ llvm-toolchain-snapshot_9~svn353038/include/llvm/ADT/Triple.h
+--- llvm-toolchain-snapshot_9~svn358740.orig/include/llvm/ADT/Triple.h
++++ llvm-toolchain-snapshot_9~svn358740/include/llvm/ADT/Triple.h
 @@ -159,7 +159,7 @@ public:
      FreeBSD,
      Fuchsia,
@@ -11,7 +11,7 @@ Index: llvm-toolchain-snapshot_9~svn353038/include/llvm/ADT/Triple.h
      Linux,
      Lv2,        // PS3
      MacOSX,
-@@ -578,8 +578,8 @@ public:
+@@ -579,8 +579,8 @@ public:
    }
  
    /// Tests whether the OS is kFreeBSD.
@@ -22,7 +22,7 @@ Index: llvm-toolchain-snapshot_9~svn353038/include/llvm/ADT/Triple.h
    }
  
    /// Tests whether the OS is Hurd.
-@@ -594,7 +594,7 @@ public:
+@@ -600,7 +600,7 @@ public:
  
    /// Tests whether the OS uses glibc.
    bool isOSGlibc() const {
diff --git a/debian/patches/kfreebsd/kfreebsd-libcxx-threads-detection.diff b/debian/patches/kfreebsd/kfreebsd-libcxx-threads-detection.diff
index d3d8be2d..a0939398 100644
--- a/debian/patches/kfreebsd/kfreebsd-libcxx-threads-detection.diff
+++ b/debian/patches/kfreebsd/kfreebsd-libcxx-threads-detection.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_9~svn353038/libcxx/include/__config
+Index: llvm-toolchain-snapshot_9~svn358740/libcxx/include/__config
 ===================================================================
---- llvm-toolchain-snapshot_9~svn353038.orig/libcxx/include/__config
-+++ llvm-toolchain-snapshot_9~svn353038/libcxx/include/__config
-@@ -1157,6 +1157,7 @@ _LIBCPP_FUNC_VIS extern "C" void __sanit
+--- llvm-toolchain-snapshot_9~svn358740.orig/libcxx/include/__config
++++ llvm-toolchain-snapshot_9~svn358740/libcxx/include/__config
+@@ -1155,6 +1155,7 @@ _LIBCPP_FUNC_VIS extern "C" void __sanit
      !defined(_LIBCPP_HAS_THREAD_API_WIN32) && \
      !defined(_LIBCPP_HAS_THREAD_API_EXTERNAL)
  #  if defined(__FreeBSD__) || \
diff --git a/debian/patches/kfreebsd/kfreebsd-openmp.diff b/debian/patches/kfreebsd/kfreebsd-openmp.diff
index 2f0e9410..0802800d 100644
--- a/debian/patches/kfreebsd/kfreebsd-openmp.diff
+++ b/debian/patches/kfreebsd/kfreebsd-openmp.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_9~svn353038/openmp/runtime/src/kmp.h
+Index: llvm-toolchain-snapshot_9~svn358740/openmp/runtime/src/kmp.h
 ===================================================================
---- llvm-toolchain-snapshot_9~svn353038.orig/openmp/runtime/src/kmp.h
-+++ llvm-toolchain-snapshot_9~svn353038/openmp/runtime/src/kmp.h
-@@ -1076,6 +1076,10 @@ extern kmp_uint64 __kmp_now_nsec();
+--- llvm-toolchain-snapshot_9~svn358740.orig/openmp/runtime/src/kmp.h
++++ llvm-toolchain-snapshot_9~svn358740/openmp/runtime/src/kmp.h
+@@ -1135,6 +1135,10 @@ extern kmp_uint64 __kmp_now_nsec();
  /* TODO: tune for KMP_OS_OPENBSD */
  #define KMP_INIT_WAIT 1024U /* initial number of spin-tests   */
  #define KMP_NEXT_WAIT 512U /* susequent number of spin-tests */
@@ -13,11 +13,11 @@ Index: llvm-toolchain-snapshot_9~svn353038/openmp/runtime/src/kmp.h
  #endif
  
  #if KMP_ARCH_X86 || KMP_ARCH_X86_64
-Index: llvm-toolchain-snapshot_9~svn353038/openmp/runtime/src/kmp_ftn_entry.h
+Index: llvm-toolchain-snapshot_9~svn358740/openmp/runtime/src/kmp_ftn_entry.h
 ===================================================================
---- llvm-toolchain-snapshot_9~svn353038.orig/openmp/runtime/src/kmp_ftn_entry.h
-+++ llvm-toolchain-snapshot_9~svn353038/openmp/runtime/src/kmp_ftn_entry.h
-@@ -534,7 +534,7 @@ int FTN_STDCALL KMP_EXPAND_NAME(FTN_GET_
+--- llvm-toolchain-snapshot_9~svn358740.orig/openmp/runtime/src/kmp_ftn_entry.h
++++ llvm-toolchain-snapshot_9~svn358740/openmp/runtime/src/kmp_ftn_entry.h
+@@ -535,7 +535,7 @@ int FTN_STDCALL KMP_EXPAND_NAME(FTN_GET_
    int gtid;
  
  #if KMP_OS_DARWIN || KMP_OS_DRAGONFLY || KMP_OS_FREEBSD || KMP_OS_NETBSD ||    \
@@ -26,10 +26,10 @@ Index: llvm-toolchain-snapshot_9~svn353038/openmp/runtime/src/kmp_ftn_entry.h
    gtid = __kmp_entry_gtid();
  #elif KMP_OS_WINDOWS
    if (!__kmp_init_parallel ||
-Index: llvm-toolchain-snapshot_9~svn353038/openmp/runtime/src/kmp_platform.h
+Index: llvm-toolchain-snapshot_9~svn358740/openmp/runtime/src/kmp_platform.h
 ===================================================================
---- llvm-toolchain-snapshot_9~svn353038.orig/openmp/runtime/src/kmp_platform.h
-+++ llvm-toolchain-snapshot_9~svn353038/openmp/runtime/src/kmp_platform.h
+--- llvm-toolchain-snapshot_9~svn358740.orig/openmp/runtime/src/kmp_platform.h
++++ llvm-toolchain-snapshot_9~svn358740/openmp/runtime/src/kmp_platform.h
 @@ -18,6 +18,7 @@
  #define KMP_OS_LINUX 0
  #define KMP_OS_DRAGONFLY 0
@@ -65,11 +65,11 @@ Index: llvm-toolchain-snapshot_9~svn353038/openmp/runtime/src/kmp_platform.h
  #undef KMP_OS_UNIX
  #define KMP_OS_UNIX 1
  #endif
-Index: llvm-toolchain-snapshot_9~svn353038/openmp/runtime/src/kmp_runtime.cpp
+Index: llvm-toolchain-snapshot_9~svn358740/openmp/runtime/src/kmp_runtime.cpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn353038.orig/openmp/runtime/src/kmp_runtime.cpp
-+++ llvm-toolchain-snapshot_9~svn353038/openmp/runtime/src/kmp_runtime.cpp
-@@ -8092,7 +8092,7 @@ __kmp_determine_reduction_method(
+--- llvm-toolchain-snapshot_9~svn358740.orig/openmp/runtime/src/kmp_runtime.cpp
++++ llvm-toolchain-snapshot_9~svn358740/openmp/runtime/src/kmp_runtime.cpp
+@@ -8211,7 +8211,7 @@ __kmp_determine_reduction_method(
  #if KMP_ARCH_X86_64 || KMP_ARCH_PPC64 || KMP_ARCH_AARCH64 || KMP_ARCH_MIPS64
  
  #if KMP_OS_LINUX || KMP_OS_DRAGONFLY || KMP_OS_FREEBSD || KMP_OS_NETBSD ||     \
@@ -78,7 +78,7 @@ Index: llvm-toolchain-snapshot_9~svn353038/openmp/runtime/src/kmp_runtime.cpp
  
      int teamsize_cutoff = 4;
  
-@@ -8120,7 +8120,7 @@ __kmp_determine_reduction_method(
+@@ -8239,7 +8239,7 @@ __kmp_determine_reduction_method(
  
  #elif KMP_ARCH_X86 || KMP_ARCH_ARM || KMP_ARCH_AARCH || KMP_ARCH_MIPS
  
@@ -87,10 +87,10 @@ Index: llvm-toolchain-snapshot_9~svn353038/openmp/runtime/src/kmp_runtime.cpp
  
      // basic tuning
  
-Index: llvm-toolchain-snapshot_9~svn353038/openmp/runtime/src/z_Linux_util.cpp
+Index: llvm-toolchain-snapshot_9~svn358740/openmp/runtime/src/z_Linux_util.cpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn353038.orig/openmp/runtime/src/z_Linux_util.cpp
-+++ llvm-toolchain-snapshot_9~svn353038/openmp/runtime/src/z_Linux_util.cpp
+--- llvm-toolchain-snapshot_9~svn358740.orig/openmp/runtime/src/z_Linux_util.cpp
++++ llvm-toolchain-snapshot_9~svn358740/openmp/runtime/src/z_Linux_util.cpp
 @@ -447,7 +447,7 @@ void __kmp_terminate_thread(int gtid) {
  static kmp_int32 __kmp_set_stack_info(int gtid, kmp_info_t *th) {
    int stack_data;
@@ -109,7 +109,7 @@ Index: llvm-toolchain-snapshot_9~svn353038/openmp/runtime/src/z_Linux_util.cpp
    void *volatile padding = 0;
  #endif
    int gtid;
-@@ -1794,7 +1794,7 @@ static int __kmp_get_xproc(void) {
+@@ -1758,7 +1758,7 @@ static int __kmp_get_xproc(void) {
    int r = 0;
  
  #if KMP_OS_LINUX || KMP_OS_DRAGONFLY || KMP_OS_FREEBSD || KMP_OS_NETBSD ||     \
@@ -118,7 +118,7 @@ Index: llvm-toolchain-snapshot_9~svn353038/openmp/runtime/src/z_Linux_util.cpp
  
    r = sysconf(_SC_NPROCESSORS_ONLN);
  
-@@ -1989,7 +1989,7 @@ int __kmp_is_address_mapped(void *addr)
+@@ -1953,7 +1953,7 @@ int __kmp_is_address_mapped(void *addr)
    int found = 0;
    int rc;
  
diff --git a/debian/patches/kfreebsd/kfreebsd-triple-clang.diff b/debian/patches/kfreebsd/kfreebsd-triple-clang.diff
index 57045d38..54203683 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~svn354236/clang/lib/Driver/CMakeLists.txt
+Index: llvm-toolchain-snapshot_9~svn358740/clang/lib/Driver/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_9~svn354236.orig/clang/lib/Driver/CMakeLists.txt
-+++ llvm-toolchain-snapshot_9~svn354236/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
 @@ -49,6 +49,7 @@ add_clang_library(clangDriver
    ToolChains/HIP.cpp
    ToolChains/Hexagon.cpp
@@ -10,10 +10,10 @@ Index: llvm-toolchain-snapshot_9~svn354236/clang/lib/Driver/CMakeLists.txt
    ToolChains/Linux.cpp
    ToolChains/MipsLinux.cpp
    ToolChains/MinGW.cpp
-Index: llvm-toolchain-snapshot_9~svn354236/clang/lib/Driver/Driver.cpp
+Index: llvm-toolchain-snapshot_9~svn358740/clang/lib/Driver/Driver.cpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn354236.orig/clang/lib/Driver/Driver.cpp
-+++ llvm-toolchain-snapshot_9~svn354236/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
 @@ -26,6 +26,7 @@
  #include "ToolChains/Haiku.h"
  #include "ToolChains/Hexagon.h"
@@ -22,7 +22,7 @@ Index: llvm-toolchain-snapshot_9~svn354236/clang/lib/Driver/Driver.cpp
  #include "ToolChains/Lanai.h"
  #include "ToolChains/Linux.h"
  #include "ToolChains/MSP430.h"
-@@ -4561,6 +4562,9 @@ const ToolChain &Driver::getToolChain(co
+@@ -4564,6 +4565,9 @@ const ToolChain &Driver::getToolChain(co
      case llvm::Triple::FreeBSD:
        TC = llvm::make_unique<toolchains::FreeBSD>(*this, Target, Args);
        break;
@@ -32,11 +32,11 @@ Index: llvm-toolchain-snapshot_9~svn354236/clang/lib/Driver/Driver.cpp
      case llvm::Triple::Minix:
        TC = llvm::make_unique<toolchains::Minix>(*this, Target, Args);
        break;
-Index: llvm-toolchain-snapshot_9~svn354236/clang/lib/Driver/ToolChains/Clang.cpp
+Index: llvm-toolchain-snapshot_9~svn358740/clang/lib/Driver/ToolChains/Clang.cpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn354236.orig/clang/lib/Driver/ToolChains/Clang.cpp
-+++ llvm-toolchain-snapshot_9~svn354236/clang/lib/Driver/ToolChains/Clang.cpp
-@@ -535,7 +535,7 @@ static bool useFramePointerForTargetByDe
+--- 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
    }
  
    if (Triple.isOSLinux() || Triple.getOS() == llvm::Triple::CloudABI ||
@@ -45,11 +45,11 @@ Index: llvm-toolchain-snapshot_9~svn354236/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~svn354236/clang/lib/Driver/ToolChains/Gnu.cpp
+Index: llvm-toolchain-snapshot_9~svn358740/clang/lib/Driver/ToolChains/Gnu.cpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn354236.orig/clang/lib/Driver/ToolChains/Gnu.cpp
-+++ llvm-toolchain-snapshot_9~svn354236/clang/lib/Driver/ToolChains/Gnu.cpp
-@@ -522,6 +522,20 @@ void tools::gnutools::Linker::ConstructJ
+--- 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
  
        if (!Args.hasArg(options::OPT_nolibc))
          CmdArgs.push_back("-lc");
@@ -70,7 +70,7 @@ Index: llvm-toolchain-snapshot_9~svn354236/clang/lib/Driver/ToolChains/Gnu.cpp
  
        // Add IAMCU specific libs, if needed.
        if (IsIAMCU)
-@@ -1898,7 +1912,8 @@ void Generic_GCC::GCCInstallationDetecto
+@@ -1924,7 +1938,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~svn354236/clang/lib/Driver/ToolChains/Gnu.cpp
    static const char *const X32LibDirs[] = {"/libx32"};
    static const char *const X86LibDirs[] = {"/lib32", "/lib"};
    static const char *const X86Triples[] = {
-@@ -1907,7 +1922,9 @@ void Generic_GCC::GCCInstallationDetecto
+@@ -1933,7 +1948,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~svn354236/clang/lib/Driver/ToolChains/Gnu.cpp
  
    static const char *const MIPSLibDirs[] = {"/lib"};
    static const char *const MIPSTriples[] = {
-Index: llvm-toolchain-snapshot_9~svn354236/clang/lib/Driver/ToolChains/KFreeBSD.cpp
+Index: llvm-toolchain-snapshot_9~svn358740/clang/lib/Driver/ToolChains/KFreeBSD.cpp
 ===================================================================
 --- /dev/null
-+++ llvm-toolchain-snapshot_9~svn354236/clang/lib/Driver/ToolChains/KFreeBSD.cpp
++++ llvm-toolchain-snapshot_9~svn358740/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~svn354236/clang/lib/Driver/ToolChains/KFreeBSD.
 +  return Res;
 +}
 +
-Index: llvm-toolchain-snapshot_9~svn354236/clang/lib/Driver/ToolChains/KFreeBSD.h
+Index: llvm-toolchain-snapshot_9~svn358740/clang/lib/Driver/ToolChains/KFreeBSD.h
 ===================================================================
 --- /dev/null
-+++ llvm-toolchain-snapshot_9~svn354236/clang/lib/Driver/ToolChains/KFreeBSD.h
++++ llvm-toolchain-snapshot_9~svn358740/clang/lib/Driver/ToolChains/KFreeBSD.h
 @@ -0,0 +1,54 @@
 +//===--- KFreeBSD.h - kFreeBSD ToolChain Implementations ----------*- C++ -*-===//
 +//
diff --git a/debian/patches/kfreebsd/kfreebsd-triple.diff b/debian/patches/kfreebsd/kfreebsd-triple.diff
index dd96cfb7..3b8d55aa 100644
--- a/debian/patches/kfreebsd/kfreebsd-triple.diff
+++ b/debian/patches/kfreebsd/kfreebsd-triple.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_9~svn353038/unittests/ADT/TripleTest.cpp
+Index: llvm-toolchain-snapshot_9~svn358740/unittests/ADT/TripleTest.cpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn353038.orig/unittests/ADT/TripleTest.cpp
-+++ llvm-toolchain-snapshot_9~svn353038/unittests/ADT/TripleTest.cpp
+--- llvm-toolchain-snapshot_9~svn358740.orig/unittests/ADT/TripleTest.cpp
++++ llvm-toolchain-snapshot_9~svn358740/unittests/ADT/TripleTest.cpp
 @@ -98,6 +98,18 @@ TEST(TripleTest, ParsedIDs) {
    EXPECT_EQ(Triple::Hurd, T.getOS());
    EXPECT_EQ(Triple::GNU, T.getEnvironment());
diff --git a/debian/patches/kfreebsd/lib_Support.diff b/debian/patches/kfreebsd/lib_Support.diff
index 8a530f4e..1c1b005c 100644
--- a/debian/patches/kfreebsd/lib_Support.diff
+++ b/debian/patches/kfreebsd/lib_Support.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_9~svn353038/lib/Support/Triple.cpp
+Index: llvm-toolchain-snapshot_9~svn358740/lib/Support/Triple.cpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn353038.orig/lib/Support/Triple.cpp
-+++ llvm-toolchain-snapshot_9~svn353038/lib/Support/Triple.cpp
+--- llvm-toolchain-snapshot_9~svn358740.orig/lib/Support/Triple.cpp
++++ llvm-toolchain-snapshot_9~svn358740/lib/Support/Triple.cpp
 @@ -181,7 +181,7 @@ StringRef Triple::getOSTypeName(OSType K
    case FreeBSD: return "freebsd";
    case Fuchsia: return "fuchsia";
@@ -11,7 +11,7 @@ Index: llvm-toolchain-snapshot_9~svn353038/lib/Support/Triple.cpp
    case Linux: return "linux";
    case Lv2: return "lv2";
    case MacOSX: return "macosx";
-@@ -478,7 +478,7 @@ static Triple::OSType parseOS(StringRef
+@@ -479,7 +479,7 @@ static Triple::OSType parseOS(StringRef
      .StartsWith("freebsd", Triple::FreeBSD)
      .StartsWith("fuchsia", Triple::Fuchsia)
      .StartsWith("ios", Triple::IOS)
@@ -20,11 +20,11 @@ Index: llvm-toolchain-snapshot_9~svn353038/lib/Support/Triple.cpp
      .StartsWith("linux", Triple::Linux)
      .StartsWith("lv2", Triple::Lv2)
      .StartsWith("macos", Triple::MacOSX)
-Index: llvm-toolchain-snapshot_9~svn353038/lib/Support/Unix/Path.inc
+Index: llvm-toolchain-snapshot_9~svn358740/lib/Support/Unix/Path.inc
 ===================================================================
---- llvm-toolchain-snapshot_9~svn353038.orig/lib/Support/Unix/Path.inc
-+++ llvm-toolchain-snapshot_9~svn353038/lib/Support/Unix/Path.inc
-@@ -61,7 +61,7 @@
+--- llvm-toolchain-snapshot_9~svn358740.orig/lib/Support/Unix/Path.inc
++++ llvm-toolchain-snapshot_9~svn358740/lib/Support/Unix/Path.inc
+@@ -62,7 +62,7 @@
  #define FSTATVFS fstatvfs
  #define STATVFS_F_FRSIZE(vfs) vfs.f_frsize
  #else
diff --git a/debian/patches/kfreebsd/lib_Target_X86.diff b/debian/patches/kfreebsd/lib_Target_X86.diff
index d48b00bb..7284030f 100644
--- a/debian/patches/kfreebsd/lib_Target_X86.diff
+++ b/debian/patches/kfreebsd/lib_Target_X86.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_9~svn353038/lib/Target/X86/X86Subtarget.cpp
+Index: llvm-toolchain-snapshot_9~svn358740/lib/Target/X86/X86Subtarget.cpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn353038.orig/lib/Target/X86/X86Subtarget.cpp
-+++ llvm-toolchain-snapshot_9~svn353038/lib/Target/X86/X86Subtarget.cpp
-@@ -283,7 +283,7 @@ void X86Subtarget::initSubtargetFeatures
+--- llvm-toolchain-snapshot_9~svn358740.orig/lib/Target/X86/X86Subtarget.cpp
++++ llvm-toolchain-snapshot_9~svn358740/lib/Target/X86/X86Subtarget.cpp
+@@ -284,7 +284,7 @@ void X86Subtarget::initSubtargetFeatures
    if (StackAlignOverride)
      stackAlignment = StackAlignOverride;
    else if (isTargetDarwin() || isTargetLinux() || isTargetSolaris() ||
@@ -11,11 +11,11 @@ Index: llvm-toolchain-snapshot_9~svn353038/lib/Target/X86/X86Subtarget.cpp
      stackAlignment = 16;
  
    // Some CPUs have more overhead for gather. The specified overhead is relative
-Index: llvm-toolchain-snapshot_9~svn353038/lib/Target/X86/X86Subtarget.h
+Index: llvm-toolchain-snapshot_9~svn358740/lib/Target/X86/X86Subtarget.h
 ===================================================================
---- llvm-toolchain-snapshot_9~svn353038.orig/lib/Target/X86/X86Subtarget.h
-+++ llvm-toolchain-snapshot_9~svn353038/lib/Target/X86/X86Subtarget.h
-@@ -730,7 +730,7 @@ public:
+--- llvm-toolchain-snapshot_9~svn358740.orig/lib/Target/X86/X86Subtarget.h
++++ llvm-toolchain-snapshot_9~svn358740/lib/Target/X86/X86Subtarget.h
+@@ -738,7 +738,7 @@ public:
    bool isTargetMachO() const { return TargetTriple.isOSBinFormatMachO(); }
  
    bool isTargetLinux() const { return TargetTriple.isOSLinux(); }
diff --git a/debian/patches/lldb-soname.diff b/debian/patches/lldb-soname.diff
index d5f73b27..fb262097 100644
--- a/debian/patches/lldb-soname.diff
+++ b/debian/patches/lldb-soname.diff
@@ -2,12 +2,12 @@
  lldb/source/API/CMakeLists.txt |   14 +++++++-------
  1 file changed, 7 insertions(+), 7 deletions(-)
 
-Index: llvm-toolchain-snapshot_9~svn355269/lldb/source/API/CMakeLists.txt
+Index: llvm-toolchain-snapshot_9~svn358740/lldb/source/API/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_9~svn355269.orig/lldb/source/API/CMakeLists.txt
-+++ llvm-toolchain-snapshot_9~svn355269/lldb/source/API/CMakeLists.txt
-@@ -9,7 +9,12 @@ if(NOT LLDB_DISABLE_PYTHON)
-   set(lldb_python_wrapper ${lldb_scripts_dir}/LLDBWrapPython.cpp)
+--- llvm-toolchain-snapshot_9~svn358740.orig/lldb/source/API/CMakeLists.txt
++++ llvm-toolchain-snapshot_9~svn358740/lldb/source/API/CMakeLists.txt
+@@ -13,7 +13,12 @@ if(LLDB_BUILD_FRAMEWORK AND LLVM_EXTERNA
+   set(LLVM_EXTERNALIZE_DEBUGINFO_EXTENSION framework.dSYM)
  endif()
  
 -add_lldb_library(liblldb SHARED
@@ -20,7 +20,7 @@ Index: llvm-toolchain-snapshot_9~svn355269/lldb/source/API/CMakeLists.txt
    SBAddress.cpp
    SBAttachInfo.cpp
    SBBlock.cpp
-@@ -120,7 +125,7 @@ endif()
+@@ -128,7 +133,7 @@ endif()
  
  set_target_properties(liblldb
    PROPERTIES
@@ -29,7 +29,7 @@ Index: llvm-toolchain-snapshot_9~svn355269/lldb/source/API/CMakeLists.txt
  )
  
  if (NOT CMAKE_SYSTEM_NAME MATCHES "Windows")
-@@ -144,11 +149,6 @@ if ( CMAKE_SYSTEM_NAME MATCHES "Windows"
+@@ -152,11 +157,6 @@ if ( CMAKE_SYSTEM_NAME MATCHES "Windows"
    if (MSVC AND NOT LLDB_DISABLE_PYTHON)
      target_link_libraries(liblldb PRIVATE ${PYTHON_LIBRARY})
    endif()