diff --git a/debian/patches/0001-llvm-cmake-resolve-symlinks-in-LLVMConfig.cmake.patch b/debian/patches/0001-llvm-cmake-resolve-symlinks-in-LLVMConfig.cmake.patch
index 3647e713..c9991c81 100644
--- a/debian/patches/0001-llvm-cmake-resolve-symlinks-in-LLVMConfig.cmake.patch
+++ b/debian/patches/0001-llvm-cmake-resolve-symlinks-in-LLVMConfig.cmake.patch
@@ -12,11 +12,11 @@ Partially addresses PR37128
  cmake/modules/CMakeLists.txt | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-Index: llvm-toolchain-snapshot_8~svn342269/cmake/modules/CMakeLists.txt
+Index: llvm-toolchain-snapshot_10~svn370025/cmake/modules/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_8~svn342269.orig/cmake/modules/CMakeLists.txt
-+++ llvm-toolchain-snapshot_8~svn342269/cmake/modules/CMakeLists.txt
-@@ -82,10 +82,10 @@ file(COPY .
+--- llvm-toolchain-snapshot_10~svn370025.orig/cmake/modules/CMakeLists.txt
++++ llvm-toolchain-snapshot_10~svn370025/cmake/modules/CMakeLists.txt
+@@ -88,10 +88,10 @@ file(COPY .
  # Generate LLVMConfig.cmake for the install tree.
  set(LLVM_CONFIG_CODE "
  # Compute the installation prefix from this LLVMConfig.cmake file location.
diff --git a/debian/patches/0003-Debian-version-info-and-bugreport.patch b/debian/patches/0003-Debian-version-info-and-bugreport.patch
index 41feae80..23f3edb6 100644
--- a/debian/patches/0003-Debian-version-info-and-bugreport.patch
+++ b/debian/patches/0003-Debian-version-info-and-bugreport.patch
@@ -2,11 +2,11 @@
  lib/Support/CommandLine.cpp |    4 ++++
  1 file changed, 4 insertions(+)
 
-Index: llvm-toolchain-snapshot_8~svn342269/lib/Support/CommandLine.cpp
+Index: llvm-toolchain-snapshot_10~svn370025/lib/Support/CommandLine.cpp
 ===================================================================
---- llvm-toolchain-snapshot_8~svn342269.orig/lib/Support/CommandLine.cpp
-+++ llvm-toolchain-snapshot_8~svn342269/lib/Support/CommandLine.cpp
-@@ -2127,6 +2127,10 @@ public:
+--- llvm-toolchain-snapshot_10~svn370025.orig/lib/Support/CommandLine.cpp
++++ llvm-toolchain-snapshot_10~svn370025/lib/Support/CommandLine.cpp
+@@ -2378,6 +2378,10 @@ public:
      OS << " " << LLVM_VERSION_INFO;
  #endif
      OS << "\n  ";
diff --git a/debian/patches/19-clang_debian_version.patch b/debian/patches/19-clang_debian_version.patch
index c530e14f..d4d14b40 100644
--- a/debian/patches/19-clang_debian_version.patch
+++ b/debian/patches/19-clang_debian_version.patch
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_3.5~svn210337/clang/lib/Basic/Version.cpp
+Index: llvm-toolchain-snapshot_10~svn370025/clang/lib/Basic/Version.cpp
 ===================================================================
---- llvm-toolchain-snapshot_3.5~svn210337.orig/clang/lib/Basic/Version.cpp
-+++ llvm-toolchain-snapshot_3.5~svn210337/clang/lib/Basic/Version.cpp
-@@ -15,6 +15,7 @@
+--- llvm-toolchain-snapshot_10~svn370025.orig/clang/lib/Basic/Version.cpp
++++ llvm-toolchain-snapshot_10~svn370025/clang/lib/Basic/Version.cpp
+@@ -14,6 +14,7 @@
  #include "clang/Basic/LLVM.h"
  #include "clang/Config/config.h"
  #include "llvm/Support/raw_ostream.h"
@@ -10,7 +10,7 @@ Index: llvm-toolchain-snapshot_3.5~svn210337/clang/lib/Basic/Version.cpp
  #include <cstdlib>
  #include <cstring>
  
-@@ -125,7 +126,7 @@ std::string getClangToolFullVersion(Stri
+@@ -124,7 +125,7 @@ std::string getClangToolFullVersion(Stri
  #ifdef CLANG_VENDOR
    OS << CLANG_VENDOR;
  #endif
diff --git a/debian/patches/23-strlcpy_strlcat_warning_removed.diff b/debian/patches/23-strlcpy_strlcat_warning_removed.diff
index 554ef5ea..7ad46af9 100644
--- a/debian/patches/23-strlcpy_strlcat_warning_removed.diff
+++ b/debian/patches/23-strlcpy_strlcat_warning_removed.diff
@@ -7,11 +7,11 @@
  clang/test/Sema/warn-strlcpycat-size.c                    |   55 --------------
  6 files changed, 25 insertions(+), 78 deletions(-)
 
-Index: llvm-toolchain-snapshot_9~svn356622/clang/include/clang/Basic/Builtins.def
+Index: llvm-toolchain-snapshot_10~svn370025/clang/include/clang/Basic/Builtins.def
 ===================================================================
---- llvm-toolchain-snapshot_9~svn356622.orig/clang/include/clang/Basic/Builtins.def
-+++ llvm-toolchain-snapshot_9~svn356622/clang/include/clang/Basic/Builtins.def
-@@ -520,8 +520,8 @@ BUILTIN(__builtin___memset_chk, "v*v*izz
+--- llvm-toolchain-snapshot_10~svn370025.orig/clang/include/clang/Basic/Builtins.def
++++ llvm-toolchain-snapshot_10~svn370025/clang/include/clang/Basic/Builtins.def
+@@ -546,8 +546,8 @@ BUILTIN(__builtin___memset_chk, "v*v*izz
  BUILTIN(__builtin___stpcpy_chk, "c*c*cC*z", "nF")
  BUILTIN(__builtin___strcat_chk, "c*c*cC*z", "nF")
  BUILTIN(__builtin___strcpy_chk, "c*c*cC*z", "nF")
@@ -22,7 +22,7 @@ Index: llvm-toolchain-snapshot_9~svn356622/clang/include/clang/Basic/Builtins.de
  BUILTIN(__builtin___strncat_chk, "c*c*cC*zz", "nF")
  BUILTIN(__builtin___strncpy_chk, "c*c*cC*zz", "nF")
  BUILTIN(__builtin___stpncpy_chk, "c*c*cC*zz", "nF")
-@@ -979,8 +979,8 @@ LIBBUILTIN(getcontext, "iK*",     "fj",
+@@ -1013,8 +1013,8 @@ LIBBUILTIN(getcontext, "iK*",     "fj",
  LIBBUILTIN(_longjmp, "vJi",       "fr",    "setjmp.h", ALL_GNU_LANGUAGES)
  LIBBUILTIN(siglongjmp, "vSJi",    "fr",    "setjmp.h", ALL_GNU_LANGUAGES)
  // non-standard but very common
@@ -33,11 +33,11 @@ Index: llvm-toolchain-snapshot_9~svn356622/clang/include/clang/Basic/Builtins.de
  //   id objc_msgSend(id, SEL, ...)
  LIBBUILTIN(objc_msgSend, "GGH.",   "f",     "objc/message.h", OBJC_LANG)
  // long double objc_msgSend_fpret(id self, SEL op, ...)
-Index: llvm-toolchain-snapshot_9~svn356622/clang/lib/AST/Decl.cpp
+Index: llvm-toolchain-snapshot_10~svn370025/clang/lib/AST/Decl.cpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn356622.orig/clang/lib/AST/Decl.cpp
-+++ llvm-toolchain-snapshot_9~svn356622/clang/lib/AST/Decl.cpp
-@@ -3664,13 +3664,13 @@ unsigned FunctionDecl::getMemoryFunction
+--- llvm-toolchain-snapshot_10~svn370025.orig/clang/lib/AST/Decl.cpp
++++ llvm-toolchain-snapshot_10~svn370025/clang/lib/AST/Decl.cpp
+@@ -3774,13 +3774,13 @@ unsigned FunctionDecl::getMemoryFunction
    case Builtin::BImemmove:
      return Builtin::BImemmove;
  
@@ -57,11 +57,11 @@ Index: llvm-toolchain-snapshot_9~svn356622/clang/lib/AST/Decl.cpp
  
    case Builtin::BI__builtin_memcmp:
    case Builtin::BImemcmp:
-Index: llvm-toolchain-snapshot_9~svn356622/clang/lib/Sema/SemaChecking.cpp
+Index: llvm-toolchain-snapshot_10~svn370025/clang/lib/Sema/SemaChecking.cpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn356622.orig/clang/lib/Sema/SemaChecking.cpp
-+++ llvm-toolchain-snapshot_9~svn356622/clang/lib/Sema/SemaChecking.cpp
-@@ -320,8 +320,8 @@ void Sema::checkFortifiedBuiltinMemoryFu
+--- llvm-toolchain-snapshot_10~svn370025.orig/clang/lib/Sema/SemaChecking.cpp
++++ llvm-toolchain-snapshot_10~svn370025/clang/lib/Sema/SemaChecking.cpp
+@@ -335,8 +335,8 @@ void Sema::checkFortifiedBuiltinMemoryFu
    case Builtin::BI__builtin___memcpy_chk:
    case Builtin::BI__builtin___memmove_chk:
    case Builtin::BI__builtin___memset_chk:
@@ -72,7 +72,7 @@ Index: llvm-toolchain-snapshot_9~svn356622/clang/lib/Sema/SemaChecking.cpp
    case Builtin::BI__builtin___strncat_chk:
    case Builtin::BI__builtin___strncpy_chk:
    case Builtin::BI__builtin___stpncpy_chk:
-@@ -4309,9 +4309,10 @@ bool Sema::CheckFunctionCall(FunctionDec
+@@ -4354,9 +4354,10 @@ bool Sema::CheckFunctionCall(FunctionDec
      return false;
  
    // Handle memory setting and copying functions.
@@ -86,11 +86,11 @@ Index: llvm-toolchain-snapshot_9~svn356622/clang/lib/Sema/SemaChecking.cpp
      CheckStrncatArguments(TheCall, FnInfo);
    else
      CheckMemaccessArguments(TheCall, CMId, FnInfo);
-Index: llvm-toolchain-snapshot_9~svn356622/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
+Index: llvm-toolchain-snapshot_10~svn370025/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn356622.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
-+++ llvm-toolchain-snapshot_9~svn356622/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
-@@ -256,9 +256,9 @@ GenericTaintChecker::TaintPropagationRul
+--- llvm-toolchain-snapshot_10~svn370025.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
++++ llvm-toolchain-snapshot_10~svn370025/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
+@@ -389,9 +389,9 @@ GenericTaintChecker::TaintPropagationRul
      case Builtin::BIstrncpy:
      case Builtin::BIstrncat:
        return TaintPropagationRule({1, 2}, {0, ReturnValueIndex});
@@ -103,10 +103,10 @@ Index: llvm-toolchain-snapshot_9~svn356622/clang/lib/StaticAnalyzer/Checkers/Gen
      case Builtin::BIstrndup:
        return TaintPropagationRule({0, 1}, {ReturnValueIndex});
  
-Index: llvm-toolchain-snapshot_9~svn356622/clang/test/Sema/builtins.c
+Index: llvm-toolchain-snapshot_10~svn370025/clang/test/Sema/builtins.c
 ===================================================================
---- llvm-toolchain-snapshot_9~svn356622.orig/clang/test/Sema/builtins.c
-+++ llvm-toolchain-snapshot_9~svn356622/clang/test/Sema/builtins.c
+--- llvm-toolchain-snapshot_10~svn370025.orig/clang/test/Sema/builtins.c
++++ llvm-toolchain-snapshot_10~svn370025/clang/test/Sema/builtins.c
 @@ -199,11 +199,9 @@ void test18() {
  
    ptr = __builtin___memccpy_chk(dst, src, '\037', sizeof(src), sizeof(dst));
@@ -149,9 +149,9 @@ Index: llvm-toolchain-snapshot_9~svn356622/clang/test/Sema/builtins.c
  // rdar://11076881
  char * Test20(char *p, const char *in, unsigned n)
  {
-Index: llvm-toolchain-snapshot_9~svn356622/clang/test/Sema/warn-strlcpycat-size.c
+Index: llvm-toolchain-snapshot_10~svn370025/clang/test/Sema/warn-strlcpycat-size.c
 ===================================================================
---- llvm-toolchain-snapshot_9~svn356622.orig/clang/test/Sema/warn-strlcpycat-size.c
+--- llvm-toolchain-snapshot_10~svn370025.orig/clang/test/Sema/warn-strlcpycat-size.c
 +++ /dev/null
 @@ -1,55 +0,0 @@
 -// RUN: %clang_cc1 -Wstrlcpy-strlcat-size -verify -fsyntax-only %s
diff --git a/debian/patches/26-set-correct-float-abi.diff b/debian/patches/26-set-correct-float-abi.diff
index c8a6d454..579df59d 100644
--- a/debian/patches/26-set-correct-float-abi.diff
+++ b/debian/patches/26-set-correct-float-abi.diff
@@ -18,11 +18,11 @@ Forwarded: <no|not-needed|url proving that it has been forwarded>
 Reviewed-By: <name and email of someone who approved the patch>
 Last-Update: <YYYY-MM-DD>
 
-Index: llvm-toolchain-snapshot_9~svn354727/clang/lib/Driver/ToolChains/Arch/ARM.cpp
+Index: llvm-toolchain-snapshot_10~svn370025/clang/lib/Driver/ToolChains/Arch/ARM.cpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn354727.orig/clang/lib/Driver/ToolChains/Arch/ARM.cpp
-+++ llvm-toolchain-snapshot_9~svn354727/clang/lib/Driver/ToolChains/Arch/ARM.cpp
-@@ -245,7 +245,7 @@ arm::FloatABI arm::getARMFloatABI(const
+--- llvm-toolchain-snapshot_10~svn370025.orig/clang/lib/Driver/ToolChains/Arch/ARM.cpp
++++ llvm-toolchain-snapshot_10~svn370025/clang/lib/Driver/ToolChains/Arch/ARM.cpp
+@@ -249,7 +249,7 @@ arm::FloatABI arm::getARMFloatABI(const
        case llvm::Triple::MuslEABI:
        case llvm::Triple::EABI:
          // EABI is always AAPCS, and if it was not marked 'hard', it's softfp
diff --git a/debian/patches/930008-arm.diff b/debian/patches/930008-arm.diff
index 1c5b21d8..9408815e 100644
--- a/debian/patches/930008-arm.diff
+++ b/debian/patches/930008-arm.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_9~svn362869/lib/Support/Triple.cpp
+Index: llvm-toolchain-snapshot_10~svn370025/lib/Support/Triple.cpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn362869.orig/lib/Support/Triple.cpp
-+++ llvm-toolchain-snapshot_9~svn362869/lib/Support/Triple.cpp
-@@ -1644,7 +1644,7 @@ StringRef Triple::getARMCPUForArch(Strin
+--- llvm-toolchain-snapshot_10~svn370025.orig/lib/Support/Triple.cpp
++++ llvm-toolchain-snapshot_10~svn370025/lib/Support/Triple.cpp
+@@ -1646,7 +1646,7 @@ StringRef Triple::getARMCPUForArch(Strin
      case llvm::Triple::EABIHF:
      case llvm::Triple::GNUEABIHF:
      case llvm::Triple::MuslEABIHF:
diff --git a/debian/patches/clang-analyzer-force-version.diff b/debian/patches/clang-analyzer-force-version.diff
index 89a05b71..f110b25c 100644
--- a/debian/patches/clang-analyzer-force-version.diff
+++ b/debian/patches/clang-analyzer-force-version.diff
@@ -1,11 +1,11 @@
 # Force the version of clang in the analyzer
 # This was causing the static analyzer to fail silently if the clang & clang++ are
 # not installed
-Index: llvm-toolchain-snapshot_10~svn3310515/clang/tools/scan-build/libexec/ccc-analyzer
+Index: llvm-toolchain-snapshot_10~svn370025/clang/tools/scan-build/libexec/ccc-analyzer
 ===================================================================
---- llvm-toolchain-snapshot_10~svn3310515.orig/clang/tools/scan-build/libexec/ccc-analyzer
-+++ llvm-toolchain-snapshot_10~svn3310515/clang/tools/scan-build/libexec/ccc-analyzer
-@@ -101,7 +101,7 @@ if ($FindBin::Script =~ /c\+\+-analyzer/
+--- llvm-toolchain-snapshot_10~svn370025.orig/clang/tools/scan-build/libexec/ccc-analyzer
++++ llvm-toolchain-snapshot_10~svn370025/clang/tools/scan-build/libexec/ccc-analyzer
+@@ -90,7 +90,7 @@ if ($FindBin::Script =~ /c\+\+-analyzer/
    if (!defined $Compiler || (! -x $Compiler && ! SearchInPath($Compiler))) { $Compiler = $DefaultCXXCompiler; }
  
    $Clang = $ENV{'CLANG_CXX'};
@@ -14,7 +14,7 @@ Index: llvm-toolchain-snapshot_10~svn3310515/clang/tools/scan-build/libexec/ccc-
  
    $IsCXX = 1
  }
-@@ -100,7 +100,7 @@ else {
+@@ -99,7 +99,7 @@ else {
    if (!defined $Compiler || (! -x $Compiler && ! SearchInPath($Compiler))) { $Compiler = $DefaultCCompiler; }
  
    $Clang = $ENV{'CLANG'};
diff --git a/debian/patches/clang-arm-default-vfp3-on-armv7a.patch b/debian/patches/clang-arm-default-vfp3-on-armv7a.patch
index 0a0456d8..4f675a83 100644
--- a/debian/patches/clang-arm-default-vfp3-on-armv7a.patch
+++ b/debian/patches/clang-arm-default-vfp3-on-armv7a.patch
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_9~svn351647/include/llvm/Support/ARMTargetParser.def
+Index: llvm-toolchain-snapshot_10~svn370025/include/llvm/Support/ARMTargetParser.def
 ===================================================================
---- llvm-toolchain-snapshot_9~svn351647.orig/include/llvm/Support/ARMTargetParser.def
-+++ llvm-toolchain-snapshot_9~svn351647/include/llvm/Support/ARMTargetParser.def
-@@ -74,7 +74,7 @@ ARM_ARCH("armv6kz", ARMV6KZ, "6KZ", "v6k
+--- llvm-toolchain-snapshot_10~svn370025.orig/include/llvm/Support/ARMTargetParser.def
++++ llvm-toolchain-snapshot_10~svn370025/include/llvm/Support/ARMTargetParser.def
+@@ -76,7 +76,7 @@ ARM_ARCH("armv6kz", ARMV6KZ, "6KZ", "v6k
  ARM_ARCH("armv6-m", ARMV6M, "6-M", "v6m", ARMBuildAttrs::CPUArch::v6_M,
            FK_NONE, ARM::AEK_NONE)
  ARM_ARCH("armv7-a", ARMV7A, "7-A", "v7", ARMBuildAttrs::CPUArch::v7,
@@ -11,11 +11,11 @@ Index: llvm-toolchain-snapshot_9~svn351647/include/llvm/Support/ARMTargetParser.
  ARM_ARCH("armv7ve", ARMV7VE, "7VE", "v7ve", ARMBuildAttrs::CPUArch::v7,
            FK_NEON, (ARM::AEK_SEC | ARM::AEK_MP | ARM::AEK_VIRT |
            ARM::AEK_HWDIVARM | ARM::AEK_HWDIVTHUMB | ARM::AEK_DSP))
-Index: llvm-toolchain-snapshot_9~svn351647/lib/Target/ARM/ARM.td
+Index: llvm-toolchain-snapshot_10~svn370025/lib/Target/ARM/ARM.td
 ===================================================================
---- llvm-toolchain-snapshot_9~svn351647.orig/lib/Target/ARM/ARM.td
-+++ llvm-toolchain-snapshot_9~svn351647/lib/Target/ARM/ARM.td
-@@ -595,7 +595,8 @@ def ARMv6sm   : Architecture<"armv6s-m",
+--- llvm-toolchain-snapshot_10~svn370025.orig/lib/Target/ARM/ARM.td
++++ llvm-toolchain-snapshot_10~svn370025/lib/Target/ARM/ARM.td
+@@ -663,7 +663,8 @@ def ARMv6sm   : Architecture<"armv6s-m",
                                                         FeatureStrictAlign]>;
  
  def ARMv7a    : Architecture<"armv7-a",   "ARMv7a",   [HasV7Ops,
diff --git a/debian/patches/clang-format-version.diff b/debian/patches/clang-format-version.diff
index b3aded9a..98b9db34 100644
--- a/debian/patches/clang-format-version.diff
+++ b/debian/patches/clang-format-version.diff
@@ -4,11 +4,11 @@
  clang/tools/clang-format/clang-format.py      |    2 +-
  3 files changed, 3 insertions(+), 3 deletions(-)
 
-Index: llvm-toolchain-snapshot_10~svn3422610/clang/tools/clang-format/clang-format-diff.py
+Index: llvm-toolchain-snapshot_10~svn370025/clang/tools/clang-format/clang-format-diff.py
 ===================================================================
---- llvm-toolchain-snapshot_10~svn3422610.orig/clang/tools/clang-format/clang-format-diff.py
-+++ llvm-toolchain-snapshot_10~svn3422610/clang/tools/clang-format/clang-format-diff.py
-@@ -57,7 +57,7 @@ def main():
+--- llvm-toolchain-snapshot_10~svn370025.orig/clang/tools/clang-format/clang-format-diff.py
++++ llvm-toolchain-snapshot_10~svn370025/clang/tools/clang-format/clang-format-diff.py
+@@ -54,7 +54,7 @@ def main():
    parser.add_argument('-style',
                        help='formatting style to apply (LLVM, Google, Chromium, '
                        'Mozilla, WebKit)')
@@ -17,10 +17,10 @@ Index: llvm-toolchain-snapshot_10~svn3422610/clang/tools/clang-format/clang-form
                        help='location of binary to use for clang-format')
    args = parser.parse_args()
  
-Index: llvm-toolchain-snapshot_10~svn3422610/clang/tools/clang-format/clang-format.el
+Index: llvm-toolchain-snapshot_10~svn370025/clang/tools/clang-format/clang-format.el
 ===================================================================
---- llvm-toolchain-snapshot_10~svn3422610.orig/clang/tools/clang-format/clang-format.el
-+++ llvm-toolchain-snapshot_10~svn3422610/clang/tools/clang-format/clang-format.el
+--- llvm-toolchain-snapshot_10~svn370025.orig/clang/tools/clang-format/clang-format.el
++++ llvm-toolchain-snapshot_10~svn370025/clang/tools/clang-format/clang-format.el
 @@ -36,7 +36,7 @@
    :group 'tools)
  
@@ -30,10 +30,10 @@ Index: llvm-toolchain-snapshot_10~svn3422610/clang/tools/clang-format/clang-form
        "clang-format")
    "Location of the clang-format executable.
  
-Index: llvm-toolchain-snapshot_10~svn3422610/clang/tools/clang-format/clang-format.py
+Index: llvm-toolchain-snapshot_10~svn370025/clang/tools/clang-format/clang-format.py
 ===================================================================
---- llvm-toolchain-snapshot_10~svn3422610.orig/clang/tools/clang-format/clang-format.py
-+++ llvm-toolchain-snapshot_10~svn3422610/clang/tools/clang-format/clang-format.py
+--- llvm-toolchain-snapshot_10~svn370025.orig/clang/tools/clang-format/clang-format.py
++++ llvm-toolchain-snapshot_10~svn370025/clang/tools/clang-format/clang-format.py
 @@ -36,7 +36,7 @@ import vim
  
  # set g:clang_format_path to the path to clang-format if it is not on the path
diff --git a/debian/patches/clang-tidy-run-bin.diff b/debian/patches/clang-tidy-run-bin.diff
index 03f520f3..b18cff67 100644
--- a/debian/patches/clang-tidy-run-bin.diff
+++ b/debian/patches/clang-tidy-run-bin.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_10~svn3422610/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
+Index: llvm-toolchain-snapshot_10~svn370025/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
 ===================================================================
---- llvm-toolchain-snapshot_10~svn3422610.orig/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
-+++ llvm-toolchain-snapshot_10~svn3422610/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
-@@ -1710,10 +1710,10 @@ def main():
+--- llvm-toolchain-snapshot_10~svn370025.orig/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
++++ llvm-toolchain-snapshot_10~svn370025/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
+@@ -180,10 +180,10 @@ def main():
                                     'clang-tidy and clang-apply-replacements in '
                                     '$PATH.')
    parser.add_argument('-clang-tidy-binary', metavar='PATH',
diff --git a/debian/patches/clangd-atomic-cmake.patch b/debian/patches/clangd-atomic-cmake.patch
index b3c2934d..e3e2b74b 100644
--- a/debian/patches/clangd-atomic-cmake.patch
+++ b/debian/patches/clangd-atomic-cmake.patch
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_9~svn351647/clang-tools-extra/clangd/CMakeLists.txt
+Index: llvm-toolchain-snapshot_10~svn370025/clang-tools-extra/clangd/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_9~svn351647.orig/clang-tools-extra/clangd/CMakeLists.txt
-+++ llvm-toolchain-snapshot_9~svn351647/clang-tools-extra/clangd/CMakeLists.txt
-@@ -20,6 +20,11 @@ if(NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB)
+--- llvm-toolchain-snapshot_10~svn370025.orig/clang-tools-extra/clangd/CMakeLists.txt
++++ llvm-toolchain-snapshot_10~svn370025/clang-tools-extra/clangd/CMakeLists.txt
+@@ -34,6 +34,11 @@ if(NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB)
    list(APPEND CLANGD_ATOMIC_LIB "atomic")
  endif()
  
diff --git a/debian/patches/debug-jit-path.diff b/debian/patches/debug-jit-path.diff
index 78dc89aa..2610b4a4 100644
--- a/debian/patches/debug-jit-path.diff
+++ b/debian/patches/debug-jit-path.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-7_7.0.1~+rc3/lib/ExecutionEngine/PerfJITEvents/PerfJITEventListener.cpp
+Index: llvm-toolchain-snapshot_10~svn370025/lib/ExecutionEngine/PerfJITEvents/PerfJITEventListener.cpp
 ===================================================================
---- llvm-toolchain-7_7.0.1~+rc3.orig/lib/ExecutionEngine/PerfJITEvents/PerfJITEventListener.cpp
-+++ llvm-toolchain-7_7.0.1~+rc3/lib/ExecutionEngine/PerfJITEvents/PerfJITEventListener.cpp
-@@ -294,8 +294,8 @@ bool PerfJITEventListener::InitDebugging
+--- llvm-toolchain-snapshot_10~svn370025.orig/lib/ExecutionEngine/PerfJITEvents/PerfJITEventListener.cpp
++++ llvm-toolchain-snapshot_10~svn370025/lib/ExecutionEngine/PerfJITEvents/PerfJITEventListener.cpp
+@@ -300,8 +300,8 @@ bool PerfJITEventListener::InitDebugging
    // search for location to dump data to
    if (const char *BaseDir = getenv("JITDUMPDIR"))
      Path.append(BaseDir);
diff --git a/debian/patches/declare_clear_cache.diff b/debian/patches/declare_clear_cache.diff
index a2cebb41..3fcf8856 100644
--- a/debian/patches/declare_clear_cache.diff
+++ b/debian/patches/declare_clear_cache.diff
@@ -2,11 +2,11 @@
  lib/Support/Unix/Memory.inc |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: llvm-toolchain-snapshot_8~svn342269/lib/Support/Unix/Memory.inc
+Index: llvm-toolchain-snapshot_10~svn370025/lib/Support/Unix/Memory.inc
 ===================================================================
---- llvm-toolchain-snapshot_8~svn342269.orig/lib/Support/Unix/Memory.inc
-+++ llvm-toolchain-snapshot_8~svn342269/lib/Support/Unix/Memory.inc
-@@ -237,7 +237,7 @@ void Memory::InvalidateInstructionCache(
+--- llvm-toolchain-snapshot_10~svn370025.orig/lib/Support/Unix/Memory.inc
++++ llvm-toolchain-snapshot_10~svn370025/lib/Support/Unix/Memory.inc
+@@ -256,7 +256,7 @@ void Memory::InvalidateInstructionCache(
    // FIXME: Can we safely always call this for __GNUC__ everywhere?
    const char *Start = static_cast<const char *>(Addr);
    const char *End = Start + Len;
diff --git a/debian/patches/disable-path-test-failing.diff b/debian/patches/disable-path-test-failing.diff
index 4643d8f3..3b9f20e3 100644
--- a/debian/patches/disable-path-test-failing.diff
+++ b/debian/patches/disable-path-test-failing.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_8~svn347135/unittests/Support/Path.cpp
+Index: llvm-toolchain-snapshot_10~svn370025/unittests/Support/Path.cpp
 ===================================================================
---- llvm-toolchain-snapshot_8~svn347135.orig/unittests/Support/Path.cpp
-+++ llvm-toolchain-snapshot_8~svn347135/unittests/Support/Path.cpp
-@@ -437,7 +437,7 @@ protected:
+--- llvm-toolchain-snapshot_10~svn370025.orig/unittests/Support/Path.cpp
++++ llvm-toolchain-snapshot_10~svn370025/unittests/Support/Path.cpp
+@@ -447,7 +447,7 @@ protected:
      sys::path::append(NonExistantFile, "1B28B495C16344CB9822E588CD4C3EF0");
    }
  
@@ -11,7 +11,7 @@ Index: llvm-toolchain-snapshot_8~svn347135/unittests/Support/Path.cpp
  };
  
  TEST_F(FileSystemTest, Unique) {
-@@ -519,13 +519,13 @@ TEST_F(FileSystemTest, RealPath) {
+@@ -529,13 +529,13 @@ TEST_F(FileSystemTest, RealPath) {
  
    // This can fail if $HOME is not set and getpwuid fails.
    bool Result = llvm::sys::path::home_directory(HomeDir);
diff --git a/debian/patches/disable-sse2-old-x86.diff b/debian/patches/disable-sse2-old-x86.diff
index eb76e169..6f2ca532 100644
--- a/debian/patches/disable-sse2-old-x86.diff
+++ b/debian/patches/disable-sse2-old-x86.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_9~svn352086/clang/include/clang/Basic/X86Target.def
+Index: llvm-toolchain-snapshot_10~svn370025/clang/include/clang/Basic/X86Target.def
 ===================================================================
---- llvm-toolchain-snapshot_9~svn352086.orig/clang/include/clang/Basic/X86Target.def
-+++ llvm-toolchain-snapshot_9~svn352086/clang/include/clang/Basic/X86Target.def
-@@ -301,7 +301,7 @@ CPU_SPECIFIC("pentium_mmx", 'D', "+mmx")
+--- llvm-toolchain-snapshot_10~svn370025.orig/clang/include/clang/Basic/X86Target.def
++++ llvm-toolchain-snapshot_10~svn370025/clang/include/clang/Basic/X86Target.def
+@@ -312,7 +312,7 @@ CPU_SPECIFIC("pentium_mmx", 'D', "+mmx")
  CPU_SPECIFIC("pentium_ii", 'E', "+cmov,+mmx")
  CPU_SPECIFIC("pentium_iii", 'H', "+cmov,+mmx,+sse")
  CPU_SPECIFIC_ALIAS("pentium_iii_no_xmm_regs", "pentium_iii")
diff --git a/debian/patches/fix-clang-path-and-build.diff b/debian/patches/fix-clang-path-and-build.diff
index 039006d3..74736ad5 100644
--- a/debian/patches/fix-clang-path-and-build.diff
+++ b/debian/patches/fix-clang-path-and-build.diff
@@ -2,10 +2,10 @@
  clang/lib/Driver/ToolChains.cpp |    2 ++
  1 file changed, 2 insertions(+)
 
-Index: llvm-toolchain-snapshot_9~svn351647/clang/lib/Driver/ToolChains/Gnu.cpp
+Index: llvm-toolchain-snapshot_10~svn370025/clang/lib/Driver/ToolChains/Gnu.cpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn351647.orig/clang/lib/Driver/ToolChains/Gnu.cpp
-+++ llvm-toolchain-snapshot_9~svn351647/clang/lib/Driver/ToolChains/Gnu.cpp
+--- llvm-toolchain-snapshot_10~svn370025.orig/clang/lib/Driver/ToolChains/Gnu.cpp
++++ llvm-toolchain-snapshot_10~svn370025/clang/lib/Driver/ToolChains/Gnu.cpp
 @@ -1,4 +1,5 @@
 -//===--- Gnu.cpp - Gnu Tool and ToolChain Implementations -------*- C++ -*-===//
 +//===--- Gnu.cpp - Gnu Tool and ToolChain Implementations -------*- C++ 
@@ -21,7 +21,7 @@ Index: llvm-toolchain-snapshot_9~svn351647/clang/lib/Driver/ToolChains/Gnu.cpp
  #include "clang/Config/config.h" // for GCC_INSTALL_PREFIX
  #include "clang/Driver/Compilation.h"
  #include "clang/Driver/Driver.h"
-@@ -2534,6 +2536,7 @@ void Generic_GCC::AddClangCXXStdlibInclu
+@@ -2612,6 +2614,7 @@ void Generic_GCC::AddClangCXXStdlibInclu
      addLibStdCxxIncludePaths(DriverArgs, CC1Args);
      break;
    }
diff --git a/debian/patches/fix-llvm-config-obj-src-root.patch b/debian/patches/fix-llvm-config-obj-src-root.patch
index 626598b3..e2ee85a5 100644
--- a/debian/patches/fix-llvm-config-obj-src-root.patch
+++ b/debian/patches/fix-llvm-config-obj-src-root.patch
@@ -2,11 +2,11 @@
  tools/llvm-config/llvm-config.cpp |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-Index: llvm-toolchain-snapshot_8~svn342269/tools/llvm-config/llvm-config.cpp
+Index: llvm-toolchain-snapshot_10~svn370025/tools/llvm-config/llvm-config.cpp
 ===================================================================
---- llvm-toolchain-snapshot_8~svn342269.orig/tools/llvm-config/llvm-config.cpp
-+++ llvm-toolchain-snapshot_8~svn342269/tools/llvm-config/llvm-config.cpp
-@@ -558,9 +558,9 @@ int main(int argc, char **argv) {
+--- llvm-toolchain-snapshot_10~svn370025.orig/tools/llvm-config/llvm-config.cpp
++++ llvm-toolchain-snapshot_10~svn370025/tools/llvm-config/llvm-config.cpp
+@@ -560,9 +560,9 @@ int main(int argc, char **argv) {
        } else if (Arg == "--shared-mode") {
          PrintSharedMode = true;
        } else if (Arg == "--obj-root") {
diff --git a/debian/patches/fix-scan-view-path.diff b/debian/patches/fix-scan-view-path.diff
index 549382bd..e7322e69 100644
--- a/debian/patches/fix-scan-view-path.diff
+++ b/debian/patches/fix-scan-view-path.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-3.10-3.10/clang/tools/scan-view/bin/scan-view
+Index: llvm-toolchain-snapshot_10~svn370025/clang/tools/scan-view/bin/scan-view
 ===================================================================
---- llvm-toolchain-3.10-3.10.orig/clang/tools/scan-view/bin/scan-view
-+++ llvm-toolchain-3.10-3.10/clang/tools/scan-view/bin/scan-view
-@@ -23,6 +23,7 @@ kDefaultPort = 101101
+--- llvm-toolchain-snapshot_10~svn370025.orig/clang/tools/scan-view/bin/scan-view
++++ llvm-toolchain-snapshot_10~svn370025/clang/tools/scan-view/bin/scan-view
+@@ -28,6 +28,7 @@ kDefaultPort = 8181
  kMaxPortsToTry = 100
  
  ###
@@ -10,7 +10,7 @@ Index: llvm-toolchain-3.10-3.10/clang/tools/scan-view/bin/scan-view
  
  
  def url_is_up(url):
-@@ -61,7 +62,7 @@ def start_browser(port, options):
+@@ -65,7 +66,7 @@ def start_browser(port, options):
  
  def run(port, options, root):
      # Prefer to look relative to the installed binary
diff --git a/debian/patches/hurd/hurd-pathmax.diff b/debian/patches/hurd/hurd-pathmax.diff
index 08b76edc..4ffe7a37 100644
--- a/debian/patches/hurd/hurd-pathmax.diff
+++ b/debian/patches/hurd/hurd-pathmax.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_9~svn358740/clang/lib/Basic/FileManager.cpp
+Index: llvm-toolchain-snapshot_10~svn370025/clang/lib/Basic/FileManager.cpp
 ===================================================================
---- 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
+--- llvm-toolchain-snapshot_10~svn370025.orig/clang/lib/Basic/FileManager.cpp
++++ llvm-toolchain-snapshot_10~svn370025/clang/lib/Basic/FileManager.cpp
+@@ -512,6 +512,12 @@ void FileManager::invalidateCache(const
    UniqueRealFiles.erase(Entry->getUniqueID());
  }
  
@@ -15,10 +15,10 @@ Index: llvm-toolchain-snapshot_9~svn358740/clang/lib/Basic/FileManager.cpp
  void FileManager::GetUniqueIDMapping(
                     SmallVectorImpl<const FileEntry *> &UIDToFiles) const {
    UIDToFiles.clear();
-Index: llvm-toolchain-snapshot_9~svn358740/lldb/include/lldb/lldb-defines.h
+Index: llvm-toolchain-snapshot_10~svn370025/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
+--- llvm-toolchain-snapshot_10~svn370025.orig/lldb/include/lldb/lldb-defines.h
++++ llvm-toolchain-snapshot_10~svn370025/lldb/include/lldb/lldb-defines.h
 @@ -27,6 +27,11 @@
  #define INT32_MAX 2147483647
  #endif
@@ -31,10 +31,10 @@ Index: llvm-toolchain-snapshot_9~svn358740/lldb/include/lldb/lldb-defines.h
  #if !defined(UINT32_MAX)
  #define UINT32_MAX 4294967295U
  #endif
-Index: llvm-toolchain-snapshot_9~svn358740/tools/dsymutil/DwarfLinker.cpp
+Index: llvm-toolchain-snapshot_10~svn370025/tools/dsymutil/DwarfLinker.cpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn358740.orig/tools/dsymutil/DwarfLinker.cpp
-+++ llvm-toolchain-snapshot_9~svn358740/tools/dsymutil/DwarfLinker.cpp
+--- llvm-toolchain-snapshot_10~svn370025.orig/tools/dsymutil/DwarfLinker.cpp
++++ llvm-toolchain-snapshot_10~svn370025/tools/dsymutil/DwarfLinker.cpp
 @@ -100,6 +100,11 @@
  #include <utility>
  #include <vector>
@@ -47,10 +47,10 @@ Index: llvm-toolchain-snapshot_9~svn358740/tools/dsymutil/DwarfLinker.cpp
  namespace llvm {
  namespace dsymutil {
  
-Index: llvm-toolchain-snapshot_9~svn358740/polly/lib/External/ppcg/cuda_common.c
+Index: llvm-toolchain-snapshot_10~svn370025/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
+--- llvm-toolchain-snapshot_10~svn370025.orig/polly/lib/External/ppcg/cuda_common.c
++++ llvm-toolchain-snapshot_10~svn370025/polly/lib/External/ppcg/cuda_common.c
 @@ -15,6 +15,11 @@
  #include "cuda_common.h"
  #include "ppcg.h"
diff --git a/debian/patches/install-scan-build-py.diff b/debian/patches/install-scan-build-py.diff
index 95543fd0..5b510d9c 100644
--- a/debian/patches/install-scan-build-py.diff
+++ b/debian/patches/install-scan-build-py.diff
@@ -2,11 +2,11 @@
  clang/tools/CMakeLists.txt |    1 +
  1 file changed, 1 insertion(+)
 
-Index: llvm-toolchain-snapshot_8~svn350922/clang/tools/CMakeLists.txt
+Index: llvm-toolchain-snapshot_10~svn370025/clang/tools/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_8~svn350922.orig/clang/tools/CMakeLists.txt
-+++ llvm-toolchain-snapshot_8~svn350922/clang/tools/CMakeLists.txt
-@@ -23,6 +23,7 @@ if(CLANG_ENABLE_STATIC_ANALYZER)
+--- llvm-toolchain-snapshot_10~svn370025.orig/clang/tools/CMakeLists.txt
++++ llvm-toolchain-snapshot_10~svn370025/clang/tools/CMakeLists.txt
+@@ -27,6 +27,7 @@ if(CLANG_ENABLE_STATIC_ANALYZER)
    add_clang_subdirectory(clang-check)
    add_clang_subdirectory(clang-extdef-mapping)
    add_clang_subdirectory(scan-build)
diff --git a/debian/patches/kfreebsd/CMakeLists.txt.diff b/debian/patches/kfreebsd/CMakeLists.txt.diff
index b1616f9a..fb03a080 100644
--- a/debian/patches/kfreebsd/CMakeLists.txt.diff
+++ b/debian/patches/kfreebsd/CMakeLists.txt.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_9~svn358740/CMakeLists.txt
+Index: llvm-toolchain-snapshot_10~svn370025/CMakeLists.txt
 ===================================================================
---- 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)
+--- llvm-toolchain-snapshot_10~svn370025.orig/CMakeLists.txt
++++ llvm-toolchain-snapshot_10~svn370025/CMakeLists.txt
+@@ -866,7 +866,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 ec903636..ce560358 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-snapshot_9~svn358740/clang/lib/Basic/Targets.cpp
+Index: llvm-toolchain-snapshot_10~svn370025/clang/lib/Basic/Targets.cpp
 ===================================================================
---- 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
+--- llvm-toolchain-snapshot_10~svn370025.orig/clang/lib/Basic/Targets.cpp
++++ llvm-toolchain-snapshot_10~svn370025/clang/lib/Basic/Targets.cpp
+@@ -470,8 +470,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-snapshot_9~svn358740/clang/lib/Basic/Targets.cpp
      case llvm::Triple::Minix:
        return new MinixTargetInfo<X86_32TargetInfo>(Triple, Opts);
      case llvm::Triple::Solaris:
-@@ -531,8 +531,8 @@ TargetInfo *AllocateTarget(const llvm::T
+@@ -529,8 +529,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-snapshot_9~svn358740/clang/lib/Basic/Targets.cpp
      case llvm::Triple::Solaris:
        return new SolarisTargetInfo<X86_64TargetInfo>(Triple, Opts);
      case llvm::Triple::Win32: {
-Index: llvm-toolchain-snapshot_9~svn358740/clang/lib/Basic/Targets/OSTargets.h
+Index: llvm-toolchain-snapshot_10~svn370025/clang/lib/Basic/Targets/OSTargets.h
 ===================================================================
---- 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:
+--- llvm-toolchain-snapshot_10~svn370025.orig/clang/lib/Basic/Targets/OSTargets.h
++++ llvm-toolchain-snapshot_10~svn370025/clang/lib/Basic/Targets/OSTargets.h
+@@ -265,7 +265,7 @@ public:
  
  // GNU/kFreeBSD Target
  template <typename Target>
@@ -37,7 +37,7 @@ Index: llvm-toolchain-snapshot_9~svn358740/clang/lib/Basic/Targets/OSTargets.h
  protected:
    void getOSDefines(const LangOptions &Opts, const llvm::Triple &Triple,
                      MacroBuilder &Builder) const override {
-@@ -251,7 +251,7 @@ protected:
+@@ -282,7 +282,7 @@ protected:
    }
  
  public:
diff --git a/debian/patches/kfreebsd/include_llvm_ADT_Triple.h.diff b/debian/patches/kfreebsd/include_llvm_ADT_Triple.h.diff
index 9c1fc7aa..aa33e42c 100644
--- a/debian/patches/kfreebsd/include_llvm_ADT_Triple.h.diff
+++ b/debian/patches/kfreebsd/include_llvm_ADT_Triple.h.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_9~svn358740/include/llvm/ADT/Triple.h
+Index: llvm-toolchain-snapshot_10~svn370025/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:
+--- llvm-toolchain-snapshot_10~svn370025.orig/include/llvm/ADT/Triple.h
++++ llvm-toolchain-snapshot_10~svn370025/include/llvm/ADT/Triple.h
+@@ -161,7 +161,7 @@ public:
      FreeBSD,
      Fuchsia,
      IOS,
@@ -11,7 +11,7 @@ Index: llvm-toolchain-snapshot_9~svn358740/include/llvm/ADT/Triple.h
      Linux,
      Lv2,        // PS3
      MacOSX,
-@@ -579,8 +579,8 @@ public:
+@@ -588,8 +588,8 @@ public:
    }
  
    /// Tests whether the OS is kFreeBSD.
@@ -22,7 +22,7 @@ Index: llvm-toolchain-snapshot_9~svn358740/include/llvm/ADT/Triple.h
    }
  
    /// Tests whether the OS is Hurd.
-@@ -600,7 +600,7 @@ public:
+@@ -609,7 +609,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 9645ad38..57f57c45 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~svn359759/libcxx/include/__config
+Index: llvm-toolchain-snapshot_10~svn370025/libcxx/include/__config
 ===================================================================
---- llvm-toolchain-snapshot_9~svn359759.orig/libcxx/include/__config
-+++ llvm-toolchain-snapshot_9~svn359759/libcxx/include/__config
-@@ -1132,6 +1132,7 @@ _LIBCPP_FUNC_VIS extern "C" void __sanit
+--- llvm-toolchain-snapshot_10~svn370025.orig/libcxx/include/__config
++++ llvm-toolchain-snapshot_10~svn370025/libcxx/include/__config
+@@ -1062,6 +1062,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 f79f3af6..235090b9 100644
--- a/debian/patches/kfreebsd/kfreebsd-openmp.diff
+++ b/debian/patches/kfreebsd/kfreebsd-openmp.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_10~svn367182/openmp/runtime/src/kmp.h
+Index: llvm-toolchain-snapshot_10~svn370025/openmp/runtime/src/kmp.h
 ===================================================================
---- llvm-toolchain-snapshot_10~svn367182.orig/openmp/runtime/src/kmp.h
-+++ llvm-toolchain-snapshot_10~svn367182/openmp/runtime/src/kmp.h
+--- llvm-toolchain-snapshot_10~svn370025.orig/openmp/runtime/src/kmp.h
++++ llvm-toolchain-snapshot_10~svn370025/openmp/runtime/src/kmp.h
 @@ -1142,6 +1142,10 @@ extern kmp_uint64 __kmp_now_nsec();
  /* TODO: tune for KMP_OS_OPENBSD */
  #define KMP_INIT_WAIT 1024U /* initial number of spin-tests   */
@@ -13,10 +13,10 @@ Index: llvm-toolchain-snapshot_10~svn367182/openmp/runtime/src/kmp.h
  #endif
  
  #if KMP_ARCH_X86 || KMP_ARCH_X86_64
-Index: llvm-toolchain-snapshot_10~svn367182/openmp/runtime/src/kmp_ftn_entry.h
+Index: llvm-toolchain-snapshot_10~svn370025/openmp/runtime/src/kmp_ftn_entry.h
 ===================================================================
---- llvm-toolchain-snapshot_10~svn367182.orig/openmp/runtime/src/kmp_ftn_entry.h
-+++ llvm-toolchain-snapshot_10~svn367182/openmp/runtime/src/kmp_ftn_entry.h
+--- llvm-toolchain-snapshot_10~svn370025.orig/openmp/runtime/src/kmp_ftn_entry.h
++++ llvm-toolchain-snapshot_10~svn370025/openmp/runtime/src/kmp_ftn_entry.h
 @@ -531,7 +531,7 @@ int FTN_STDCALL KMP_EXPAND_NAME(FTN_GET_
    int gtid;
  
@@ -26,10 +26,10 @@ Index: llvm-toolchain-snapshot_10~svn367182/openmp/runtime/src/kmp_ftn_entry.h
    gtid = __kmp_entry_gtid();
  #elif KMP_OS_WINDOWS
    if (!__kmp_init_parallel ||
-Index: llvm-toolchain-snapshot_10~svn367182/openmp/runtime/src/kmp_platform.h
+Index: llvm-toolchain-snapshot_10~svn370025/openmp/runtime/src/kmp_platform.h
 ===================================================================
---- llvm-toolchain-snapshot_10~svn367182.orig/openmp/runtime/src/kmp_platform.h
-+++ llvm-toolchain-snapshot_10~svn367182/openmp/runtime/src/kmp_platform.h
+--- llvm-toolchain-snapshot_10~svn370025.orig/openmp/runtime/src/kmp_platform.h
++++ llvm-toolchain-snapshot_10~svn370025/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_10~svn367182/openmp/runtime/src/kmp_platform.h
  #undef KMP_OS_UNIX
  #define KMP_OS_UNIX 1
  #endif
-Index: llvm-toolchain-snapshot_10~svn367182/openmp/runtime/src/kmp_runtime.cpp
+Index: llvm-toolchain-snapshot_10~svn370025/openmp/runtime/src/kmp_runtime.cpp
 ===================================================================
---- llvm-toolchain-snapshot_10~svn367182.orig/openmp/runtime/src/kmp_runtime.cpp
-+++ llvm-toolchain-snapshot_10~svn367182/openmp/runtime/src/kmp_runtime.cpp
-@@ -8027,7 +8027,7 @@ __kmp_determine_reduction_method(
+--- llvm-toolchain-snapshot_10~svn370025.orig/openmp/runtime/src/kmp_runtime.cpp
++++ llvm-toolchain-snapshot_10~svn370025/openmp/runtime/src/kmp_runtime.cpp
+@@ -8114,7 +8114,7 @@ __kmp_determine_reduction_method(
      KMP_ARCH_MIPS64 || KMP_ARCH_RISCV64
  
  #if KMP_OS_LINUX || KMP_OS_DRAGONFLY || KMP_OS_FREEBSD || KMP_OS_NETBSD ||     \
@@ -78,7 +78,7 @@ Index: llvm-toolchain-snapshot_10~svn367182/openmp/runtime/src/kmp_runtime.cpp
  
      int teamsize_cutoff = 4;
  
-@@ -8055,7 +8055,7 @@ __kmp_determine_reduction_method(
+@@ -8142,7 +8142,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_10~svn367182/openmp/runtime/src/kmp_runtime.cpp
  
      // basic tuning
  
-Index: llvm-toolchain-snapshot_10~svn367182/openmp/runtime/src/z_Linux_util.cpp
+Index: llvm-toolchain-snapshot_10~svn370025/openmp/runtime/src/z_Linux_util.cpp
 ===================================================================
---- llvm-toolchain-snapshot_10~svn367182.orig/openmp/runtime/src/z_Linux_util.cpp
-+++ llvm-toolchain-snapshot_10~svn367182/openmp/runtime/src/z_Linux_util.cpp
+--- llvm-toolchain-snapshot_10~svn370025.orig/openmp/runtime/src/z_Linux_util.cpp
++++ llvm-toolchain-snapshot_10~svn370025/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;
diff --git a/debian/patches/kfreebsd/lib_Support.diff b/debian/patches/kfreebsd/lib_Support.diff
index 1c1b005c..895bc874 100644
--- a/debian/patches/kfreebsd/lib_Support.diff
+++ b/debian/patches/kfreebsd/lib_Support.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_9~svn358740/lib/Support/Triple.cpp
+Index: llvm-toolchain-snapshot_10~svn370025/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
+--- llvm-toolchain-snapshot_10~svn370025.orig/lib/Support/Triple.cpp
++++ llvm-toolchain-snapshot_10~svn370025/lib/Support/Triple.cpp
+@@ -183,7 +183,7 @@ StringRef Triple::getOSTypeName(OSType K
    case FreeBSD: return "freebsd";
    case Fuchsia: return "fuchsia";
    case IOS: return "ios";
@@ -11,7 +11,7 @@ Index: llvm-toolchain-snapshot_9~svn358740/lib/Support/Triple.cpp
    case Linux: return "linux";
    case Lv2: return "lv2";
    case MacOSX: return "macosx";
-@@ -479,7 +479,7 @@ static Triple::OSType parseOS(StringRef
+@@ -488,7 +488,7 @@ static Triple::OSType parseOS(StringRef
      .StartsWith("freebsd", Triple::FreeBSD)
      .StartsWith("fuchsia", Triple::Fuchsia)
      .StartsWith("ios", Triple::IOS)
@@ -20,10 +20,10 @@ Index: llvm-toolchain-snapshot_9~svn358740/lib/Support/Triple.cpp
      .StartsWith("linux", Triple::Linux)
      .StartsWith("lv2", Triple::Lv2)
      .StartsWith("macos", Triple::MacOSX)
-Index: llvm-toolchain-snapshot_9~svn358740/lib/Support/Unix/Path.inc
+Index: llvm-toolchain-snapshot_10~svn370025/lib/Support/Unix/Path.inc
 ===================================================================
---- llvm-toolchain-snapshot_9~svn358740.orig/lib/Support/Unix/Path.inc
-+++ llvm-toolchain-snapshot_9~svn358740/lib/Support/Unix/Path.inc
+--- llvm-toolchain-snapshot_10~svn370025.orig/lib/Support/Unix/Path.inc
++++ llvm-toolchain-snapshot_10~svn370025/lib/Support/Unix/Path.inc
 @@ -62,7 +62,7 @@
  #define FSTATVFS fstatvfs
  #define STATVFS_F_FRSIZE(vfs) vfs.f_frsize
diff --git a/debian/patches/kfreebsd/lib_Target_X86.diff b/debian/patches/kfreebsd/lib_Target_X86.diff
index 7284030f..408982fc 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~svn358740/lib/Target/X86/X86Subtarget.cpp
+Index: llvm-toolchain-snapshot_10~svn370025/lib/Target/X86/X86Subtarget.cpp
 ===================================================================
---- 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
+--- llvm-toolchain-snapshot_10~svn370025.orig/lib/Target/X86/X86Subtarget.cpp
++++ llvm-toolchain-snapshot_10~svn370025/lib/Target/X86/X86Subtarget.cpp
+@@ -290,7 +290,7 @@ void X86Subtarget::initSubtargetFeatures
    if (StackAlignOverride)
      stackAlignment = StackAlignOverride;
    else if (isTargetDarwin() || isTargetLinux() || isTargetSolaris() ||
@@ -11,11 +11,11 @@ Index: llvm-toolchain-snapshot_9~svn358740/lib/Target/X86/X86Subtarget.cpp
      stackAlignment = 16;
  
    // Some CPUs have more overhead for gather. The specified overhead is relative
-Index: llvm-toolchain-snapshot_9~svn358740/lib/Target/X86/X86Subtarget.h
+Index: llvm-toolchain-snapshot_10~svn370025/lib/Target/X86/X86Subtarget.h
 ===================================================================
---- 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:
+--- llvm-toolchain-snapshot_10~svn370025.orig/lib/Target/X86/X86Subtarget.h
++++ llvm-toolchain-snapshot_10~svn370025/lib/Target/X86/X86Subtarget.h
+@@ -758,7 +758,7 @@ public:
    bool isTargetMachO() const { return TargetTriple.isOSBinFormatMachO(); }
  
    bool isTargetLinux() const { return TargetTriple.isOSLinux(); }
diff --git a/debian/patches/kfreebsd/tools_llvm-shlib_CMakeLists.txt.diff b/debian/patches/kfreebsd/tools_llvm-shlib_CMakeLists.txt.diff
index 7f1a1556..e5000645 100644
--- a/debian/patches/kfreebsd/tools_llvm-shlib_CMakeLists.txt.diff
+++ b/debian/patches/kfreebsd/tools_llvm-shlib_CMakeLists.txt.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_9~svn353038/tools/llvm-shlib/CMakeLists.txt
+Index: llvm-toolchain-snapshot_10~svn370025/tools/llvm-shlib/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_9~svn353038.orig/tools/llvm-shlib/CMakeLists.txt
-+++ llvm-toolchain-snapshot_9~svn353038/tools/llvm-shlib/CMakeLists.txt
-@@ -46,6 +46,7 @@ if(LLVM_BUILD_LLVM_DYLIB)
+--- llvm-toolchain-snapshot_10~svn370025.orig/tools/llvm-shlib/CMakeLists.txt
++++ llvm-toolchain-snapshot_10~svn370025/tools/llvm-shlib/CMakeLists.txt
+@@ -49,6 +49,7 @@ if(LLVM_BUILD_LLVM_DYLIB)
    list(REMOVE_DUPLICATES LIB_NAMES)
    if(("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") OR (MINGW) OR (HAIKU)
       OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD")
diff --git a/debian/patches/libcxx/libcxx-silent-failure-ppc64el.diff b/debian/patches/libcxx/libcxx-silent-failure-ppc64el.diff
index 3a84f1ad..02730664 100644
--- a/debian/patches/libcxx/libcxx-silent-failure-ppc64el.diff
+++ b/debian/patches/libcxx/libcxx-silent-failure-ppc64el.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_7~svn337372/libcxx/test/libcxx/atomics/atomics.align/align.pass.sh.cpp
+Index: llvm-toolchain-snapshot_10~svn370025/libcxx/test/libcxx/atomics/atomics.align/align.pass.sh.cpp
 ===================================================================
---- llvm-toolchain-snapshot_7~svn337372.orig/libcxx/test/libcxx/atomics/atomics.align/align.pass.sh.cpp
-+++ llvm-toolchain-snapshot_7~svn337372/libcxx/test/libcxx/atomics/atomics.align/align.pass.sh.cpp
-@@ -14,7 +14,7 @@
+--- llvm-toolchain-snapshot_10~svn370025.orig/libcxx/test/libcxx/atomics/atomics.align/align.pass.sh.cpp
++++ llvm-toolchain-snapshot_10~svn370025/libcxx/test/libcxx/atomics/atomics.align/align.pass.sh.cpp
+@@ -13,7 +13,7 @@
  //
  // GCC currently fails because it needs -fabi-version=6 to fix mangling of
  // std::atomic when used with __attribute__((vector(X))).
diff --git a/debian/patches/libcxx/libcxx-silent-test-libcxx.diff b/debian/patches/libcxx/libcxx-silent-test-libcxx.diff
index c272b943..6f189296 100644
--- a/debian/patches/libcxx/libcxx-silent-test-libcxx.diff
+++ b/debian/patches/libcxx/libcxx-silent-test-libcxx.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp
+Index: llvm-toolchain-snapshot_10~svn370025/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp
 ===================================================================
---- llvm-toolchain-snapshot_7~svn337372.orig/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp
-+++ llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp
-@@ -12,6 +12,8 @@
+--- llvm-toolchain-snapshot_10~svn370025.orig/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp
++++ llvm-toolchain-snapshot_10~svn370025/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp
+@@ -11,6 +11,8 @@
  // template<class RealType, size_t bits, class URNG>
  //     RealType generate_canonical(URNG& g);
  
@@ -11,11 +11,11 @@ Index: llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/numerics/rand/rand.ut
  #include <random>
  #include <cassert>
  
-Index: llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/re/re.traits/isctype.pass.cpp
+Index: llvm-toolchain-snapshot_10~svn370025/libcxx/test/std/re/re.traits/isctype.pass.cpp
 ===================================================================
---- llvm-toolchain-snapshot_7~svn337372.orig/libcxx/test/std/re/re.traits/isctype.pass.cpp
-+++ llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/re/re.traits/isctype.pass.cpp
-@@ -16,6 +16,7 @@
+--- llvm-toolchain-snapshot_10~svn370025.orig/libcxx/test/std/re/re.traits/isctype.pass.cpp
++++ llvm-toolchain-snapshot_10~svn370025/libcxx/test/std/re/re.traits/isctype.pass.cpp
+@@ -15,6 +15,7 @@
  // TODO(EricWF): This test takes 40+ minutes to build with Clang 3.8 under ASAN or MSAN.
  // UNSUPPORTED: asan, msan
  
@@ -23,11 +23,11 @@ Index: llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/re/re.traits/isctype.
  
  #include <regex>
  #include <cassert>
-Index: llvm-toolchain-snapshot_7~svn337372/libcxxabi/test/catch_multi_level_pointer.pass.cpp
+Index: llvm-toolchain-snapshot_10~svn370025/libcxxabi/test/catch_multi_level_pointer.pass.cpp
 ===================================================================
---- llvm-toolchain-snapshot_7~svn337372.orig/libcxxabi/test/catch_multi_level_pointer.pass.cpp
-+++ llvm-toolchain-snapshot_7~svn337372/libcxxabi/test/catch_multi_level_pointer.pass.cpp
-@@ -9,6 +9,8 @@
+--- llvm-toolchain-snapshot_10~svn370025.orig/libcxxabi/test/catch_multi_level_pointer.pass.cpp
++++ llvm-toolchain-snapshot_10~svn370025/libcxxabi/test/catch_multi_level_pointer.pass.cpp
+@@ -8,6 +8,8 @@
  
  // UNSUPPORTED: libcxxabi-no-exceptions
  
@@ -36,11 +36,11 @@ Index: llvm-toolchain-snapshot_7~svn337372/libcxxabi/test/catch_multi_level_poin
  #include <cassert>
  #include <cstdlib>
  #include <iostream>
-Index: llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp
+Index: llvm-toolchain-snapshot_10~svn370025/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp
 ===================================================================
---- llvm-toolchain-snapshot_7~svn337372.orig/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp
-+++ llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp
-@@ -16,6 +16,8 @@
+--- llvm-toolchain-snapshot_10~svn370025.orig/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp
++++ llvm-toolchain-snapshot_10~svn370025/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp
+@@ -15,6 +15,8 @@
  
  // template <class T, class... Args> void construct(T* p, Args&&... args);
  
diff --git a/debian/patches/libcxx/libcxx-test-atomics-set-compare-exchange-to-be-expected-fails-on-arm.patch b/debian/patches/libcxx/libcxx-test-atomics-set-compare-exchange-to-be-expected-fails-on-arm.patch
index af434574..314452df 100644
--- a/debian/patches/libcxx/libcxx-test-atomics-set-compare-exchange-to-be-expected-fails-on-arm.patch
+++ b/debian/patches/libcxx/libcxx-test-atomics-set-compare-exchange-to-be-expected-fails-on-arm.patch
@@ -8,11 +8,11 @@ libcxx tests default to -O0 compilation so these test need to be marked failing
 on arm to allow installing packages. Use cases is so borderline failure that it
 shouldn't prevent building the package. (64bit atomics in 32bit mode)
 
-Index: llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong.pass.cpp
+Index: llvm-toolchain-snapshot_10~svn370025/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong.pass.cpp
 ===================================================================
---- llvm-toolchain-snapshot_7~svn337372.orig/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong.pass.cpp
-+++ llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong.pass.cpp
-@@ -8,6 +8,7 @@
+--- llvm-toolchain-snapshot_10~svn370025.orig/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong.pass.cpp
++++ llvm-toolchain-snapshot_10~svn370025/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong.pass.cpp
+@@ -7,6 +7,7 @@
  //===----------------------------------------------------------------------===//
  //
  // UNSUPPORTED: libcpp-has-no-threads
@@ -20,11 +20,11 @@ Index: llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/atomics/atomics.types
  //  ... assertion fails line 34
  
  // <atomic>
-Index: llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong_explicit.pass.cpp
+Index: llvm-toolchain-snapshot_10~svn370025/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong_explicit.pass.cpp
 ===================================================================
---- llvm-toolchain-snapshot_7~svn337372.orig/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong_explicit.pass.cpp
-+++ llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong_explicit.pass.cpp
-@@ -8,6 +8,7 @@
+--- llvm-toolchain-snapshot_10~svn370025.orig/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong_explicit.pass.cpp
++++ llvm-toolchain-snapshot_10~svn370025/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong_explicit.pass.cpp
+@@ -7,6 +7,7 @@
  //===----------------------------------------------------------------------===//
  //
  // UNSUPPORTED: libcpp-has-no-threads
@@ -32,11 +32,11 @@ Index: llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/atomics/atomics.types
  //  ... assertion fails line 38
  
  // <atomic>
-Index: llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak.pass.cpp
+Index: llvm-toolchain-snapshot_10~svn370025/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak.pass.cpp
 ===================================================================
---- llvm-toolchain-snapshot_7~svn337372.orig/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak.pass.cpp
-+++ llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak.pass.cpp
-@@ -8,6 +8,7 @@
+--- llvm-toolchain-snapshot_10~svn370025.orig/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak.pass.cpp
++++ llvm-toolchain-snapshot_10~svn370025/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak.pass.cpp
+@@ -7,6 +7,7 @@
  //===----------------------------------------------------------------------===//
  //
  // UNSUPPORTED: libcpp-has-no-threads
@@ -44,11 +44,11 @@ Index: llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/atomics/atomics.types
  //  ... assertion fails line 34
  
  // <atomic>
-Index: llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak_explicit.pass.cpp
+Index: llvm-toolchain-snapshot_10~svn370025/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak_explicit.pass.cpp
 ===================================================================
---- llvm-toolchain-snapshot_7~svn337372.orig/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak_explicit.pass.cpp
-+++ llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak_explicit.pass.cpp
-@@ -8,6 +8,7 @@
+--- llvm-toolchain-snapshot_10~svn370025.orig/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak_explicit.pass.cpp
++++ llvm-toolchain-snapshot_10~svn370025/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak_explicit.pass.cpp
+@@ -7,6 +7,7 @@
  //===----------------------------------------------------------------------===//
  //
  // UNSUPPORTED: libcpp-has-no-threads
diff --git a/debian/patches/libcxx/libcxx-test-fix-lockfree-test-for-i386.patch b/debian/patches/libcxx/libcxx-test-fix-lockfree-test-for-i386.patch
index 631b554b..d3836663 100644
--- a/debian/patches/libcxx/libcxx-test-fix-lockfree-test-for-i386.patch
+++ b/debian/patches/libcxx/libcxx-test-fix-lockfree-test-for-i386.patch
@@ -10,11 +10,11 @@ To set instruction support one can check __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 defi
 
 Bug: https://llvm.org/bugs/show_bug.cgi?id=19355
 
-Index: llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp
+Index: llvm-toolchain-snapshot_10~svn370025/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp
 ===================================================================
---- llvm-toolchain-snapshot_7~svn337372.orig/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp
-+++ llvm-toolchain-snapshot_7~svn337372/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp
-@@ -20,6 +20,14 @@
+--- llvm-toolchain-snapshot_10~svn370025.orig/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp
++++ llvm-toolchain-snapshot_10~svn370025/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp
+@@ -21,6 +21,14 @@
  # error Feature test macro missing.
  #endif
  
diff --git a/debian/patches/libcxx/libcxxabi-test-don-t-fail-extended-long-double.patch b/debian/patches/libcxx/libcxxabi-test-don-t-fail-extended-long-double.patch
index 1b5b7230..8ef43e6d 100644
--- a/debian/patches/libcxx/libcxxabi-test-don-t-fail-extended-long-double.patch
+++ b/debian/patches/libcxx/libcxxabi-test-don-t-fail-extended-long-double.patch
@@ -2,11 +2,11 @@ Powerpc has extended double that doesn't match x86 coding. Power format would
 need special tests to verify correctness but for now it is enough to prevent
 incorrect test from running.
 
-Index: llvm-toolchain-snapshot_7~svn337372/libcxxabi/test/test_demangle.pass.cpp
+Index: llvm-toolchain-snapshot_10~svn370025/libcxxabi/test/test_demangle.pass.cpp
 ===================================================================
---- llvm-toolchain-snapshot_7~svn337372.orig/libcxxabi/test/test_demangle.pass.cpp
-+++ llvm-toolchain-snapshot_7~svn337372svn337372/libcxxabi/test/test_demangle.pass.cpp
-@@ -29648,7 +29648,7 @@ const char* invalid_cases[] =
+--- llvm-toolchain-snapshot_10~svn370025.orig/libcxxabi/test/test_demangle.pass.cpp
++++ llvm-toolchain-snapshot_10~svn370025/libcxxabi/test/test_demangle.pass.cpp
+@@ -29817,7 +29817,7 @@ const char* invalid_cases[] =
      "NSoERj5E=Y1[uM:ga",
      "Aon_PmKVPDk7?fg4XP5smMUL6;<WsI_mgbf23cCgsHbT<l8EE\0uVRkNOoXDrgdA4[8IU>Vl<>IL8ayHpiVDDDXTY;^o9;i",
      "_ZNSt16allocator_traitsISaIN4llvm3sys2fs18directory_iteratorEEE9constructIS3_IS3_EEEDTcl12_S_constructfp_fp0_spcl7forwardIT0_Efp1_EEERS4_PT_DpOS7_",
diff --git a/debian/patches/mips-fpxx-enable.diff b/debian/patches/mips-fpxx-enable.diff
index 771b9058..95759f29 100644
--- a/debian/patches/mips-fpxx-enable.diff
+++ b/debian/patches/mips-fpxx-enable.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_9~svn351647/clang/lib/Driver/ToolChains/Arch/Mips.cpp
+Index: llvm-toolchain-snapshot_10~svn370025/clang/lib/Driver/ToolChains/Arch/Mips.cpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn351647.orig/clang/lib/Driver/ToolChains/Arch/Mips.cpp
-+++ llvm-toolchain-snapshot_9~svn351647/clang/lib/Driver/ToolChains/Arch/Mips.cpp
-@@ -456,10 +456,10 @@ bool mips::isFP64ADefault(const llvm::Tr
+--- llvm-toolchain-snapshot_10~svn370025.orig/clang/lib/Driver/ToolChains/Arch/Mips.cpp
++++ llvm-toolchain-snapshot_10~svn370025/clang/lib/Driver/ToolChains/Arch/Mips.cpp
+@@ -455,10 +455,10 @@ bool mips::isFP64ADefault(const llvm::Tr
  
  bool mips::isFPXXDefault(const llvm::Triple &Triple, StringRef CPUName,
                           StringRef ABIName, mips::FloatABI FloatABI) {
diff --git a/debian/patches/openmp-soname.diff b/debian/patches/openmp-soname.diff
index ed6bbdc6..408eef96 100644
--- a/debian/patches/openmp-soname.diff
+++ b/debian/patches/openmp-soname.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_8~svn342269/openmp/runtime/CMakeLists.txt
+Index: llvm-toolchain-snapshot_10~svn370025/openmp/runtime/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_8~svn342269.orig/openmp/runtime/CMakeLists.txt
-+++ llvm-toolchain-snapshot_8~svn342269/openmp/runtime/CMakeLists.txt
-@@ -355,7 +355,8 @@ else()
+--- llvm-toolchain-snapshot_10~svn370025.orig/openmp/runtime/CMakeLists.txt
++++ llvm-toolchain-snapshot_10~svn370025/openmp/runtime/CMakeLists.txt
+@@ -341,7 +341,8 @@ else()
    set(LIBOMP_INSTALL_KIND ARCHIVE)
  endif()
  
diff --git a/debian/patches/openmp/bootstrap-with-openmp-version-export-missing.diff b/debian/patches/openmp/bootstrap-with-openmp-version-export-missing.diff
index d2473ee8..ff97f492 100644
--- a/debian/patches/openmp/bootstrap-with-openmp-version-export-missing.diff
+++ b/debian/patches/openmp/bootstrap-with-openmp-version-export-missing.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_9~svn351647/openmp/runtime/src/CMakeLists.txt
+Index: llvm-toolchain-snapshot_10~svn370025/openmp/runtime/src/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_9~svn351647.orig/openmp/runtime/src/CMakeLists.txt
-+++ llvm-toolchain-snapshot_9~svn351647/openmp/runtime/src/CMakeLists.txt
-@@ -174,7 +174,8 @@ endif()
+--- llvm-toolchain-snapshot_10~svn370025.orig/openmp/runtime/src/CMakeLists.txt
++++ llvm-toolchain-snapshot_10~svn370025/openmp/runtime/src/CMakeLists.txt
+@@ -167,7 +167,8 @@ endif()
  
  # Linking command will include libraries in LIBOMP_CONFIGURED_LIBFLAGS
  libomp_get_libflags(LIBOMP_CONFIGURED_LIBFLAGS)
diff --git a/debian/patches/openmp/openmp-check-execstack.diff b/debian/patches/openmp/openmp-check-execstack.diff
index 042c400f..935e6d09 100644
--- a/debian/patches/openmp/openmp-check-execstack.diff
+++ b/debian/patches/openmp/openmp-check-execstack.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_9~svn351647/openmp/runtime/tools/check-execstack.pl
+Index: llvm-toolchain-snapshot_10~svn370025/openmp/runtime/tools/check-execstack.pl
 ===================================================================
---- llvm-toolchain-snapshot_9~svn351647.orig/openmp/runtime/tools/check-execstack.pl
-+++ llvm-toolchain-snapshot_9~svn351647/openmp/runtime/tools/check-execstack.pl
-@@ -46,7 +46,8 @@ sub execstack($) {
+--- llvm-toolchain-snapshot_10~svn370025.orig/openmp/runtime/tools/check-execstack.pl
++++ llvm-toolchain-snapshot_10~svn370025/openmp/runtime/tools/check-execstack.pl
+@@ -45,7 +45,8 @@ sub execstack($) {
      #    GNU_STACK      0x000000 0x00000000 0x00000000 0x00000 0x00000 RWE 0x4
      # Linux* OS Intel(R) 64:
      #    GNU_STACK      0x000000 0x0000000000000000 0x0000000000000000 0x000000 0x000000 RWE 0x8
diff --git a/debian/patches/openmp/openmp-mips-affinity.patch b/debian/patches/openmp/openmp-mips-affinity.patch
index 99d5c02d..b8785873 100644
--- a/debian/patches/openmp/openmp-mips-affinity.patch
+++ b/debian/patches/openmp/openmp-mips-affinity.patch
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_9~svn351647/openmp/runtime/src/kmp_affinity.h
+Index: llvm-toolchain-snapshot_10~svn370025/openmp/runtime/src/kmp_affinity.h
 ===================================================================
---- llvm-toolchain-snapshot_9~svn351647.orig/openmp/runtime/src/kmp_affinity.h
-+++ llvm-toolchain-snapshot_9~svn351647/openmp/runtime/src/kmp_affinity.h
-@@ -211,28 +211,29 @@ public:
+--- llvm-toolchain-snapshot_10~svn370025.orig/openmp/runtime/src/kmp_affinity.h
++++ llvm-toolchain-snapshot_10~svn370025/openmp/runtime/src/kmp_affinity.h
+@@ -210,28 +210,29 @@ public:
  #elif __NR_sched_getaffinity != 223
  #error Wrong code for getaffinity system call.
  #endif /* __NR_sched_getaffinity */
diff --git a/debian/patches/python-clangpath.diff b/debian/patches/python-clangpath.diff
index c8843352..3f8a088d 100644
--- a/debian/patches/python-clangpath.diff
+++ b/debian/patches/python-clangpath.diff
@@ -2,11 +2,11 @@
  clang/bindings/python/clang/cindex.py |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: llvm-toolchain-snapshot_10~svn3422610/clang/bindings/python/clang/cindex.py
+Index: llvm-toolchain-snapshot_10~svn370025/clang/bindings/python/clang/cindex.py
 ===================================================================
---- llvm-toolchain-snapshot_10~svn3422610.orig/clang/bindings/python/clang/cindex.py
-+++ llvm-toolchain-snapshot_10~svn3422610/clang/bindings/python/clang/cindex.py
-@@ -4144,7 +4144,7 @@ class Config:
+--- llvm-toolchain-snapshot_10~svn370025.orig/clang/bindings/python/clang/cindex.py
++++ llvm-toolchain-snapshot_10~svn370025/clang/bindings/python/clang/cindex.py
+@@ -4160,7 +4160,7 @@ class Config(object):
          elif name == 'Windows':
              file = 'libclang.dll'
          else:
diff --git a/debian/patches/remove-apple-clang-manpage.diff b/debian/patches/remove-apple-clang-manpage.diff
index 360d1fd5..ddc94360 100644
--- a/debian/patches/remove-apple-clang-manpage.diff
+++ b/debian/patches/remove-apple-clang-manpage.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_9~svn364042/clang/docs/CommandGuide/clang.rst
+Index: llvm-toolchain-snapshot_10~svn370025/clang/docs/CommandGuide/clang.rst
 ===================================================================
---- llvm-toolchain-snapshot_9~svn364042.orig/clang/docs/CommandGuide/clang.rst
-+++ llvm-toolchain-snapshot_9~svn364042/clang/docs/CommandGuide/clang.rst
+--- llvm-toolchain-snapshot_10~svn370025.orig/clang/docs/CommandGuide/clang.rst
++++ llvm-toolchain-snapshot_10~svn370025/clang/docs/CommandGuide/clang.rst
 @@ -310,20 +310,10 @@ Clang fully supports cross compilation a
  Depending on how your version of Clang is configured, it may have support for a
  number of cross compilers, or may only support a native target.
@@ -24,7 +24,7 @@ Index: llvm-toolchain-snapshot_9~svn364042/clang/docs/CommandGuide/clang.rst
  .. option:: --print-supported-cpus
  
    Print out a list of supported processors for the given target (specified
-@@ -622,11 +612,6 @@ ENVIRONMENT
+@@ -626,11 +616,6 @@ ENVIRONMENT
    These environment variables specify additional paths, as for :envvar:`CPATH`, which are
    only used when processing the appropriate language.
  
diff --git a/debian/patches/scan-build-clang-path.diff b/debian/patches/scan-build-clang-path.diff
index 78fa86fb..52220501 100644
--- a/debian/patches/scan-build-clang-path.diff
+++ b/debian/patches/scan-build-clang-path.diff
@@ -2,11 +2,11 @@
  clang/tools/scan-build/bin/scan-build |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: llvm-toolchain-snapshot_10~svn356328/clang/tools/scan-build/bin/scan-build
+Index: llvm-toolchain-snapshot_10~svn370025/clang/tools/scan-build/bin/scan-build
 ===================================================================
---- llvm-toolchain-snapshot_10~svn356328.orig/clang/tools/scan-build/bin/scan-build
-+++ llvm-toolchain-snapshot_10~svn356328/clang/tools/scan-build/bin/scan-build
-@@ -1477,7 +1477,7 @@ sub FindClang {
+--- llvm-toolchain-snapshot_10~svn370025.orig/clang/tools/scan-build/bin/scan-build
++++ llvm-toolchain-snapshot_10~svn370025/clang/tools/scan-build/bin/scan-build
+@@ -1478,7 +1478,7 @@ sub FindClang {
    if (!defined $Options{AnalyzerDiscoveryMethod}) {
      $Clang = Cwd::realpath("$RealBin/bin/clang") if (-f "$RealBin/bin/clang");
      if (!defined $Clang || ! -x $Clang) {
diff --git a/debian/patches/scan-view-fix-path.diff b/debian/patches/scan-view-fix-path.diff
index a37e6887..13b12671 100644
--- a/debian/patches/scan-view-fix-path.diff
+++ b/debian/patches/scan-view-fix-path.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_5.0~svn297449/clang/tools/scan-view/bin/scan-view
+Index: llvm-toolchain-snapshot_10~svn370025/clang/tools/scan-view/bin/scan-view
 ===================================================================
---- llvm-toolchain-snapshot_5.0~svn297449.orig/clang/tools/scan-view/bin/scan-view
-+++ llvm-toolchain-snapshot_5.0~svn297449/clang/tools/scan-view/bin/scan-view
-@@ -61,7 +61,7 @@ def start_browser(port, options):
+--- llvm-toolchain-snapshot_10~svn370025.orig/clang/tools/scan-view/bin/scan-view
++++ llvm-toolchain-snapshot_10~svn370025/clang/tools/scan-view/bin/scan-view
+@@ -65,7 +65,7 @@ def start_browser(port, options):
  
  def run(port, options, root):
      # Prefer to look relative to the installed binary
diff --git a/debian/patches/symbolizer-path.diff b/debian/patches/symbolizer-path.diff
index 9734e583..d041882f 100644
--- a/debian/patches/symbolizer-path.diff
+++ b/debian/patches/symbolizer-path.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_10~svn367724/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
+Index: llvm-toolchain-snapshot_10~svn370025/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
 ===================================================================
---- llvm-toolchain-snapshot_10~svn367724.orig/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
-+++ llvm-toolchain-snapshot_10~svn367724/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
+--- llvm-toolchain-snapshot_10~svn370025.orig/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
++++ llvm-toolchain-snapshot_10~svn370025/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
 @@ -25,6 +25,10 @@
  #include "sanitizer_symbolizer_internal.h"
  #include "sanitizer_symbolizer_libbacktrace.h"
@@ -13,7 +13,7 @@ Index: llvm-toolchain-snapshot_10~svn367724/compiler-rt/lib/sanitizer_common/san
  
  #include <dlfcn.h>   // for dlsym()
  #include <errno.h>
-@@ -480,7 +484,7 @@ static SymbolizerTool *ChooseExternalSym
+@@ -428,7 +432,7 @@ static SymbolizerTool *ChooseExternalSym
      return new(*allocator) AtosSymbolizer(found_path, allocator);
    }
  #endif  // SANITIZER_MAC
diff --git a/debian/patches/unwind-chain-inclusion.diff b/debian/patches/unwind-chain-inclusion.diff
index 5e449701..b856dffa 100644
--- a/debian/patches/unwind-chain-inclusion.diff
+++ b/debian/patches/unwind-chain-inclusion.diff
@@ -8,11 +8,11 @@
  clang/lib/Headers/unwind.h |    9 +++++----
  1 file changed, 5 insertions(+), 4 deletions(-)
 
-Index: llvm-toolchain-snapshot_8~svn342269/clang/lib/Headers/unwind.h
+Index: llvm-toolchain-snapshot_10~svn370025/clang/lib/Headers/unwind.h
 ===================================================================
---- llvm-toolchain-snapshot_8~svn342269.orig/clang/lib/Headers/unwind.h
-+++ llvm-toolchain-snapshot_8~svn342269/clang/lib/Headers/unwind.h
-@@ -23,9 +23,6 @@
+--- llvm-toolchain-snapshot_10~svn370025.orig/clang/lib/Headers/unwind.h
++++ llvm-toolchain-snapshot_10~svn370025/clang/lib/Headers/unwind.h
+@@ -9,9 +9,6 @@
  
  /* See "Data Definitions for libgcc_s" in the Linux Standard Base.*/
  
@@ -22,7 +22,7 @@ Index: llvm-toolchain-snapshot_8~svn342269/clang/lib/Headers/unwind.h
  #if defined(__APPLE__) && __has_include_next(<unwind.h>)
  /* Darwin (from 11.x on) provide an unwind.h. If that's available,
   * use it. libunwind wraps some of its definitions in #ifdef _GNU_SOURCE,
-@@ -53,6 +50,9 @@
+@@ -39,6 +36,9 @@
  # endif
  #else
  
@@ -32,7 +32,7 @@ Index: llvm-toolchain-snapshot_8~svn342269/clang/lib/Headers/unwind.h
  #include <stdint.h>
  
  #ifdef __cplusplus
-@@ -336,6 +336,7 @@ _Unwind_Ptr _Unwind_GetTextRelBase(struc
+@@ -322,6 +322,7 @@ _Unwind_Ptr _Unwind_GetTextRelBase(struc
  }
  #endif
  
diff --git a/debian/patches/workaround-bug-42994-use-linker.diff b/debian/patches/workaround-bug-42994-use-linker.diff
index 15aad5ad..4fa750b5 100644
--- a/debian/patches/workaround-bug-42994-use-linker.diff
+++ b/debian/patches/workaround-bug-42994-use-linker.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot-10~svn369645/compiler-rt/lib/hwasan/CMakeLists.txt
+Index: llvm-toolchain-snapshot_10~svn370025/compiler-rt/lib/hwasan/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot-10~svn369645.orig/compiler-rt/lib/hwasan/CMakeLists.txt
-+++ llvm-toolchain-snapshot-10~svn369645/compiler-rt/lib/hwasan/CMakeLists.txt
-@@ -40,9 +40,9 @@ append_list_if(COMPILER_RT_HWASAN_WITH_I
+--- llvm-toolchain-snapshot_10~svn370025.orig/compiler-rt/lib/hwasan/CMakeLists.txt
++++ llvm-toolchain-snapshot_10~svn370025/compiler-rt/lib/hwasan/CMakeLists.txt
+@@ -41,9 +41,9 @@ append_list_if(COMPILER_RT_HWASAN_WITH_I
  
  set(HWASAN_RTL_CFLAGS ${SANITIZER_COMMON_CFLAGS})
  append_rtti_flag(OFF HWASAN_RTL_CFLAGS)
@@ -14,7 +14,7 @@ Index: llvm-toolchain-snapshot-10~svn369645/compiler-rt/lib/hwasan/CMakeLists.tx
  
  set(HWASAN_DYNAMIC_LINK_FLAGS ${SANITIZER_COMMON_LINK_FLAGS})
  
-@@ -54,7 +54,7 @@ if(ANDROID)
+@@ -55,7 +55,7 @@ if(ANDROID)
    endif()
  endif()
  
@@ -23,7 +23,7 @@ Index: llvm-toolchain-snapshot-10~svn369645/compiler-rt/lib/hwasan/CMakeLists.tx
  append_list_if(COMPILER_RT_HAS_FTLS_MODEL_INITIAL_EXEC
    -ftls-model=initial-exec HWASAN_DYNAMIC_CFLAGS)
  append_list_if(MSVC /DEBUG HWASAN_DYNAMIC_LINK_FLAGS)
-@@ -129,7 +129,7 @@ foreach(arch ${HWASAN_SUPPORTED_ARCH})
+@@ -130,7 +130,7 @@ foreach(arch ${HWASAN_SUPPORTED_ARCH})
                                    LIBS clang_rt.hwasan-${arch} clang_rt.hwasan_cxx-${arch}
                                    EXTRA hwasan.syms.extra)
      set(VERSION_SCRIPT_FLAG