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 3e2ba820..9f45b455 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
  llvm/cmake/modules/CMakeLists.txt | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-Index: llvm-toolchain-snapshot_8~svn342269/llvm/cmake/modules/CMakeLists.txt
+Index: llvm-toolchain-9_9.0.0/llvm/cmake/modules/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_8~svn342269.orig/llvm/cmake/modules/CMakeLists.txt
-+++ llvm-toolchain-snapshot_8~svn342269/llvm/cmake/modules/CMakeLists.txt
-@@ -82,10 +82,10 @@ file(COPY .
+--- llvm-toolchain-9_9.0.0.orig/llvm/cmake/modules/CMakeLists.txt
++++ llvm-toolchain-9_9.0.0/llvm/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/0001-tools-clang-cmake-resolve-symlinks-in-ClangConfig.cmake.patch b/debian/patches/0001-tools-clang-cmake-resolve-symlinks-in-ClangConfig.cmake.patch
index dca84e36..8847a2ff 100644
--- a/debian/patches/0001-tools-clang-cmake-resolve-symlinks-in-ClangConfig.cmake.patch
+++ b/debian/patches/0001-tools-clang-cmake-resolve-symlinks-in-ClangConfig.cmake.patch
@@ -12,10 +12,10 @@ Partially addresses PR37128
  cmake/modules/CMakeLists.txt | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt
-index be6d1d7257..bcb61f6cc8 100644
---- a/clang/cmake/modules/CMakeLists.txt
-+++ b/clang/cmake/modules/CMakeLists.txt
+Index: llvm-toolchain-9_9.0.0/clang/cmake/modules/CMakeLists.txt
+===================================================================
+--- llvm-toolchain-9_9.0.0.orig/clang/cmake/modules/CMakeLists.txt
++++ llvm-toolchain-9_9.0.0/clang/cmake/modules/CMakeLists.txt
 @@ -30,10 +30,10 @@ set(CLANG_CONFIG_EXPORTS_FILE)
  # Generate ClangConfig.cmake for the install tree.
  set(CLANG_CONFIG_CODE "
@@ -29,6 +29,3 @@ index be6d1d7257..bcb61f6cc8 100644
  foreach(p ${_count})
    set(CLANG_CONFIG_CODE "${CLANG_CONFIG_CODE}
  get_filename_component(CLANG_INSTALL_PREFIX \"\${CLANG_INSTALL_PREFIX}\" PATH)")
--- 
-2.17.0
-
diff --git a/debian/patches/0003-Debian-version-info-and-bugreport.patch b/debian/patches/0003-Debian-version-info-and-bugreport.patch
index 8af692c7..046aa68a 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/llvm/lib/Support/CommandLine.cpp
+Index: llvm-toolchain-9_9.0.0/llvm/lib/Support/CommandLine.cpp
 ===================================================================
---- llvm-toolchain-snapshot_8~svn342269.orig/llvm/lib/Support/CommandLine.cpp
-+++ llvm-toolchain-snapshot_8~svn342269/llvm/lib/Support/CommandLine.cpp
-@@ -2127,6 +2127,10 @@ public:
+--- llvm-toolchain-9_9.0.0.orig/llvm/lib/Support/CommandLine.cpp
++++ llvm-toolchain-9_9.0.0/llvm/lib/Support/CommandLine.cpp
+@@ -2378,6 +2378,10 @@ public:
      OS << " " << LLVM_VERSION_INFO;
  #endif
      OS << "\n  ";
diff --git a/debian/patches/0044-soname.diff b/debian/patches/0044-soname.diff
index 45239bc4..b9e6daaf 100644
--- a/debian/patches/0044-soname.diff
+++ b/debian/patches/0044-soname.diff
@@ -3,10 +3,10 @@
  tools/llvm-shlib/CMakeLists.txt     |    1 +
  2 files changed, 2 insertions(+), 1 deletion(-)
 
-Index: llvm-toolchain-snapshot_9~svn365902/clang/tools/libclang/CMakeLists.txt
+Index: llvm-toolchain-9_9.0.0/clang/tools/libclang/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_9~svn365902.orig/clang/tools/libclang/CMakeLists.txt
-+++ llvm-toolchain-snapshot_9~svn365902/clang/tools/libclang/CMakeLists.txt
+--- llvm-toolchain-9_9.0.0.orig/clang/tools/libclang/CMakeLists.txt
++++ llvm-toolchain-9_9.0.0/clang/tools/libclang/CMakeLists.txt
 @@ -94,7 +94,7 @@ if (UNIX AND ${CMAKE_SYSTEM_NAME} MATCHE
      remove_definitions("-D_XOPEN_SOURCE=700")
  endif()
@@ -16,10 +16,10 @@ Index: llvm-toolchain-snapshot_9~svn365902/clang/tools/libclang/CMakeLists.txt
    OUTPUT_NAME ${output_name}
    ${SOURCES}
    DEPENDS clang-resource-headers
-Index: llvm-toolchain-snapshot_9~svn365902/llvm/tools/llvm-shlib/CMakeLists.txt
+Index: llvm-toolchain-9_9.0.0/llvm/tools/llvm-shlib/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_9~svn365902.orig/llvm/tools/llvm-shlib/CMakeLists.txt
-+++ llvm-toolchain-snapshot_9~svn365902/llvm/tools/llvm-shlib/CMakeLists.txt
+--- llvm-toolchain-9_9.0.0.orig/llvm/tools/llvm-shlib/CMakeLists.txt
++++ llvm-toolchain-9_9.0.0/llvm/tools/llvm-shlib/CMakeLists.txt
 @@ -44,6 +44,8 @@ if(LLVM_BUILD_LLVM_DYLIB)
    endif()
    add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${INSTALL_WITH_TOOLCHAIN} ${SOURCES})
diff --git a/debian/patches/0048-Set-html_static_path-_static-everywhere.patch b/debian/patches/0048-Set-html_static_path-_static-everywhere.patch
index 58a0b8f2..3552852c 100644
--- a/debian/patches/0048-Set-html_static_path-_static-everywhere.patch
+++ b/debian/patches/0048-Set-html_static_path-_static-everywhere.patch
@@ -9,10 +9,10 @@ Subject: Set html_static_path = ['_static'] everywhere.
  polly/docs/conf.py             | 2 +-
  4 files changed, 4 insertions(+), 4 deletions(-)
 
-Index: llvm-toolchain-snapshot_9~svn355080/clang/docs/analyzer/conf.py
+Index: llvm-toolchain-9_9.0.0/clang/docs/analyzer/conf.py
 ===================================================================
---- llvm-toolchain-snapshot_9~svn355080.orig/clang/docs/analyzer/conf.py
-+++ llvm-toolchain-snapshot_9~svn355080/clang/docs/analyzer/conf.py
+--- llvm-toolchain-9_9.0.0.orig/clang/docs/analyzer/conf.py
++++ llvm-toolchain-9_9.0.0/clang/docs/analyzer/conf.py
 @@ -121,7 +121,7 @@ html_theme = 'haiku'
  # Add any paths that contain custom static files (such as style sheets) here,
  # relative to this directory. They are copied after the builtin static files,
@@ -22,10 +22,10 @@ Index: llvm-toolchain-snapshot_9~svn355080/clang/docs/analyzer/conf.py
  
  # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
  # using the given strftime format.
-Index: llvm-toolchain-snapshot_9~svn355080/clang/docs/conf.py
+Index: llvm-toolchain-9_9.0.0/clang/docs/conf.py
 ===================================================================
---- llvm-toolchain-snapshot_9~svn355080.orig/clang/docs/conf.py
-+++ llvm-toolchain-snapshot_9~svn355080/clang/docs/conf.py
+--- llvm-toolchain-9_9.0.0.orig/clang/docs/conf.py
++++ llvm-toolchain-9_9.0.0/clang/docs/conf.py
 @@ -122,7 +122,7 @@ html_theme = 'haiku'
  # Add any paths that contain custom static files (such as style sheets) here,
  # relative to this directory. They are copied after the builtin static files,
@@ -35,10 +35,10 @@ Index: llvm-toolchain-snapshot_9~svn355080/clang/docs/conf.py
  
  # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
  # using the given strftime format.
-Index: llvm-toolchain-snapshot_9~svn355080/polly/docs/conf.py
+Index: llvm-toolchain-9_9.0.0/polly/docs/conf.py
 ===================================================================
---- llvm-toolchain-snapshot_9~svn355080.orig/polly/docs/conf.py
-+++ llvm-toolchain-snapshot_9~svn355080/polly/docs/conf.py
+--- llvm-toolchain-9_9.0.0.orig/polly/docs/conf.py
++++ llvm-toolchain-9_9.0.0/polly/docs/conf.py
 @@ -127,7 +127,7 @@ except ImportError:
  # Add any paths that contain custom static files (such as style sheets) here,
  # relative to this directory. They are copied after the builtin static files,
diff --git a/debian/patches/0049-Use-Debian-provided-MathJax-everywhere.patch b/debian/patches/0049-Use-Debian-provided-MathJax-everywhere.patch
index 96102b76..b899ce42 100644
--- a/debian/patches/0049-Use-Debian-provided-MathJax-everywhere.patch
+++ b/debian/patches/0049-Use-Debian-provided-MathJax-everywhere.patch
@@ -13,10 +13,10 @@ Subject: Use Debian-provided MathJax everywhere.
  polly/docs/doxygen.cfg.in             | 2 +-
  8 files changed, 14 insertions(+), 5 deletions(-)
 
-Index: llvm-toolchain-snapshot_9~svn363555/clang-tools-extra/docs/conf.py
+Index: llvm-toolchain-9_9.0.0/clang-tools-extra/docs/conf.py
 ===================================================================
---- llvm-toolchain-snapshot_9~svn363555.orig/clang-tools-extra/docs/conf.py
-+++ llvm-toolchain-snapshot_9~svn363555/clang-tools-extra/docs/conf.py
+--- llvm-toolchain-9_9.0.0.orig/clang-tools-extra/docs/conf.py
++++ llvm-toolchain-9_9.0.0/clang-tools-extra/docs/conf.py
 @@ -123,6 +123,9 @@ html_theme = 'haiku'
  # so a file named "default.css" will overwrite the builtin "default.css".
  html_static_path = ['_static']
@@ -27,10 +27,10 @@ Index: llvm-toolchain-snapshot_9~svn363555/clang-tools-extra/docs/conf.py
  # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
  # using the given strftime format.
  #html_last_updated_fmt = '%b %d, %Y'
-Index: llvm-toolchain-snapshot_9~svn363555/clang-tools-extra/docs/doxygen.cfg.in
+Index: llvm-toolchain-9_9.0.0/clang-tools-extra/docs/doxygen.cfg.in
 ===================================================================
---- llvm-toolchain-snapshot_9~svn363555.orig/clang-tools-extra/docs/doxygen.cfg.in
-+++ llvm-toolchain-snapshot_9~svn363555/clang-tools-extra/docs/doxygen.cfg.in
+--- llvm-toolchain-9_9.0.0.orig/clang-tools-extra/docs/doxygen.cfg.in
++++ llvm-toolchain-9_9.0.0/clang-tools-extra/docs/doxygen.cfg.in
 @@ -1443,7 +1443,7 @@ MATHJAX_FORMAT         = HTML-CSS
  # The default value is: http://cdn.mathjax.org/mathjax/latest.
  # This tag requires that the tag USE_MATHJAX is set to YES.
@@ -40,10 +40,10 @@ Index: llvm-toolchain-snapshot_9~svn363555/clang-tools-extra/docs/doxygen.cfg.in
  
  # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
  # extension names that should be enabled during MathJax rendering. For example
-Index: llvm-toolchain-snapshot_9~svn363555/clang/docs/analyzer/conf.py
+Index: llvm-toolchain-9_9.0.0/clang/docs/analyzer/conf.py
 ===================================================================
---- llvm-toolchain-snapshot_9~svn363555.orig/clang/docs/analyzer/conf.py
-+++ llvm-toolchain-snapshot_9~svn363555/clang/docs/analyzer/conf.py
+--- llvm-toolchain-9_9.0.0.orig/clang/docs/analyzer/conf.py
++++ llvm-toolchain-9_9.0.0/clang/docs/analyzer/conf.py
 @@ -123,6 +123,9 @@ html_theme = 'haiku'
  # so a file named "default.css" will overwrite the builtin "default.css".
  html_static_path = ['_static']
@@ -54,10 +54,10 @@ Index: llvm-toolchain-snapshot_9~svn363555/clang/docs/analyzer/conf.py
  # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
  # using the given strftime format.
  #html_last_updated_fmt = '%b %d, %Y'
-Index: llvm-toolchain-snapshot_9~svn363555/clang/docs/conf.py
+Index: llvm-toolchain-9_9.0.0/clang/docs/conf.py
 ===================================================================
---- llvm-toolchain-snapshot_9~svn363555.orig/clang/docs/conf.py
-+++ llvm-toolchain-snapshot_9~svn363555/clang/docs/conf.py
+--- llvm-toolchain-9_9.0.0.orig/clang/docs/conf.py
++++ llvm-toolchain-9_9.0.0/clang/docs/conf.py
 @@ -124,6 +124,9 @@ html_theme = 'haiku'
  # so a file named "default.css" will overwrite the builtin "default.css".
  html_static_path = ['_static']
@@ -68,10 +68,10 @@ Index: llvm-toolchain-snapshot_9~svn363555/clang/docs/conf.py
  # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
  # using the given strftime format.
  #html_last_updated_fmt = '%b %d, %Y'
-Index: llvm-toolchain-snapshot_9~svn363555/clang/docs/doxygen.cfg.in
+Index: llvm-toolchain-9_9.0.0/clang/docs/doxygen.cfg.in
 ===================================================================
---- llvm-toolchain-snapshot_9~svn363555.orig/clang/docs/doxygen.cfg.in
-+++ llvm-toolchain-snapshot_9~svn363555/clang/docs/doxygen.cfg.in
+--- llvm-toolchain-9_9.0.0.orig/clang/docs/doxygen.cfg.in
++++ llvm-toolchain-9_9.0.0/clang/docs/doxygen.cfg.in
 @@ -1432,7 +1432,7 @@ MATHJAX_FORMAT         = HTML-CSS
  # The default value is: http://cdn.mathjax.org/mathjax/latest.
  # This tag requires that the tag USE_MATHJAX is set to YES.
@@ -81,10 +81,10 @@ Index: llvm-toolchain-snapshot_9~svn363555/clang/docs/doxygen.cfg.in
  
  # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
  # extension names that should be enabled during MathJax rendering. For example
-Index: llvm-toolchain-snapshot_9~svn363555/llvm/docs/doxygen.cfg.in
+Index: llvm-toolchain-9_9.0.0/llvm/docs/doxygen.cfg.in
 ===================================================================
---- llvm-toolchain-snapshot_9~svn363555.orig/llvm/docs/doxygen.cfg.in
-+++ llvm-toolchain-snapshot_9~svn363555/llvm/docs/doxygen.cfg.in
+--- llvm-toolchain-9_9.0.0.orig/llvm/docs/doxygen.cfg.in
++++ llvm-toolchain-9_9.0.0/llvm/docs/doxygen.cfg.in
 @@ -1433,7 +1433,7 @@ MATHJAX_FORMAT         = HTML-CSS
  # The default value is: http://cdn.mathjax.org/mathjax/latest.
  # This tag requires that the tag USE_MATHJAX is set to YES.
@@ -94,10 +94,10 @@ Index: llvm-toolchain-snapshot_9~svn363555/llvm/docs/doxygen.cfg.in
  
  # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
  # extension names that should be enabled during MathJax rendering. For example
-Index: llvm-toolchain-snapshot_9~svn363555/polly/docs/doxygen.cfg.in
+Index: llvm-toolchain-9_9.0.0/polly/docs/doxygen.cfg.in
 ===================================================================
---- llvm-toolchain-snapshot_9~svn363555.orig/polly/docs/doxygen.cfg.in
-+++ llvm-toolchain-snapshot_9~svn363555/polly/docs/doxygen.cfg.in
+--- llvm-toolchain-9_9.0.0.orig/polly/docs/doxygen.cfg.in
++++ llvm-toolchain-9_9.0.0/polly/docs/doxygen.cfg.in
 @@ -1433,7 +1433,7 @@ MATHJAX_FORMAT         = HTML-CSS
  # The default value is: http://cdn.mathjax.org/mathjax/latest.
  # This tag requires that the tag USE_MATHJAX is set to YES.
diff --git a/debian/patches/23-strlcpy_strlcat_warning_removed.diff b/debian/patches/23-strlcpy_strlcat_warning_removed.diff
index 554ef5ea..800413e6 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-9_9.0.0/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-9_9.0.0.orig/clang/include/clang/Basic/Builtins.def
++++ llvm-toolchain-9_9.0.0/clang/include/clang/Basic/Builtins.def
+@@ -525,8 +525,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",
+@@ -992,8 +992,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-9_9.0.0/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-9_9.0.0.orig/clang/lib/AST/Decl.cpp
++++ llvm-toolchain-9_9.0.0/clang/lib/AST/Decl.cpp
+@@ -3775,13 +3775,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-9_9.0.0/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-9_9.0.0.orig/clang/lib/Sema/SemaChecking.cpp
++++ llvm-toolchain-9_9.0.0/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
+@@ -4349,9 +4349,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-9_9.0.0/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-9_9.0.0.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
++++ llvm-toolchain-9_9.0.0/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
+@@ -262,9 +262,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-9_9.0.0/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-9_9.0.0.orig/clang/test/Sema/builtins.c
++++ llvm-toolchain-9_9.0.0/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-9_9.0.0/clang/test/Sema/warn-strlcpycat-size.c
 ===================================================================
---- llvm-toolchain-snapshot_9~svn356622.orig/clang/test/Sema/warn-strlcpycat-size.c
+--- llvm-toolchain-9_9.0.0.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..ce012ff3 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-9_9.0.0/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-9_9.0.0.orig/clang/lib/Driver/ToolChains/Arch/ARM.cpp
++++ llvm-toolchain-9_9.0.0/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 0adbada8..42a6ca5d 100644
--- a/debian/patches/930008-arm.diff
+++ b/debian/patches/930008-arm.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_9~svn362869/llvm/lib/Support/Triple.cpp
+Index: llvm-toolchain-9_9.0.0/llvm/lib/Support/Triple.cpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn362869.orig/llvm/lib/Support/Triple.cpp
-+++ llvm-toolchain-snapshot_9~svn362869/llvm/lib/Support/Triple.cpp
-@@ -1644,7 +1644,7 @@ StringRef Triple::getARMCPUForArch(Strin
+--- llvm-toolchain-9_9.0.0.orig/llvm/lib/Support/Triple.cpp
++++ llvm-toolchain-9_9.0.0/llvm/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/D67877.patch b/debian/patches/D67877.patch
index 46833b1f..8e936f3f 100644
--- a/debian/patches/D67877.patch
+++ b/debian/patches/D67877.patch
@@ -1,21 +1,21 @@
 Origin: https://reviews.llvm.org/D67877
 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=941082
 
-Index: llvm-toolchain-9-9~+rc5/clang/lib/Analysis/plugins/CMakeLists.txt
+Index: llvm-toolchain-9_9.0.0/clang/lib/Analysis/plugins/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-9-9~+rc5.orig/clang/lib/Analysis/plugins/CMakeLists.txt
-+++ llvm-toolchain-9-9~+rc5/clang/lib/Analysis/plugins/CMakeLists.txt
+--- llvm-toolchain-9_9.0.0.orig/clang/lib/Analysis/plugins/CMakeLists.txt
++++ llvm-toolchain-9_9.0.0/clang/lib/Analysis/plugins/CMakeLists.txt
 @@ -1,4 +1,4 @@
 -if(CLANG_ENABLE_STATIC_ANALYZER AND LLVM_ENABLE_PLUGINS)
 +if(CLANG_ENABLE_STATIC_ANALYZER AND LLVM_ENABLE_PLUGINS AND CLANG_BUILD_EXAMPLES)
    add_subdirectory(SampleAnalyzer)
    add_subdirectory(CheckerDependencyHandling)
    add_subdirectory(CheckerOptionHandling)
-Index: llvm-toolchain-9-9~+rc5/clang/test/CMakeLists.txt
+Index: llvm-toolchain-9_9.0.0/clang/test/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-9-9~+rc5.orig/clang/test/CMakeLists.txt
-+++ llvm-toolchain-9-9~+rc5/clang/test/CMakeLists.txt
-@@ -123,14 +123,12 @@
+--- llvm-toolchain-9_9.0.0.orig/clang/test/CMakeLists.txt
++++ llvm-toolchain-9_9.0.0/clang/test/CMakeLists.txt
+@@ -123,14 +123,12 @@ if( NOT CLANG_BUILT_STANDALONE )
    endif()
  endif()
  
diff --git a/debian/patches/atomic_library_1.diff b/debian/patches/atomic_library_1.diff
index fb253e7e..9c8bdad4 100644
--- a/debian/patches/atomic_library_1.diff
+++ b/debian/patches/atomic_library_1.diff
@@ -3,10 +3,10 @@
  clang/test/CodeGen/linux-arm-atomic.c |   10 ++++++++++
  2 files changed, 24 insertions(+)
 
-Index: llvm-toolchain-snapshot_6.0~svn309319/clang/test/CodeGen/linux-arm-atomic.c
+Index: llvm-toolchain-9_9.0.0/clang/test/CodeGen/linux-arm-atomic.c
 ===================================================================
---- llvm-toolchain-snapshot_6.0~svn309319.orig/clang/test/CodeGen/linux-arm-atomic.c
-+++ llvm-toolchain-snapshot_6.0~svn309319/clang/test/CodeGen/linux-arm-atomic.c
+--- llvm-toolchain-9_9.0.0.orig/clang/test/CodeGen/linux-arm-atomic.c
++++ llvm-toolchain-9_9.0.0/clang/test/CodeGen/linux-arm-atomic.c
 @@ -1,5 +1,15 @@
  // RUN: %clang_cc1 %s -emit-llvm -o - -triple=armv7-unknown-linux | FileCheck %s
  // RUN: %clang_cc1 %s -emit-llvm -o - -triple=armv6-unknown-linux | FileCheck %s
diff --git a/debian/patches/bootstrap-fix-include-next.diff b/debian/patches/bootstrap-fix-include-next.diff
index 2a607bc5..d0fd2dcf 100644
--- a/debian/patches/bootstrap-fix-include-next.diff
+++ b/debian/patches/bootstrap-fix-include-next.diff
@@ -13,10 +13,10 @@ include search path, clang's header will call itself without any effect.
 Therefore, it will do include_next until the define from the libc is existing (ex: _INTTYPES_H)
 
 
-Index: llvm-toolchain-snapshot_9~svn365742/clang/lib/Headers/inttypes.h
+Index: llvm-toolchain-9_9.0.0/clang/lib/Headers/inttypes.h
 ===================================================================
---- llvm-toolchain-snapshot_9~svn365742.orig/clang/lib/Headers/inttypes.h
-+++ llvm-toolchain-snapshot_9~svn365742/clang/lib/Headers/inttypes.h
+--- llvm-toolchain-9_9.0.0.orig/clang/lib/Headers/inttypes.h
++++ llvm-toolchain-9_9.0.0/clang/lib/Headers/inttypes.h
 @@ -6,7 +6,7 @@
   *
  \*===----------------------------------------------------------------------===*/
@@ -26,10 +26,10 @@ Index: llvm-toolchain-snapshot_9~svn365742/clang/lib/Headers/inttypes.h
  // AIX system headers need inttypes.h to be re-enterable while _STD_TYPES_T
  // is defined until an inclusion of it without _STD_TYPES_T occurs, in which
  // case the header guard macro is defined.
-Index: llvm-toolchain-snapshot_9~svn365742/clang/lib/Headers/limits.h
+Index: llvm-toolchain-9_9.0.0/clang/lib/Headers/limits.h
 ===================================================================
---- llvm-toolchain-snapshot_9~svn365742.orig/clang/lib/Headers/limits.h
-+++ llvm-toolchain-snapshot_9~svn365742/clang/lib/Headers/limits.h
+--- llvm-toolchain-9_9.0.0.orig/clang/lib/Headers/limits.h
++++ llvm-toolchain-9_9.0.0/clang/lib/Headers/limits.h
 @@ -6,7 +6,7 @@
   *
  \*===----------------------------------------------------------------------===*/
diff --git a/debian/patches/clang-analyzer-force-version.diff b/debian/patches/clang-analyzer-force-version.diff
index 818937e5..e5279950 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_9~svn339515/clang/tools/scan-build/libexec/ccc-analyzer
+Index: llvm-toolchain-9_9.0.0/clang/tools/scan-build/libexec/ccc-analyzer
 ===================================================================
---- llvm-toolchain-snapshot_9~svn339515.orig/clang/tools/scan-build/libexec/ccc-analyzer
-+++ llvm-toolchain-snapshot_9~svn339515/clang/tools/scan-build/libexec/ccc-analyzer
-@@ -91,7 +91,7 @@ if ($FindBin::Script =~ /c\+\+-analyzer/
+--- llvm-toolchain-9_9.0.0.orig/clang/tools/scan-build/libexec/ccc-analyzer
++++ llvm-toolchain-9_9.0.0/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_9~svn339515/clang/tools/scan-build/libexec/ccc-an
  
    $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 06e0208c..434a3701 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/llvm/include/llvm/Support/ARMTargetParser.def
+Index: llvm-toolchain-9_9.0.0/llvm/include/llvm/Support/ARMTargetParser.def
 ===================================================================
---- llvm-toolchain-snapshot_9~svn351647.orig/llvm/include/llvm/Support/ARMTargetParser.def
-+++ llvm-toolchain-snapshot_9~svn351647/llvm/include/llvm/Support/ARMTargetParser.def
-@@ -74,7 +74,7 @@ ARM_ARCH("armv6kz", ARMV6KZ, "6KZ", "v6k
+--- llvm-toolchain-9_9.0.0.orig/llvm/include/llvm/Support/ARMTargetParser.def
++++ llvm-toolchain-9_9.0.0/llvm/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/llvm/include/llvm/Support/ARMTargetPa
  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/llvm/lib/Target/ARM/ARM.td
+Index: llvm-toolchain-9_9.0.0/llvm/lib/Target/ARM/ARM.td
 ===================================================================
---- llvm-toolchain-snapshot_9~svn351647.orig/llvm/lib/Target/ARM/ARM.td
-+++ llvm-toolchain-snapshot_9~svn351647/llvm/lib/Target/ARM/ARM.td
-@@ -595,7 +595,8 @@ def ARMv6sm   : Architecture<"armv6s-m",
+--- llvm-toolchain-9_9.0.0.orig/llvm/lib/Target/ARM/ARM.td
++++ llvm-toolchain-9_9.0.0/llvm/lib/Target/ARM/ARM.td
+@@ -654,7 +654,8 @@ def ARMv6sm   : Architecture<"armv6s-m",
                                                         FeatureStrictAlign]>;
  
  def ARMv7a    : Architecture<"armv7-a",   "ARMv7a",   [HasV7Ops,
diff --git a/debian/patches/clang-baseline-fix-i386.patch b/debian/patches/clang-baseline-fix-i386.patch
index 5ed18710..b4b6476a 100644
--- a/debian/patches/clang-baseline-fix-i386.patch
+++ b/debian/patches/clang-baseline-fix-i386.patch
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_9~svn351647/clang/lib/Driver/ToolChains/Arch/X86.cpp
+Index: llvm-toolchain-9_9.0.0/clang/lib/Driver/ToolChains/Arch/X86.cpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn351647.orig/clang/lib/Driver/ToolChains/Arch/X86.cpp
-+++ llvm-toolchain-snapshot_9~svn351647/clang/lib/Driver/ToolChains/Arch/X86.cpp
+--- llvm-toolchain-9_9.0.0.orig/clang/lib/Driver/ToolChains/Arch/X86.cpp
++++ llvm-toolchain-9_9.0.0/clang/lib/Driver/ToolChains/Arch/X86.cpp
 @@ -100,8 +100,8 @@ const char *x86::getX86TargetCPU(const A
    case llvm::Triple::Haiku:
      return "i586";
diff --git a/debian/patches/clang-format-version.diff b/debian/patches/clang-format-version.diff
index b5145d0c..c2c2955f 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_9~svn342269/clang/tools/clang-format/clang-format-diff.py
+Index: llvm-toolchain-9_9.0.0/clang/tools/clang-format/clang-format-diff.py
 ===================================================================
---- llvm-toolchain-snapshot_9~svn342269.orig/clang/tools/clang-format/clang-format-diff.py
-+++ llvm-toolchain-snapshot_9~svn342269/clang/tools/clang-format/clang-format-diff.py
-@@ -57,7 +57,7 @@ def main():
+--- llvm-toolchain-9_9.0.0.orig/clang/tools/clang-format/clang-format-diff.py
++++ llvm-toolchain-9_9.0.0/clang/tools/clang-format/clang-format-diff.py
+@@ -58,7 +58,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_9~svn342269/clang/tools/clang-format/clang-format
                        help='location of binary to use for clang-format')
    args = parser.parse_args()
  
-Index: llvm-toolchain-snapshot_9~svn342269/clang/tools/clang-format/clang-format.el
+Index: llvm-toolchain-9_9.0.0/clang/tools/clang-format/clang-format.el
 ===================================================================
---- llvm-toolchain-snapshot_9~svn342269.orig/clang/tools/clang-format/clang-format.el
-+++ llvm-toolchain-snapshot_9~svn342269/clang/tools/clang-format/clang-format.el
+--- llvm-toolchain-9_9.0.0.orig/clang/tools/clang-format/clang-format.el
++++ llvm-toolchain-9_9.0.0/clang/tools/clang-format/clang-format.el
 @@ -36,7 +36,7 @@
    :group 'tools)
  
@@ -30,10 +30,10 @@ Index: llvm-toolchain-snapshot_9~svn342269/clang/tools/clang-format/clang-format
        "clang-format")
    "Location of the clang-format executable.
  
-Index: llvm-toolchain-snapshot_9~svn342269/clang/tools/clang-format/clang-format.py
+Index: llvm-toolchain-9_9.0.0/clang/tools/clang-format/clang-format.py
 ===================================================================
---- llvm-toolchain-snapshot_9~svn342269.orig/clang/tools/clang-format/clang-format.py
-+++ llvm-toolchain-snapshot_9~svn342269/clang/tools/clang-format/clang-format.py
+--- llvm-toolchain-9_9.0.0.orig/clang/tools/clang-format/clang-format.py
++++ llvm-toolchain-9_9.0.0/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-riscv64-multiarch.diff b/debian/patches/clang-riscv64-multiarch.diff
index a26f49fa..221d936e 100644
--- a/debian/patches/clang-riscv64-multiarch.diff
+++ b/debian/patches/clang-riscv64-multiarch.diff
@@ -1,8 +1,8 @@
-diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp
-index d900508ad93..f516d172b37 100644
---- a/clang/lib/Driver/ToolChains/Linux.cpp
-+++ b/clang/lib/Driver/ToolChains/Linux.cpp
-@@ -150,6 +150,10 @@ static std::string getMultiarchTriple(const Driver &D,
+Index: llvm-toolchain-9_9.0.0/clang/lib/Driver/ToolChains/Linux.cpp
+===================================================================
+--- llvm-toolchain-9_9.0.0.orig/clang/lib/Driver/ToolChains/Linux.cpp
++++ llvm-toolchain-9_9.0.0/clang/lib/Driver/ToolChains/Linux.cpp
+@@ -151,6 +151,10 @@ static std::string getMultiarchTriple(co
      if (D.getVFS().exists(SysRoot + "/lib/powerpc64le-linux-gnu"))
        return "powerpc64le-linux-gnu";
      break;
@@ -13,7 +13,7 @@ index d900508ad93..f516d172b37 100644
    case llvm::Triple::sparc:
      if (D.getVFS().exists(SysRoot + "/lib/sparc-linux-gnu"))
        return "sparc-linux-gnu";
-@@ -749,6 +753,8 @@ void Linux::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
+@@ -759,6 +763,8 @@ void Linux::AddClangSystemIncludeArgs(co
        "/usr/include/powerpc64-linux-gnu"};
    const StringRef PPC64LEMultiarchIncludeDirs[] = {
        "/usr/include/powerpc64le-linux-gnu"};
@@ -22,7 +22,7 @@ index d900508ad93..f516d172b37 100644
    const StringRef SparcMultiarchIncludeDirs[] = {
        "/usr/include/sparc-linux-gnu"};
    const StringRef Sparc64MultiarchIncludeDirs[] = {
-@@ -824,6 +830,9 @@ void Linux::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
+@@ -834,6 +840,9 @@ void Linux::AddClangSystemIncludeArgs(co
    case llvm::Triple::ppc64le:
      MultiarchIncludeDirs = PPC64LEMultiarchIncludeDirs;
      break;
diff --git a/debian/patches/clang-riscv64-rv64gc.diff b/debian/patches/clang-riscv64-rv64gc.diff
index 922823ed..17275888 100644
--- a/debian/patches/clang-riscv64-rv64gc.diff
+++ b/debian/patches/clang-riscv64-rv64gc.diff
@@ -1,8 +1,8 @@
-diff --git a/clang/lib/Driver/ToolChains/Arch/RISCV.cpp b/clang/lib/Driver/ToolChains/Arch/RISCV.cpp
-index b6768de4d29..9671ea270ef 100644
---- a/clang/lib/Driver/ToolChains/Arch/RISCV.cpp
-+++ b/clang/lib/Driver/ToolChains/Arch/RISCV.cpp
-@@ -350,6 +350,13 @@ void riscv::getRISCVTargetFeatures(const Driver &D, const ArgList &Args,
+Index: llvm-toolchain-9_9.0.0/clang/lib/Driver/ToolChains/Arch/RISCV.cpp
+===================================================================
+--- llvm-toolchain-9_9.0.0.orig/clang/lib/Driver/ToolChains/Arch/RISCV.cpp
++++ llvm-toolchain-9_9.0.0/clang/lib/Driver/ToolChains/Arch/RISCV.cpp
+@@ -350,6 +350,13 @@ void riscv::getRISCVTargetFeatures(const
  
      // Handle all other types of extensions.
      getExtensionFeatures(D, Args, Features, MArch, OtherExts);
@@ -16,18 +16,18 @@ index b6768de4d29..9671ea270ef 100644
    }
  
    // -mrelax is default, unless -mno-relax is specified.
-@@ -375,5 +382,5 @@ StringRef riscv::getRISCVABI(const ArgList &Args, const llvm::Triple &Triple) {
+@@ -375,5 +382,5 @@ StringRef riscv::getRISCVABI(const ArgLi
    if (Arg *A = Args.getLastArg(options::OPT_mabi_EQ))
      return A->getValue();
  
 -  return Triple.getArch() == llvm::Triple::riscv32 ? "ilp32" : "lp64";
 +  return Triple.getArch() == llvm::Triple::riscv32 ? "ilp32" : "lp64d";
  }
-diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp
-index 60062d5c327..bb4536cafb0 100644
---- a/clang/lib/Driver/ToolChains/Clang.cpp
-+++ b/clang/lib/Driver/ToolChains/Clang.cpp
-@@ -1850,7 +1850,7 @@ void Clang::AddRISCVTargetArgs(const ArgList &Args,
+Index: llvm-toolchain-9_9.0.0/clang/lib/Driver/ToolChains/Clang.cpp
+===================================================================
+--- llvm-toolchain-9_9.0.0.orig/clang/lib/Driver/ToolChains/Clang.cpp
++++ llvm-toolchain-9_9.0.0/clang/lib/Driver/ToolChains/Clang.cpp
+@@ -1862,7 +1862,7 @@ void Clang::AddRISCVTargetArgs(const Arg
    else if (Triple.getArch() == llvm::Triple::riscv32)
      ABIName = "ilp32";
    else if (Triple.getArch() == llvm::Triple::riscv64)
diff --git a/debian/patches/clang-tidy-run-bin.diff b/debian/patches/clang-tidy-run-bin.diff
index 66c02867..5732f084 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_9~svn342269/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
+Index: llvm-toolchain-9_9.0.0/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
 ===================================================================
---- llvm-toolchain-snapshot_9~svn342269.orig/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
-+++ llvm-toolchain-snapshot_9~svn342269/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
-@@ -179,10 +179,10 @@ def main():
+--- llvm-toolchain-9_9.0.0.orig/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
++++ llvm-toolchain-9_9.0.0/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..b68e67e2 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-9_9.0.0/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-9_9.0.0.orig/clang-tools-extra/clangd/CMakeLists.txt
++++ llvm-toolchain-9_9.0.0/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 a06eca6e..b142aae0 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/llvm/lib/ExecutionEngine/PerfJITEvents/PerfJITEventListener.cpp
+Index: llvm-toolchain-9_9.0.0/llvm/lib/ExecutionEngine/PerfJITEvents/PerfJITEventListener.cpp
 ===================================================================
---- llvm-toolchain-7_7.0.1~+rc3.orig/llvm/lib/ExecutionEngine/PerfJITEvents/PerfJITEventListener.cpp
-+++ llvm-toolchain-7_7.0.1~+rc3/llvm/lib/ExecutionEngine/PerfJITEvents/PerfJITEventListener.cpp
-@@ -294,8 +294,8 @@ bool PerfJITEventListener::InitDebugging
+--- llvm-toolchain-9_9.0.0.orig/llvm/lib/ExecutionEngine/PerfJITEvents/PerfJITEventListener.cpp
++++ llvm-toolchain-9_9.0.0/llvm/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 9318dbfa..7930fb26 100644
--- a/debian/patches/declare_clear_cache.diff
+++ b/debian/patches/declare_clear_cache.diff
@@ -2,11 +2,11 @@
  llvm/lib/Support/Unix/Memory.inc |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: llvm-toolchain-snapshot_8~svn342269/llvm/lib/Support/Unix/Memory.inc
+Index: llvm-toolchain-9_9.0.0/llvm/lib/Support/Unix/Memory.inc
 ===================================================================
---- llvm-toolchain-snapshot_8~svn342269.orig/llvm/lib/Support/Unix/Memory.inc
-+++ llvm-toolchain-snapshot_8~svn342269/llvm/lib/Support/Unix/Memory.inc
-@@ -237,7 +237,7 @@ void Memory::InvalidateInstructionCache(
+--- llvm-toolchain-9_9.0.0.orig/llvm/lib/Support/Unix/Memory.inc
++++ llvm-toolchain-9_9.0.0/llvm/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-display-PASS-UNSUPPORTED-XFAIL.diff b/debian/patches/disable-display-PASS-UNSUPPORTED-XFAIL.diff
index cde5326d..6469f453 100644
--- a/debian/patches/disable-display-PASS-UNSUPPORTED-XFAIL.diff
+++ b/debian/patches/disable-display-PASS-UNSUPPORTED-XFAIL.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_4.0~svn280802/lldb/third_party/Python/module/unittest2/unittest2/runner.py
+Index: llvm-toolchain-9_9.0.0/lldb/third_party/Python/module/unittest2/unittest2/runner.py
 ===================================================================
---- llvm-toolchain-snapshot_4.0~svn280802.orig/lldb/third_party/Python/module/unittest2/unittest2/runner.py
-+++ llvm-toolchain-snapshot_4.0~svn280802/lldb/third_party/Python/module/unittest2/unittest2/runner.py
+--- llvm-toolchain-9_9.0.0.orig/lldb/third_party/Python/module/unittest2/unittest2/runner.py
++++ llvm-toolchain-9_9.0.0/lldb/third_party/Python/module/unittest2/unittest2/runner.py
 @@ -174,9 +174,9 @@ class TextTestRunner(unittest.TextTestRu
          if hasattr(result, 'separator2'):
              self.stream.writeln(result.separator2)
diff --git a/debian/patches/disable-error-xray.diff b/debian/patches/disable-error-xray.diff
index 77cbaf0a..7753b258 100644
--- a/debian/patches/disable-error-xray.diff
+++ b/debian/patches/disable-error-xray.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_9~svn351647/compiler-rt/lib/xray/xray_tsc.h
+Index: llvm-toolchain-9_9.0.0/compiler-rt/lib/xray/xray_tsc.h
 ===================================================================
---- llvm-toolchain-snapshot_9~svn351647.orig/compiler-rt/lib/xray/xray_tsc.h
-+++ llvm-toolchain-snapshot_9~svn351647/compiler-rt/lib/xray/xray_tsc.h
+--- llvm-toolchain-9_9.0.0.orig/compiler-rt/lib/xray/xray_tsc.h
++++ llvm-toolchain-9_9.0.0/compiler-rt/lib/xray/xray_tsc.h
 @@ -82,8 +82,6 @@ inline uint64_t getTSCFrequency() XRAY_N
  
  } // namespace __xray
diff --git a/debian/patches/disable-lit-cpuid-install.diff b/debian/patches/disable-lit-cpuid-install.diff
index 9a4f7312..29d4e302 100644
--- a/debian/patches/disable-lit-cpuid-install.diff
+++ b/debian/patches/disable-lit-cpuid-install.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-9-9/lldb/utils/lit-cpuid/CMakeLists.txt
+Index: llvm-toolchain-9_9.0.0/lldb/utils/lit-cpuid/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-9-9.orig/lldb/utils/lit-cpuid/CMakeLists.txt
-+++ llvm-toolchain-9-9/lldb/utils/lit-cpuid/CMakeLists.txt
+--- llvm-toolchain-9_9.0.0.orig/lldb/utils/lit-cpuid/CMakeLists.txt
++++ llvm-toolchain-9_9.0.0/lldb/utils/lit-cpuid/CMakeLists.txt
 @@ -1,4 +1,4 @@
 -add_llvm_utility(lit-cpuid
 +add_lldb_executable(lit-cpuid
diff --git a/debian/patches/disable-llvm-symbolizer-test.diff b/debian/patches/disable-llvm-symbolizer-test.diff
index dcd5e8d0..be89cca6 100644
--- a/debian/patches/disable-llvm-symbolizer-test.diff
+++ b/debian/patches/disable-llvm-symbolizer-test.diff
@@ -11,10 +11,10 @@ Description: Silent a test failing on yakkety amd64
 Author: Sylvestre <sylvestre@debian.org>
 Last-Update: 2016-08-26
 
-Index: llvm-toolchain-snapshot_9~svn352786/llvm/test/tools/llvm-symbolizer/print_context.c
+Index: llvm-toolchain-9_9.0.0/llvm/test/tools/llvm-symbolizer/print_context.c
 ===================================================================
---- llvm-toolchain-snapshot_9~svn352786.orig/llvm/test/tools/llvm-symbolizer/print_context.c
-+++ llvm-toolchain-snapshot_9~svn352786/llvm/test/tools/llvm-symbolizer/print_context.c
+--- llvm-toolchain-9_9.0.0.orig/llvm/test/tools/llvm-symbolizer/print_context.c
++++ llvm-toolchain-9_9.0.0/llvm/test/tools/llvm-symbolizer/print_context.c
 @@ -18,6 +18,7 @@ int main() {
  // Inputs/print_context.o built with plain -g -c from this source file
  // Specifying -Xclang -fdebug-compilation-dir -Xclang . to make the debug info
diff --git a/debian/patches/disable-path-test-failing.diff b/debian/patches/disable-path-test-failing.diff
index a13e804a..c7d0860e 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/llvm/unittests/Support/Path.cpp
+Index: llvm-toolchain-9_9.0.0/llvm/unittests/Support/Path.cpp
 ===================================================================
---- llvm-toolchain-snapshot_8~svn347135.orig/llvm/unittests/Support/Path.cpp
-+++ llvm-toolchain-snapshot_8~svn347135/llvm/unittests/Support/Path.cpp
-@@ -437,7 +437,7 @@ protected:
+--- llvm-toolchain-9_9.0.0.orig/llvm/unittests/Support/Path.cpp
++++ llvm-toolchain-9_9.0.0/llvm/unittests/Support/Path.cpp
+@@ -436,7 +436,7 @@ protected:
      sys::path::append(NonExistantFile, "1B28B495C16344CB9822E588CD4C3EF0");
    }
  
@@ -11,7 +11,7 @@ Index: llvm-toolchain-snapshot_8~svn347135/llvm/unittests/Support/Path.cpp
  };
  
  TEST_F(FileSystemTest, Unique) {
-@@ -519,13 +519,13 @@ TEST_F(FileSystemTest, RealPath) {
+@@ -518,13 +518,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..b82c0190 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-9_9.0.0/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-9_9.0.0.orig/clang/include/clang/Basic/X86Target.def
++++ llvm-toolchain-9_9.0.0/clang/include/clang/Basic/X86Target.def
+@@ -307,7 +307,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/do-not-fail-on-unexpected-pass.diff b/debian/patches/do-not-fail-on-unexpected-pass.diff
index 198e398c..af090303 100644
--- a/debian/patches/do-not-fail-on-unexpected-pass.diff
+++ b/debian/patches/do-not-fail-on-unexpected-pass.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_8~svn342269/llvm/utils/lit/lit/Test.py
+Index: llvm-toolchain-9_9.0.0/llvm/utils/lit/lit/Test.py
 ===================================================================
---- llvm-toolchain-snapshot_8~svn342269.orig/llvm/utils/lit/lit/Test.py
-+++ llvm-toolchain-snapshot_8~svn342269/llvm/utils/lit/lit/Test.py
+--- llvm-toolchain-9_9.0.0.orig/llvm/utils/lit/lit/Test.py
++++ llvm-toolchain-9_9.0.0/llvm/utils/lit/lit/Test.py
 @@ -32,7 +32,7 @@ PASS        = ResultCode('PASS', False)
  FLAKYPASS   = ResultCode('FLAKYPASS', False)
  XFAIL       = ResultCode('XFAIL', False)
diff --git a/debian/patches/fix-clang-path-and-build.diff b/debian/patches/fix-clang-path-and-build.diff
index c2793e95..ae0aa616 100644
--- a/debian/patches/fix-clang-path-and-build.diff
+++ b/debian/patches/fix-clang-path-and-build.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-9-9~+rc3/clang/lib/Driver/ToolChains/Linux.cpp
+Index: llvm-toolchain-9_9.0.0/clang/lib/Driver/ToolChains/Linux.cpp
 ===================================================================
---- llvm-toolchain-9-9~+rc3.orig/clang/lib/Driver/ToolChains/Linux.cpp
-+++ llvm-toolchain-9-9~+rc3/clang/lib/Driver/ToolChains/Linux.cpp
+--- llvm-toolchain-9_9.0.0.orig/clang/lib/Driver/ToolChains/Linux.cpp
++++ llvm-toolchain-9_9.0.0/clang/lib/Driver/ToolChains/Linux.cpp
 @@ -12,6 +12,7 @@
  #include "Arch/PPC.h"
  #include "Arch/RISCV.h"
@@ -10,7 +10,7 @@ Index: llvm-toolchain-9-9~+rc3/clang/lib/Driver/ToolChains/Linux.cpp
  #include "clang/Config/config.h"
  #include "clang/Driver/Distro.h"
  #include "clang/Driver/Driver.h"
-@@ -665,7 +666,16 @@ void Linux::AddClangSystemIncludeArgs(co
+@@ -661,7 +662,16 @@ void Linux::AddClangSystemIncludeArgs(co
    if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) {
      SmallString<128> P(D.ResourceDir);
      llvm::sys::path::append(P, "include");
diff --git a/debian/patches/fix-llvm-config-obj-src-root.patch b/debian/patches/fix-llvm-config-obj-src-root.patch
index fffbcb34..09f255b3 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 @@
  llvm/tools/llvm-config/llvm-config.cpp |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-Index: llvm-toolchain-snapshot_8~svn342269/llvm/tools/llvm-config/llvm-config.cpp
+Index: llvm-toolchain-9_9.0.0/llvm/tools/llvm-config/llvm-config.cpp
 ===================================================================
---- llvm-toolchain-snapshot_8~svn342269.orig/llvm/tools/llvm-config/llvm-config.cpp
-+++ llvm-toolchain-snapshot_8~svn342269/llvm/tools/llvm-config/llvm-config.cpp
-@@ -558,9 +558,9 @@ int main(int argc, char **argv) {
+--- llvm-toolchain-9_9.0.0.orig/llvm/tools/llvm-config/llvm-config.cpp
++++ llvm-toolchain-9_9.0.0/llvm/tools/llvm-config/llvm-config.cpp
+@@ -557,9 +557,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 1038b8db..05a907fe 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.9-3.9/clang/tools/scan-view/bin/scan-view
+Index: llvm-toolchain-9_9.0.0/clang/tools/scan-view/bin/scan-view
 ===================================================================
---- llvm-toolchain-3.9-3.9.orig/clang/tools/scan-view/bin/scan-view
-+++ llvm-toolchain-3.9-3.9/clang/tools/scan-view/bin/scan-view
-@@ -23,6 +23,7 @@ kDefaultPort = 9191
+--- llvm-toolchain-9_9.0.0.orig/clang/tools/scan-view/bin/scan-view
++++ llvm-toolchain-9_9.0.0/clang/tools/scan-view/bin/scan-view
+@@ -28,6 +28,7 @@ kDefaultPort = 8181
  kMaxPortsToTry = 100
  
  ###
@@ -10,7 +10,7 @@ Index: llvm-toolchain-3.9-3.9/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-EIEIO-undef.diff b/debian/patches/hurd/hurd-EIEIO-undef.diff
index 855ff6ff..082d5bf8 100644
--- a/debian/patches/hurd/hurd-EIEIO-undef.diff
+++ b/debian/patches/hurd/hurd-EIEIO-undef.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_9~svn358740/llvm/utils/TableGen/CodeEmitterGen.cpp
+Index: llvm-toolchain-9_9.0.0/llvm/utils/TableGen/CodeEmitterGen.cpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn358740.orig/llvm/utils/TableGen/CodeEmitterGen.cpp
-+++ llvm-toolchain-snapshot_9~svn358740/llvm/utils/TableGen/CodeEmitterGen.cpp
+--- llvm-toolchain-9_9.0.0.orig/llvm/utils/TableGen/CodeEmitterGen.cpp
++++ llvm-toolchain-9_9.0.0/llvm/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 1d915479..ea63ba9c 100644
--- a/debian/patches/hurd/hurd-pathmax.diff
+++ b/debian/patches/hurd/hurd-pathmax.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_9~svn358740/clang/lib/Basic/FileManager.cpp
+Index: llvm-toolchain-9_9.0.0/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
+--- llvm-toolchain-9_9.0.0.orig/clang/lib/Basic/FileManager.cpp
++++ llvm-toolchain-9_9.0.0/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~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-9_9.0.0/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-9_9.0.0.orig/lldb/include/lldb/lldb-defines.h
++++ llvm-toolchain-9_9.0.0/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/llvm/tools/dsymutil/DwarfLinker.cpp
+Index: llvm-toolchain-9_9.0.0/llvm/tools/dsymutil/DwarfLinker.cpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn358740.orig/llvm/tools/dsymutil/DwarfLinker.cpp
-+++ llvm-toolchain-snapshot_9~svn358740/llvm/tools/dsymutil/DwarfLinker.cpp
+--- llvm-toolchain-9_9.0.0.orig/llvm/tools/dsymutil/DwarfLinker.cpp
++++ llvm-toolchain-9_9.0.0/llvm/tools/dsymutil/DwarfLinker.cpp
 @@ -100,6 +100,11 @@
  #include <utility>
  #include <vector>
@@ -47,10 +47,10 @@ Index: llvm-toolchain-snapshot_9~svn358740/llvm/tools/dsymutil/DwarfLinker.cpp
  namespace llvm {
  namespace dsymutil {
  
-Index: llvm-toolchain-snapshot_9~svn358740/polly/lib/External/ppcg/cuda_common.c
+Index: llvm-toolchain-9_9.0.0/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-9_9.0.0.orig/polly/lib/External/ppcg/cuda_common.c
++++ llvm-toolchain-9_9.0.0/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 743949cc..ded25788 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_9~svn359674/llvm/lib/Support/Unix/Path.inc
+Index: llvm-toolchain-9_9.0.0/llvm/lib/Support/Unix/Path.inc
 ===================================================================
---- llvm-toolchain-snapshot_9~svn359674.orig/llvm/lib/Support/Unix/Path.inc
-+++ llvm-toolchain-snapshot_9~svn359674/llvm/lib/Support/Unix/Path.inc
-@@ -202,7 +202,7 @@ std::string getMainExecutable(const char
+--- llvm-toolchain-9_9.0.0.orig/llvm/lib/Support/Unix/Path.inc
++++ llvm-toolchain-9_9.0.0/llvm/lib/Support/Unix/Path.inc
+@@ -203,7 +203,7 @@ std::string getMainExecutable(const char
    // If we don't have procfs mounted, fall back to argv[0]
    if (getprogpath(exe_path, argv0) != NULL)
      return exe_path;
diff --git a/debian/patches/install-scan-build-py.diff b/debian/patches/install-scan-build-py.diff
index 95543fd0..93fea740 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-9_9.0.0/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-9_9.0.0.orig/clang/tools/CMakeLists.txt
++++ llvm-toolchain-9_9.0.0/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 a2d0c41b..9382b106 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/llvm/CMakeLists.txt
+Index: llvm-toolchain-9_9.0.0/llvm/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_9~svn358740.orig/llvm/CMakeLists.txt
-+++ llvm-toolchain-snapshot_9~svn358740/llvm/CMakeLists.txt
-@@ -872,7 +872,7 @@ if(LLVM_TARGET_IS_CROSSCOMPILE_HOST)
+--- llvm-toolchain-9_9.0.0.orig/llvm/CMakeLists.txt
++++ llvm-toolchain-9_9.0.0/llvm/CMakeLists.txt
+@@ -857,7 +857,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..cb47ddfc 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-9_9.0.0/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-9_9.0.0.orig/clang/lib/Basic/Targets.cpp
++++ llvm-toolchain-9_9.0.0/clang/lib/Basic/Targets.cpp
+@@ -459,8 +459,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
+@@ -518,8 +518,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-9_9.0.0/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-9_9.0.0.orig/clang/lib/Basic/Targets/OSTargets.h
++++ llvm-toolchain-9_9.0.0/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/compiler-rt_lib.diff b/debian/patches/kfreebsd/compiler-rt_lib.diff
index 399c421e..b564559a 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~svn364913/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
+Index: llvm-toolchain-9_9.0.0/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
 ===================================================================
---- llvm-toolchain-snapshot_9~svn364913.orig/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
-+++ llvm-toolchain-snapshot_9~svn364913/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
+--- llvm-toolchain-9_9.0.0.orig/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
++++ llvm-toolchain-9_9.0.0/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
@@ -31,7 +31,7 @@ Index: llvm-toolchain-snapshot_9~svn364913/compiler-rt/lib/sanitizer_common/sani
  #elif SANITIZER_OPENBSD
    return internal_syscall(SYSCALL(getthrid));
  #elif SANITIZER_SOLARIS
-@@ -1144,10 +1151,10 @@ bool LibraryNameIs(const char *full_name
+@@ -1148,10 +1155,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~svn364913/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~svn364913/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cc
+Index: llvm-toolchain-9_9.0.0/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cc
 ===================================================================
---- llvm-toolchain-snapshot_9~svn364913.orig/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cc
-+++ llvm-toolchain-snapshot_9~svn364913/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cc
+--- llvm-toolchain-9_9.0.0.orig/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cc
++++ llvm-toolchain-9_9.0.0/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cc
 @@ -35,10 +35,12 @@
  #include <syslog.h>
  
@@ -75,10 +75,10 @@ Index: llvm-toolchain-snapshot_9~svn364913/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~svn364913/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
+Index: llvm-toolchain-9_9.0.0/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
 ===================================================================
---- llvm-toolchain-snapshot_9~svn364913.orig/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
-+++ llvm-toolchain-snapshot_9~svn364913/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
+--- llvm-toolchain-9_9.0.0.orig/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
++++ llvm-toolchain-9_9.0.0/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~svn364913/compiler-rt/lib/sanitizer_common/sani
  
  #if __LP64__ || defined(_WIN64)
  #  define SANITIZER_WORDSIZE 64
-Index: llvm-toolchain-snapshot_9~svn364913/compiler-rt/lib/asan/asan_linux.cc
+Index: llvm-toolchain-9_9.0.0/compiler-rt/lib/asan/asan_linux.cc
 ===================================================================
---- llvm-toolchain-snapshot_9~svn364913.orig/compiler-rt/lib/asan/asan_linux.cc
-+++ llvm-toolchain-snapshot_9~svn364913/compiler-rt/lib/asan/asan_linux.cc
+--- llvm-toolchain-9_9.0.0.orig/compiler-rt/lib/asan/asan_linux.cc
++++ llvm-toolchain-9_9.0.0/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~svn364913/compiler-rt/lib/asan/asan_linux.cc
  #define ucontext_t xucontext_t
  #endif
  
-Index: llvm-toolchain-snapshot_9~svn364913/compiler-rt/lib/ubsan/ubsan_platform.h
+Index: llvm-toolchain-9_9.0.0/compiler-rt/lib/ubsan/ubsan_platform.h
 ===================================================================
---- llvm-toolchain-snapshot_9~svn364913.orig/compiler-rt/lib/ubsan/ubsan_platform.h
-+++ llvm-toolchain-snapshot_9~svn364913/compiler-rt/lib/ubsan/ubsan_platform.h
+--- llvm-toolchain-9_9.0.0.orig/compiler-rt/lib/ubsan/ubsan_platform.h
++++ llvm-toolchain-9_9.0.0/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~svn364913/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~svn364913/compiler-rt/lib/tsan/rtl/tsan_rtl_amd64.S
+Index: llvm-toolchain-9_9.0.0/compiler-rt/lib/tsan/rtl/tsan_rtl_amd64.S
 ===================================================================
---- llvm-toolchain-snapshot_9~svn364913.orig/compiler-rt/lib/tsan/rtl/tsan_rtl_amd64.S
-+++ llvm-toolchain-snapshot_9~svn364913/compiler-rt/lib/tsan/rtl/tsan_rtl_amd64.S
+--- llvm-toolchain-9_9.0.0.orig/compiler-rt/lib/tsan/rtl/tsan_rtl_amd64.S
++++ llvm-toolchain-9_9.0.0/compiler-rt/lib/tsan/rtl/tsan_rtl_amd64.S
 @@ -192,7 +192,7 @@ ASM_SYMBOL_INTERCEPTOR(setjmp):
    // obtain SP, store in %rdi, first argument to `void __tsan_setjmp(uptr sp)`
  #if defined(__FreeBSD__) || defined(__NetBSD__)
@@ -196,10 +196,10 @@ Index: llvm-toolchain-snapshot_9~svn364913/compiler-rt/lib/tsan/rtl/tsan_rtl_amd
    lea 32(%rsp), %rdi
  #else
  # error "Unknown platform"
-Index: llvm-toolchain-snapshot_9~svn364913/compiler-rt/lib/fuzzer/FuzzerDefs.h
+Index: llvm-toolchain-9_9.0.0/compiler-rt/lib/fuzzer/FuzzerDefs.h
 ===================================================================
---- llvm-toolchain-snapshot_9~svn364913.orig/compiler-rt/lib/fuzzer/FuzzerDefs.h
-+++ llvm-toolchain-snapshot_9~svn364913/compiler-rt/lib/fuzzer/FuzzerDefs.h
+--- llvm-toolchain-9_9.0.0.orig/compiler-rt/lib/fuzzer/FuzzerDefs.h
++++ llvm-toolchain-9_9.0.0/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~svn364913/compiler-rt/lib/fuzzer/FuzzerDefs.h
  
  #ifdef __x86_64
  #  if __has_attribute(target)
-Index: llvm-toolchain-snapshot_9~svn364913/compiler-rt/lib/fuzzer/FuzzerUtilPosix.cpp
+Index: llvm-toolchain-9_9.0.0/compiler-rt/lib/fuzzer/FuzzerUtilPosix.cpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn364913.orig/compiler-rt/lib/fuzzer/FuzzerUtilPosix.cpp
-+++ llvm-toolchain-snapshot_9~svn364913/compiler-rt/lib/fuzzer/FuzzerUtilPosix.cpp
+--- llvm-toolchain-9_9.0.0.orig/compiler-rt/lib/fuzzer/FuzzerUtilPosix.cpp
++++ llvm-toolchain-9_9.0.0/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~svn364913/compiler-rt/lib/fuzzer/FuzzerUtilPosi
      // ru_maxrss is in KiB
      return usage.ru_maxrss >> 10;
    } else if (LIBFUZZER_APPLE) {
-Index: llvm-toolchain-snapshot_9~svn364913/compiler-rt/lib/fuzzer/FuzzerExtraCounters.cpp
+Index: llvm-toolchain-9_9.0.0/compiler-rt/lib/fuzzer/FuzzerExtraCounters.cpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn364913.orig/compiler-rt/lib/fuzzer/FuzzerExtraCounters.cpp
-+++ llvm-toolchain-snapshot_9~svn364913/compiler-rt/lib/fuzzer/FuzzerExtraCounters.cpp
+--- llvm-toolchain-9_9.0.0.orig/compiler-rt/lib/fuzzer/FuzzerExtraCounters.cpp
++++ llvm-toolchain-9_9.0.0/compiler-rt/lib/fuzzer/FuzzerExtraCounters.cpp
 @@ -11,7 +11,7 @@
  #include "FuzzerDefs.h"
  
@@ -259,10 +259,10 @@ Index: llvm-toolchain-snapshot_9~svn364913/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~svn364913/compiler-rt/lib/fuzzer/FuzzerExtFunctionsWeak.cpp
+Index: llvm-toolchain-9_9.0.0/compiler-rt/lib/fuzzer/FuzzerExtFunctionsWeak.cpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn364913.orig/compiler-rt/lib/fuzzer/FuzzerExtFunctionsWeak.cpp
-+++ llvm-toolchain-snapshot_9~svn364913/compiler-rt/lib/fuzzer/FuzzerExtFunctionsWeak.cpp
+--- llvm-toolchain-9_9.0.0.orig/compiler-rt/lib/fuzzer/FuzzerExtFunctionsWeak.cpp
++++ llvm-toolchain-9_9.0.0/compiler-rt/lib/fuzzer/FuzzerExtFunctionsWeak.cpp
 @@ -13,7 +13,7 @@
  //===----------------------------------------------------------------------===//
  #include "FuzzerDefs.h"
@@ -272,10 +272,10 @@ Index: llvm-toolchain-snapshot_9~svn364913/compiler-rt/lib/fuzzer/FuzzerExtFunct
  
  #include "FuzzerExtFunctions.h"
  #include "FuzzerIO.h"
-Index: llvm-toolchain-snapshot_9~svn364913/compiler-rt/lib/fuzzer/FuzzerUtilLinux.cpp
+Index: llvm-toolchain-9_9.0.0/compiler-rt/lib/fuzzer/FuzzerUtilLinux.cpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn364913.orig/compiler-rt/lib/fuzzer/FuzzerUtilLinux.cpp
-+++ llvm-toolchain-snapshot_9~svn364913/compiler-rt/lib/fuzzer/FuzzerUtilLinux.cpp
+--- llvm-toolchain-9_9.0.0.orig/compiler-rt/lib/fuzzer/FuzzerUtilLinux.cpp
++++ llvm-toolchain-9_9.0.0/compiler-rt/lib/fuzzer/FuzzerUtilLinux.cpp
 @@ -9,7 +9,7 @@
  //===----------------------------------------------------------------------===//
  #include "FuzzerDefs.h"
@@ -285,10 +285,10 @@ Index: llvm-toolchain-snapshot_9~svn364913/compiler-rt/lib/fuzzer/FuzzerUtilLinu
  #include "FuzzerCommand.h"
  
  #include <stdlib.h>
-Index: llvm-toolchain-snapshot_9~svn364913/compiler-rt/lib/sanitizer_common/sanitizer_freebsd.h
+Index: llvm-toolchain-9_9.0.0/compiler-rt/lib/sanitizer_common/sanitizer_freebsd.h
 ===================================================================
---- llvm-toolchain-snapshot_9~svn364913.orig/compiler-rt/lib/sanitizer_common/sanitizer_freebsd.h
-+++ llvm-toolchain-snapshot_9~svn364913/compiler-rt/lib/sanitizer_common/sanitizer_freebsd.h
+--- llvm-toolchain-9_9.0.0.orig/compiler-rt/lib/sanitizer_common/sanitizer_freebsd.h
++++ llvm-toolchain-9_9.0.0/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~svn364913/compiler-rt/lib/sanitizer_common/sani
  #  include <link.h>
  #  include <sys/param.h>
  #  include <ucontext.h>
-Index: llvm-toolchain-snapshot_9~svn364913/compiler-rt/lib/sanitizer_common/sanitizer_procmaps_bsd.cc
+Index: llvm-toolchain-9_9.0.0/compiler-rt/lib/sanitizer_common/sanitizer_procmaps_bsd.cc
 ===================================================================
---- llvm-toolchain-snapshot_9~svn364913.orig/compiler-rt/lib/sanitizer_common/sanitizer_procmaps_bsd.cc
-+++ llvm-toolchain-snapshot_9~svn364913/compiler-rt/lib/sanitizer_common/sanitizer_procmaps_bsd.cc
+--- llvm-toolchain-9_9.0.0.orig/compiler-rt/lib/sanitizer_common/sanitizer_procmaps_bsd.cc
++++ llvm-toolchain-9_9.0.0/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~svn364913/compiler-rt/lib/sanitizer_common/sani
  #define kinfo_vmentry xkinfo_vmentry
  #endif
  #endif
-Index: llvm-toolchain-snapshot_9~svn364913/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
+Index: llvm-toolchain-9_9.0.0/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
 ===================================================================
---- llvm-toolchain-snapshot_9~svn364913.orig/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
-+++ llvm-toolchain-snapshot_9~svn364913/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
+--- llvm-toolchain-9_9.0.0.orig/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
++++ llvm-toolchain-9_9.0.0/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~svn364913/compiler-rt/lib/sanitizer_common/sani
  
  #ifndef __GLIBC_PREREQ
  #define __GLIBC_PREREQ(x, y) 0
-Index: llvm-toolchain-snapshot_9~svn364913/compiler-rt/lib/sanitizer_common/sanitizer_syscall_generic.inc
+Index: llvm-toolchain-9_9.0.0/compiler-rt/lib/sanitizer_common/sanitizer_syscall_generic.inc
 ===================================================================
---- llvm-toolchain-snapshot_9~svn364913.orig/compiler-rt/lib/sanitizer_common/sanitizer_syscall_generic.inc
-+++ llvm-toolchain-snapshot_9~svn364913/compiler-rt/lib/sanitizer_common/sanitizer_syscall_generic.inc
+--- llvm-toolchain-9_9.0.0.orig/compiler-rt/lib/sanitizer_common/sanitizer_syscall_generic.inc
++++ llvm-toolchain-9_9.0.0/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~svn364913/compiler-rt/lib/sanitizer_common/sani
  # define internal_syscall __syscall
  # else
  # define internal_syscall syscall
-Index: llvm-toolchain-snapshot_9~svn364913/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+Index: llvm-toolchain-9_9.0.0/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
 ===================================================================
---- llvm-toolchain-snapshot_9~svn364913.orig/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
-+++ llvm-toolchain-snapshot_9~svn364913/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+--- llvm-toolchain-9_9.0.0.orig/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
++++ llvm-toolchain-9_9.0.0/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 7f66ba40..ff9f5784 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/llvm/include/llvm/ADT/Triple.h
+Index: llvm-toolchain-9_9.0.0/llvm/include/llvm/ADT/Triple.h
 ===================================================================
---- llvm-toolchain-snapshot_9~svn358740.orig/llvm/include/llvm/ADT/Triple.h
-+++ llvm-toolchain-snapshot_9~svn358740/llvm/include/llvm/ADT/Triple.h
-@@ -159,7 +159,7 @@ public:
+--- llvm-toolchain-9_9.0.0.orig/llvm/include/llvm/ADT/Triple.h
++++ llvm-toolchain-9_9.0.0/llvm/include/llvm/ADT/Triple.h
+@@ -161,7 +161,7 @@ public:
      FreeBSD,
      Fuchsia,
      IOS,
@@ -11,7 +11,7 @@ Index: llvm-toolchain-snapshot_9~svn358740/llvm/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/llvm/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..a1b849c2 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-9_9.0.0/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-9_9.0.0.orig/libcxx/include/__config
++++ llvm-toolchain-9_9.0.0/libcxx/include/__config
+@@ -1065,6 +1065,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 6946bb39..62690578 100644
--- a/debian/patches/kfreebsd/kfreebsd-openmp.diff
+++ b/debian/patches/kfreebsd/kfreebsd-openmp.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_9~svn359759/openmp/runtime/src/kmp.h
+Index: llvm-toolchain-9_9.0.0/openmp/runtime/src/kmp.h
 ===================================================================
---- llvm-toolchain-snapshot_9~svn359759.orig/openmp/runtime/src/kmp.h
-+++ llvm-toolchain-snapshot_9~svn359759/openmp/runtime/src/kmp.h
-@@ -1177,6 +1177,10 @@ extern kmp_uint64 __kmp_now_nsec();
+--- llvm-toolchain-9_9.0.0.orig/openmp/runtime/src/kmp.h
++++ llvm-toolchain-9_9.0.0/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   */
  #define KMP_NEXT_WAIT 512U /* susequent number of spin-tests */
@@ -13,11 +13,11 @@ Index: llvm-toolchain-snapshot_9~svn359759/openmp/runtime/src/kmp.h
  #endif
  
  #if KMP_ARCH_X86 || KMP_ARCH_X86_64
-Index: llvm-toolchain-snapshot_9~svn359759/openmp/runtime/src/kmp_ftn_entry.h
+Index: llvm-toolchain-9_9.0.0/openmp/runtime/src/kmp_ftn_entry.h
 ===================================================================
---- llvm-toolchain-snapshot_9~svn359759.orig/openmp/runtime/src/kmp_ftn_entry.h
-+++ llvm-toolchain-snapshot_9~svn359759/openmp/runtime/src/kmp_ftn_entry.h
-@@ -535,7 +535,7 @@ int FTN_STDCALL KMP_EXPAND_NAME(FTN_GET_
+--- llvm-toolchain-9_9.0.0.orig/openmp/runtime/src/kmp_ftn_entry.h
++++ llvm-toolchain-9_9.0.0/openmp/runtime/src/kmp_ftn_entry.h
+@@ -531,7 +531,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~svn359759/openmp/runtime/src/kmp_ftn_entry.h
    gtid = __kmp_entry_gtid();
  #elif KMP_OS_WINDOWS
    if (!__kmp_init_parallel ||
-Index: llvm-toolchain-snapshot_9~svn359759/openmp/runtime/src/kmp_platform.h
+Index: llvm-toolchain-9_9.0.0/openmp/runtime/src/kmp_platform.h
 ===================================================================
---- llvm-toolchain-snapshot_9~svn359759.orig/openmp/runtime/src/kmp_platform.h
-+++ llvm-toolchain-snapshot_9~svn359759/openmp/runtime/src/kmp_platform.h
+--- llvm-toolchain-9_9.0.0.orig/openmp/runtime/src/kmp_platform.h
++++ llvm-toolchain-9_9.0.0/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~svn359759/openmp/runtime/src/kmp_platform.h
  #undef KMP_OS_UNIX
  #define KMP_OS_UNIX 1
  #endif
-Index: llvm-toolchain-snapshot_9~svn359759/openmp/runtime/src/kmp_runtime.cpp
+Index: llvm-toolchain-9_9.0.0/openmp/runtime/src/kmp_runtime.cpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn359759.orig/openmp/runtime/src/kmp_runtime.cpp
-+++ llvm-toolchain-snapshot_9~svn359759/openmp/runtime/src/kmp_runtime.cpp
-@@ -8228,7 +8228,7 @@ __kmp_determine_reduction_method(
+--- llvm-toolchain-9_9.0.0.orig/openmp/runtime/src/kmp_runtime.cpp
++++ llvm-toolchain-9_9.0.0/openmp/runtime/src/kmp_runtime.cpp
+@@ -8026,7 +8026,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~svn359759/openmp/runtime/src/kmp_runtime.cpp
  
      int teamsize_cutoff = 4;
  
-@@ -8256,7 +8256,7 @@ __kmp_determine_reduction_method(
+@@ -8054,7 +8054,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~svn359759/openmp/runtime/src/kmp_runtime.cpp
  
      // basic tuning
  
-Index: llvm-toolchain-snapshot_9~svn359759/openmp/runtime/src/z_Linux_util.cpp
+Index: llvm-toolchain-9_9.0.0/openmp/runtime/src/z_Linux_util.cpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn359759.orig/openmp/runtime/src/z_Linux_util.cpp
-+++ llvm-toolchain-snapshot_9~svn359759/openmp/runtime/src/z_Linux_util.cpp
+--- llvm-toolchain-9_9.0.0.orig/openmp/runtime/src/z_Linux_util.cpp
++++ llvm-toolchain-9_9.0.0/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~svn359759/openmp/runtime/src/z_Linux_util.cpp
    void *volatile padding = 0;
  #endif
    int gtid;
-@@ -1758,7 +1758,7 @@ static int __kmp_get_xproc(void) {
+@@ -1766,7 +1766,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~svn359759/openmp/runtime/src/z_Linux_util.cpp
  
    r = sysconf(_SC_NPROCESSORS_ONLN);
  
-@@ -1953,7 +1953,7 @@ int __kmp_is_address_mapped(void *addr)
+@@ -1972,7 +1972,7 @@ int __kmp_is_address_mapped(void *addr)
    int found = 0;
    int rc;
  
diff --git a/debian/patches/kfreebsd/kfreebsd-threads-build.diff b/debian/patches/kfreebsd/kfreebsd-threads-build.diff
index 77ded844..63cff327 100644
--- a/debian/patches/kfreebsd/kfreebsd-threads-build.diff
+++ b/debian/patches/kfreebsd/kfreebsd-threads-build.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_9~svn353038/libcxx/src/thread.cpp
+Index: llvm-toolchain-9_9.0.0/libcxx/src/thread.cpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn353038.orig/libcxx/src/thread.cpp
-+++ llvm-toolchain-snapshot_9~svn353038/libcxx/src/thread.cpp
+--- llvm-toolchain-9_9.0.0.orig/libcxx/src/thread.cpp
++++ llvm-toolchain-9_9.0.0/libcxx/src/thread.cpp
 @@ -18,7 +18,7 @@
  
  #if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
diff --git a/debian/patches/kfreebsd/kfreebsd-triple-clang.diff b/debian/patches/kfreebsd/kfreebsd-triple-clang.diff
index 54203683..3ba4de77 100644
--- a/debian/patches/kfreebsd/kfreebsd-triple-clang.diff
+++ b/debian/patches/kfreebsd/kfreebsd-triple-clang.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_9~svn358740/clang/lib/Driver/CMakeLists.txt
+Index: llvm-toolchain-9_9.0.0/clang/lib/Driver/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_9~svn358740.orig/clang/lib/Driver/CMakeLists.txt
-+++ llvm-toolchain-snapshot_9~svn358740/clang/lib/Driver/CMakeLists.txt
+--- llvm-toolchain-9_9.0.0.orig/clang/lib/Driver/CMakeLists.txt
++++ llvm-toolchain-9_9.0.0/clang/lib/Driver/CMakeLists.txt
 @@ -49,6 +49,7 @@ add_clang_library(clangDriver
    ToolChains/HIP.cpp
    ToolChains/Hexagon.cpp
@@ -10,10 +10,10 @@ Index: llvm-toolchain-snapshot_9~svn358740/clang/lib/Driver/CMakeLists.txt
    ToolChains/Linux.cpp
    ToolChains/MipsLinux.cpp
    ToolChains/MinGW.cpp
-Index: llvm-toolchain-snapshot_9~svn358740/clang/lib/Driver/Driver.cpp
+Index: llvm-toolchain-9_9.0.0/clang/lib/Driver/Driver.cpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn358740.orig/clang/lib/Driver/Driver.cpp
-+++ llvm-toolchain-snapshot_9~svn358740/clang/lib/Driver/Driver.cpp
+--- llvm-toolchain-9_9.0.0.orig/clang/lib/Driver/Driver.cpp
++++ llvm-toolchain-9_9.0.0/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~svn358740/clang/lib/Driver/Driver.cpp
  #include "ToolChains/Lanai.h"
  #include "ToolChains/Linux.h"
  #include "ToolChains/MSP430.h"
-@@ -4564,6 +4565,9 @@ const ToolChain &Driver::getToolChain(co
+@@ -4617,6 +4618,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~svn358740/clang/lib/Driver/Driver.cpp
      case llvm::Triple::Minix:
        TC = llvm::make_unique<toolchains::Minix>(*this, Target, Args);
        break;
-Index: llvm-toolchain-snapshot_9~svn358740/clang/lib/Driver/ToolChains/Clang.cpp
+Index: llvm-toolchain-9_9.0.0/clang/lib/Driver/ToolChains/Clang.cpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn358740.orig/clang/lib/Driver/ToolChains/Clang.cpp
-+++ llvm-toolchain-snapshot_9~svn358740/clang/lib/Driver/ToolChains/Clang.cpp
-@@ -547,7 +547,7 @@ static bool useFramePointerForTargetByDe
+--- llvm-toolchain-9_9.0.0.orig/clang/lib/Driver/ToolChains/Clang.cpp
++++ llvm-toolchain-9_9.0.0/clang/lib/Driver/ToolChains/Clang.cpp
+@@ -538,7 +538,7 @@ static bool useFramePointerForTargetByDe
    }
  
    if (Triple.isOSLinux() || Triple.getOS() == llvm::Triple::CloudABI ||
@@ -45,11 +45,11 @@ Index: llvm-toolchain-snapshot_9~svn358740/clang/lib/Driver/ToolChains/Clang.cpp
      switch (Triple.getArch()) {
      // Don't use a frame pointer on linux if optimizing for certain targets.
      case llvm::Triple::mips64:
-Index: llvm-toolchain-snapshot_9~svn358740/clang/lib/Driver/ToolChains/Gnu.cpp
+Index: llvm-toolchain-9_9.0.0/clang/lib/Driver/ToolChains/Gnu.cpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn358740.orig/clang/lib/Driver/ToolChains/Gnu.cpp
-+++ llvm-toolchain-snapshot_9~svn358740/clang/lib/Driver/ToolChains/Gnu.cpp
-@@ -541,6 +541,20 @@ void tools::gnutools::Linker::ConstructJ
+--- llvm-toolchain-9_9.0.0.orig/clang/lib/Driver/ToolChains/Gnu.cpp
++++ llvm-toolchain-9_9.0.0/clang/lib/Driver/ToolChains/Gnu.cpp
+@@ -574,6 +574,20 @@ void tools::gnutools::Linker::ConstructJ
  
        if (!Args.hasArg(options::OPT_nolibc))
          CmdArgs.push_back("-lc");
@@ -70,7 +70,7 @@ Index: llvm-toolchain-snapshot_9~svn358740/clang/lib/Driver/ToolChains/Gnu.cpp
  
        // Add IAMCU specific libs, if needed.
        if (IsIAMCU)
-@@ -1924,7 +1938,8 @@ void Generic_GCC::GCCInstallationDetecto
+@@ -1955,7 +1969,8 @@ void Generic_GCC::GCCInstallationDetecto
        "x86_64-redhat-linux",    "x86_64-suse-linux",
        "x86_64-manbo-linux-gnu", "x86_64-linux-gnu",
        "x86_64-slackware-linux", "x86_64-unknown-linux",
@@ -80,7 +80,7 @@ Index: llvm-toolchain-snapshot_9~svn358740/clang/lib/Driver/ToolChains/Gnu.cpp
    static const char *const X32LibDirs[] = {"/libx32"};
    static const char *const X86LibDirs[] = {"/lib32", "/lib"};
    static const char *const X86Triples[] = {
-@@ -1933,7 +1948,9 @@ void Generic_GCC::GCCInstallationDetecto
+@@ -1964,7 +1979,9 @@ void Generic_GCC::GCCInstallationDetecto
        "i586-redhat-linux",    "i386-redhat-linux",     "i586-suse-linux",
        "i486-slackware-linux", "i686-montavista-linux", "i586-linux-gnu",
        "i686-linux-android",   "i386-gnu",              "i486-gnu",
@@ -91,10 +91,10 @@ Index: llvm-toolchain-snapshot_9~svn358740/clang/lib/Driver/ToolChains/Gnu.cpp
  
    static const char *const MIPSLibDirs[] = {"/lib"};
    static const char *const MIPSTriples[] = {
-Index: llvm-toolchain-snapshot_9~svn358740/clang/lib/Driver/ToolChains/KFreeBSD.cpp
+Index: llvm-toolchain-9_9.0.0/clang/lib/Driver/ToolChains/KFreeBSD.cpp
 ===================================================================
 --- /dev/null
-+++ llvm-toolchain-snapshot_9~svn358740/clang/lib/Driver/ToolChains/KFreeBSD.cpp
++++ llvm-toolchain-9_9.0.0/clang/lib/Driver/ToolChains/KFreeBSD.cpp
 @@ -0,0 +1,458 @@
 +//===--- KFreeBSD.cpp - kFreeBSD ToolChain Implementations --------*- C++ -*-===//
 +//
@@ -554,10 +554,10 @@ Index: llvm-toolchain-snapshot_9~svn358740/clang/lib/Driver/ToolChains/KFreeBSD.
 +  return Res;
 +}
 +
-Index: llvm-toolchain-snapshot_9~svn358740/clang/lib/Driver/ToolChains/KFreeBSD.h
+Index: llvm-toolchain-9_9.0.0/clang/lib/Driver/ToolChains/KFreeBSD.h
 ===================================================================
 --- /dev/null
-+++ llvm-toolchain-snapshot_9~svn358740/clang/lib/Driver/ToolChains/KFreeBSD.h
++++ llvm-toolchain-9_9.0.0/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 33c12b3d..50b1ae62 100644
--- a/debian/patches/kfreebsd/kfreebsd-triple.diff
+++ b/debian/patches/kfreebsd/kfreebsd-triple.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_9~svn358740/llvm/unittests/ADT/TripleTest.cpp
+Index: llvm-toolchain-9_9.0.0/llvm/unittests/ADT/TripleTest.cpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn358740.orig/llvm/unittests/ADT/TripleTest.cpp
-+++ llvm-toolchain-snapshot_9~svn358740/llvm/unittests/ADT/TripleTest.cpp
+--- llvm-toolchain-9_9.0.0.orig/llvm/unittests/ADT/TripleTest.cpp
++++ llvm-toolchain-9_9.0.0/llvm/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 89a18376..b9bc2ae6 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/llvm/lib/Support/Triple.cpp
+Index: llvm-toolchain-9_9.0.0/llvm/lib/Support/Triple.cpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn358740.orig/llvm/lib/Support/Triple.cpp
-+++ llvm-toolchain-snapshot_9~svn358740/llvm/lib/Support/Triple.cpp
-@@ -181,7 +181,7 @@ StringRef Triple::getOSTypeName(OSType K
+--- llvm-toolchain-9_9.0.0.orig/llvm/lib/Support/Triple.cpp
++++ llvm-toolchain-9_9.0.0/llvm/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/llvm/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/llvm/lib/Support/Triple.cpp
      .StartsWith("linux", Triple::Linux)
      .StartsWith("lv2", Triple::Lv2)
      .StartsWith("macos", Triple::MacOSX)
-Index: llvm-toolchain-snapshot_9~svn358740/llvm/lib/Support/Unix/Path.inc
+Index: llvm-toolchain-9_9.0.0/llvm/lib/Support/Unix/Path.inc
 ===================================================================
---- llvm-toolchain-snapshot_9~svn358740.orig/llvm/lib/Support/Unix/Path.inc
-+++ llvm-toolchain-snapshot_9~svn358740/llvm/lib/Support/Unix/Path.inc
+--- llvm-toolchain-9_9.0.0.orig/llvm/lib/Support/Unix/Path.inc
++++ llvm-toolchain-9_9.0.0/llvm/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 662d63ad..58dfb0ae 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/llvm/lib/Target/X86/X86Subtarget.cpp
+Index: llvm-toolchain-9_9.0.0/llvm/lib/Target/X86/X86Subtarget.cpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn358740.orig/llvm/lib/Target/X86/X86Subtarget.cpp
-+++ llvm-toolchain-snapshot_9~svn358740/llvm/lib/Target/X86/X86Subtarget.cpp
-@@ -284,7 +284,7 @@ void X86Subtarget::initSubtargetFeatures
+--- llvm-toolchain-9_9.0.0.orig/llvm/lib/Target/X86/X86Subtarget.cpp
++++ llvm-toolchain-9_9.0.0/llvm/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/llvm/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/llvm/lib/Target/X86/X86Subtarget.h
+Index: llvm-toolchain-9_9.0.0/llvm/lib/Target/X86/X86Subtarget.h
 ===================================================================
---- llvm-toolchain-snapshot_9~svn358740.orig/llvm/lib/Target/X86/X86Subtarget.h
-+++ llvm-toolchain-snapshot_9~svn358740/llvm/lib/Target/X86/X86Subtarget.h
-@@ -738,7 +738,7 @@ public:
+--- llvm-toolchain-9_9.0.0.orig/llvm/lib/Target/X86/X86Subtarget.h
++++ llvm-toolchain-9_9.0.0/llvm/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/lldb_source_Host_freebsd_Host.cpp.diff b/debian/patches/kfreebsd/lldb_source_Host_freebsd_Host.cpp.diff
index f38425a0..e45edde1 100644
--- a/debian/patches/kfreebsd/lldb_source_Host_freebsd_Host.cpp.diff
+++ b/debian/patches/kfreebsd/lldb_source_Host_freebsd_Host.cpp.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_9~svn353038/lldb/source/Host/freebsd/Host.cpp
+Index: llvm-toolchain-9_9.0.0/lldb/source/Host/freebsd/Host.cpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn353038.orig/lldb/source/Host/freebsd/Host.cpp
-+++ llvm-toolchain-snapshot_9~svn353038/lldb/source/Host/freebsd/Host.cpp
+--- llvm-toolchain-9_9.0.0.orig/lldb/source/Host/freebsd/Host.cpp
++++ llvm-toolchain-9_9.0.0/lldb/source/Host/freebsd/Host.cpp
 @@ -10,6 +10,13 @@
  #include <sys/types.h>
  
diff --git a/debian/patches/kfreebsd/lldb_source_Plugins_Process_FreeBSD.diff b/debian/patches/kfreebsd/lldb_source_Plugins_Process_FreeBSD.diff
index 1d219bc7..13ad9ceb 100644
--- a/debian/patches/kfreebsd/lldb_source_Plugins_Process_FreeBSD.diff
+++ b/debian/patches/kfreebsd/lldb_source_Plugins_Process_FreeBSD.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_9~svn353038/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.cpp
+Index: llvm-toolchain-9_9.0.0/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.cpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn353038.orig/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.cpp
-+++ llvm-toolchain-snapshot_9~svn353038/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.cpp
+--- llvm-toolchain-9_9.0.0.orig/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.cpp
++++ llvm-toolchain-9_9.0.0/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.cpp
 @@ -8,7 +8,9 @@
  
  #include <errno.h>
@@ -12,10 +12,10 @@ Index: llvm-toolchain-snapshot_9~svn353038/lldb/source/Plugins/Process/FreeBSD/F
  #include <stdlib.h>
  #include <sys/sysctl.h>
  #include <sys/types.h>
-Index: llvm-toolchain-snapshot_9~svn353038/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp
+Index: llvm-toolchain-9_9.0.0/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn353038.orig/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp
-+++ llvm-toolchain-snapshot_9~svn353038/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp
+--- llvm-toolchain-9_9.0.0.orig/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp
++++ llvm-toolchain-9_9.0.0/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp
 @@ -9,7 +9,9 @@
  
  #include <errno.h>
diff --git a/debian/patches/kfreebsd/tools_llvm-shlib_CMakeLists.txt.diff b/debian/patches/kfreebsd/tools_llvm-shlib_CMakeLists.txt.diff
index 0b2e7db6..b48cab79 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/llvm/tools/llvm-shlib/CMakeLists.txt
+Index: llvm-toolchain-9_9.0.0/llvm/tools/llvm-shlib/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_9~svn353038.orig/llvm/tools/llvm-shlib/CMakeLists.txt
-+++ llvm-toolchain-snapshot_9~svn353038/llvm/tools/llvm-shlib/CMakeLists.txt
-@@ -46,6 +46,7 @@ if(LLVM_BUILD_LLVM_DYLIB)
+--- llvm-toolchain-9_9.0.0.orig/llvm/tools/llvm-shlib/CMakeLists.txt
++++ llvm-toolchain-9_9.0.0/llvm/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-arm64.diff b/debian/patches/libcxx/libcxx-silent-failure-arm64.diff
index bdf5878a..8c9f5883 100644
--- a/debian/patches/libcxx/libcxx-silent-failure-arm64.diff
+++ b/debian/patches/libcxx/libcxx-silent-failure-arm64.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_9~svn357176/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp
+Index: llvm-toolchain-9_9.0.0/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn357176.orig/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp
-+++ llvm-toolchain-snapshot_9~svn357176/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp
+--- llvm-toolchain-9_9.0.0.orig/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp
++++ llvm-toolchain-9_9.0.0/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp
 @@ -7,6 +7,7 @@
  //===----------------------------------------------------------------------===//
  //
@@ -10,10 +10,10 @@ Index: llvm-toolchain-snapshot_9~svn357176/libcxx/test/std/thread/thread.conditi
  
  // FLAKY_TEST.
  
-Index: llvm-toolchain-snapshot_9~svn357176/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp
+Index: llvm-toolchain-9_9.0.0/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn357176.orig/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp
-+++ llvm-toolchain-snapshot_9~svn357176/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp
+--- llvm-toolchain-9_9.0.0.orig/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp
++++ llvm-toolchain-9_9.0.0/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp
 @@ -8,7 +8,7 @@
  //
  // UNSUPPORTED: libcpp-has-no-threads
diff --git a/debian/patches/libcxx/libcxx-silent-failure-ppc64el.diff b/debian/patches/libcxx/libcxx-silent-failure-ppc64el.diff
index 3a84f1ad..5e17da11 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-9_9.0.0/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-9_9.0.0.orig/libcxx/test/libcxx/atomics/atomics.align/align.pass.sh.cpp
++++ llvm-toolchain-9_9.0.0/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..1cdaf3ae 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-9_9.0.0/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-9_9.0.0.orig/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp
++++ llvm-toolchain-9_9.0.0/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-9_9.0.0/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-9_9.0.0.orig/libcxx/test/std/re/re.traits/isctype.pass.cpp
++++ llvm-toolchain-9_9.0.0/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-9_9.0.0/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-9_9.0.0.orig/libcxxabi/test/catch_multi_level_pointer.pass.cpp
++++ llvm-toolchain-9_9.0.0/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-9_9.0.0/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-9_9.0.0.orig/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp
++++ llvm-toolchain-9_9.0.0/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..112f0852 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-9_9.0.0/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-9_9.0.0.orig/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong.pass.cpp
++++ llvm-toolchain-9_9.0.0/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-9_9.0.0/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-9_9.0.0.orig/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong_explicit.pass.cpp
++++ llvm-toolchain-9_9.0.0/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-9_9.0.0/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-9_9.0.0.orig/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak.pass.cpp
++++ llvm-toolchain-9_9.0.0/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-9_9.0.0/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-9_9.0.0.orig/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak_explicit.pass.cpp
++++ llvm-toolchain-9_9.0.0/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..60358486 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-9_9.0.0/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-9_9.0.0.orig/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp
++++ llvm-toolchain-9_9.0.0/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-arm-ehabi-fix.patch b/debian/patches/libcxx/libcxxabi-arm-ehabi-fix.patch
index c476eb31..f4bc8e4c 100644
--- a/debian/patches/libcxx/libcxxabi-arm-ehabi-fix.patch
+++ b/debian/patches/libcxx/libcxxabi-arm-ehabi-fix.patch
@@ -7,10 +7,10 @@ sure their ABI stays in sync.
 
 No known upstream bug about this.
 
-Index: llvm-toolchain-snapshot_9~svn353687/libcxxabi/src/cxa_exception.cpp
+Index: llvm-toolchain-9_9.0.0/libcxxabi/src/cxa_exception.cpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn353687.orig/libcxxabi/src/cxa_exception.cpp
-+++ llvm-toolchain-snapshot_9~svn353687/libcxxabi/src/cxa_exception.cpp
+--- llvm-toolchain-9_9.0.0.orig/libcxxabi/src/cxa_exception.cpp
++++ llvm-toolchain-9_9.0.0/libcxxabi/src/cxa_exception.cpp
 @@ -276,15 +276,16 @@ __cxa_throw(void *thrown_object, std::ty
  
  #ifdef __USING_SJLJ_EXCEPTIONS__
@@ -66,10 +66,10 @@ Index: llvm-toolchain-snapshot_9~svn353687/libcxxabi/src/cxa_exception.cpp
  #endif
          // Some sort of unwinding error.  Note that terminate is a handler.
          __cxa_begin_catch(&dep_exception_header->unwindHeader);
-Index: llvm-toolchain-snapshot_9~svn353687/libcxxabi/src/cxa_exception.hpp
+Index: llvm-toolchain-9_9.0.0/libcxxabi/src/cxa_exception.hpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn353687.orig/libcxxabi/src/cxa_exception.hpp
-+++ llvm-toolchain-snapshot_9~svn353687/libcxxabi/src/cxa_exception.hpp
+--- llvm-toolchain-9_9.0.0.orig/libcxxabi/src/cxa_exception.hpp
++++ llvm-toolchain-9_9.0.0/libcxxabi/src/cxa_exception.hpp
 @@ -27,6 +27,45 @@ uint64_t __getExceptionClass  (const _Un
  void     __setExceptionClass  (      _Unwind_Exception*, uint64_t);
  bool     __isOurExceptionClass(const _Unwind_Exception*);
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..29212715 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-9_9.0.0/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-9_9.0.0.orig/libcxxabi/test/test_demangle.pass.cpp
++++ llvm-toolchain-9_9.0.0/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/lldb-libname.diff b/debian/patches/lldb-libname.diff
index 26969f9b..b1a1b3e6 100644
--- a/debian/patches/lldb-libname.diff
+++ b/debian/patches/lldb-libname.diff
@@ -2,10 +2,10 @@
  lldb/scripts/Python/finishSwigPythonLLDB.py |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: llvm-toolchain-snapshot_9~svn339515/lldb/scripts/Python/finishSwigPythonLLDB.py
+Index: llvm-toolchain-9_9.0.0/lldb/scripts/Python/finishSwigPythonLLDB.py
 ===================================================================
---- llvm-toolchain-snapshot_9~svn339515.orig/lldb/scripts/Python/finishSwigPythonLLDB.py
-+++ llvm-toolchain-snapshot_9~svn339515/lldb/scripts/Python/finishSwigPythonLLDB.py
+--- llvm-toolchain-9_9.0.0.orig/lldb/scripts/Python/finishSwigPythonLLDB.py
++++ llvm-toolchain-9_9.0.0/lldb/scripts/Python/finishSwigPythonLLDB.py
 @@ -443,7 +443,7 @@ def make_symlink_liblldb(
              if eOSType == utilsOsType.EnumOsType.Darwin:
                  strLibFileExtn = ".dylib"
diff --git a/debian/patches/lldb-soname.diff b/debian/patches/lldb-soname.diff
index 4fa8cf62..f516580d 100644
--- a/debian/patches/lldb-soname.diff
+++ b/debian/patches/lldb-soname.diff
@@ -2,10 +2,10 @@
  lldb/source/API/CMakeLists.txt |   14 +++++++-------
  1 file changed, 7 insertions(+), 7 deletions(-)
 
-Index: llvm-toolchain-snapshot_9~svn365742/lldb/source/API/CMakeLists.txt
+Index: llvm-toolchain-9_9.0.0/lldb/source/API/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_9~svn365742.orig/lldb/source/API/CMakeLists.txt
-+++ llvm-toolchain-snapshot_9~svn365742/lldb/source/API/CMakeLists.txt
+--- llvm-toolchain-9_9.0.0.orig/lldb/source/API/CMakeLists.txt
++++ llvm-toolchain-9_9.0.0/lldb/source/API/CMakeLists.txt
 @@ -13,7 +13,12 @@ if(LLDB_BUILD_FRAMEWORK)
    set(option_install_prefix INSTALL_PREFIX ${LLDB_FRAMEWORK_INSTALL_DIR})
  endif()
diff --git a/debian/patches/lldb/lldb-addversion-suffix-to-llvm-server-exec.patch b/debian/patches/lldb/lldb-addversion-suffix-to-llvm-server-exec.patch
index 656afd42..b1a5ef75 100644
--- a/debian/patches/lldb/lldb-addversion-suffix-to-llvm-server-exec.patch
+++ b/debian/patches/lldb/lldb-addversion-suffix-to-llvm-server-exec.patch
@@ -12,11 +12,11 @@ which could then break something else.
 
 This probably should have upstream bug but I couldn't find any existing report.
 
-Index: llvm-toolchain-snapshot_9~svn352271/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
+Index: llvm-toolchain-9_9.0.0/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
 ===================================================================
---- llvm-toolchain-snapshot_9~svn352271.orig/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
-+++ llvm-toolchain-snapshot_9~svn352271/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
-@@ -32,13 +32,14 @@
+--- llvm-toolchain-9_9.0.0.orig/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
++++ llvm-toolchain-9_9.0.0/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
+@@ -33,13 +33,14 @@
  #include "lldb/Utility/StreamString.h"
  #include "llvm/ADT/SmallString.h"
  #include "llvm/Support/ScopedPrinter.h"
diff --git a/debian/patches/lldb/lldb-disable-swig-error.diff b/debian/patches/lldb/lldb-disable-swig-error.diff
index 15cda830..115bf74e 100644
--- a/debian/patches/lldb/lldb-disable-swig-error.diff
+++ b/debian/patches/lldb/lldb-disable-swig-error.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_9~svn351647/lldb/scripts/lldb.swig
+Index: llvm-toolchain-9_9.0.0/lldb/scripts/lldb.swig
 ===================================================================
---- llvm-toolchain-snapshot_9~svn351647.orig/lldb/scripts/lldb.swig
-+++ llvm-toolchain-snapshot_9~svn351647/lldb/scripts/lldb.swig
+--- llvm-toolchain-9_9.0.0.orig/lldb/scripts/lldb.swig
++++ llvm-toolchain-9_9.0.0/lldb/scripts/lldb.swig
 @@ -50,7 +50,7 @@ except ImportError:
  %enddef
  // These versions will not generate working python modules, so error out early.
diff --git a/debian/patches/lldb/lldb-link-atomic-cmake.patch b/debian/patches/lldb/lldb-link-atomic-cmake.patch
index bddeab87..c79c3405 100644
--- a/debian/patches/lldb/lldb-link-atomic-cmake.patch
+++ b/debian/patches/lldb/lldb-link-atomic-cmake.patch
@@ -6,10 +6,10 @@ Last-Update: 2016-07-27
  lldb/cmake/LLDBDependencies.cmake |    6 ++++++
  1 file changed, 6 insertions(+)
 
-Index: llvm-toolchain-snapshot_9~svn357377/lldb/source/Utility/CMakeLists.txt
+Index: llvm-toolchain-9_9.0.0/lldb/source/Utility/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_9~svn357377.orig/lldb/source/Utility/CMakeLists.txt
-+++ llvm-toolchain-snapshot_9~svn357377/lldb/source/Utility/CMakeLists.txt
+--- llvm-toolchain-9_9.0.0.orig/lldb/source/Utility/CMakeLists.txt
++++ llvm-toolchain-9_9.0.0/lldb/source/Utility/CMakeLists.txt
 @@ -2,6 +2,13 @@ set(LLDB_SYSTEM_LIBS)
  
  list(APPEND LLDB_SYSTEM_LIBS ${system_libs})
diff --git a/debian/patches/lldb/lldb-missing-install.diff b/debian/patches/lldb/lldb-missing-install.diff
index 1fa04eba..db7dc425 100644
--- a/debian/patches/lldb/lldb-missing-install.diff
+++ b/debian/patches/lldb/lldb-missing-install.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_9~svn365742/lldb/tools/argdumper/CMakeLists.txt
+Index: llvm-toolchain-9_9.0.0/lldb/tools/argdumper/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_9~svn365742.orig/lldb/tools/argdumper/CMakeLists.txt
-+++ llvm-toolchain-snapshot_9~svn365742/lldb/tools/argdumper/CMakeLists.txt
+--- llvm-toolchain-9_9.0.0.orig/lldb/tools/argdumper/CMakeLists.txt
++++ llvm-toolchain-9_9.0.0/lldb/tools/argdumper/CMakeLists.txt
 @@ -4,3 +4,6 @@ add_lldb_tool(lldb-argdumper ADD_TO_FRAM
    LINK_LIBS
      lldbUtility
@@ -9,10 +9,10 @@ Index: llvm-toolchain-snapshot_9~svn365742/lldb/tools/argdumper/CMakeLists.txt
 +
 +install(TARGETS lldb-argdumper
 +  RUNTIME DESTINATION bin)
-Index: llvm-toolchain-snapshot_9~svn365742/lldb/tools/lldb-server/CMakeLists.txt
+Index: llvm-toolchain-9_9.0.0/lldb/tools/lldb-server/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_9~svn365742.orig/lldb/tools/lldb-server/CMakeLists.txt
-+++ llvm-toolchain-snapshot_9~svn365742/lldb/tools/lldb-server/CMakeLists.txt
+--- llvm-toolchain-9_9.0.0.orig/lldb/tools/lldb-server/CMakeLists.txt
++++ llvm-toolchain-9_9.0.0/lldb/tools/lldb-server/CMakeLists.txt
 @@ -77,3 +77,7 @@ add_lldb_tool(lldb-server
  )
  
diff --git a/debian/patches/mips-fpxx-enable.diff b/debian/patches/mips-fpxx-enable.diff
index 771b9058..cd81b903 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-9_9.0.0/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-9_9.0.0.orig/clang/lib/Driver/ToolChains/Arch/Mips.cpp
++++ llvm-toolchain-9_9.0.0/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..5b125395 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-9_9.0.0/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-9_9.0.0.orig/openmp/runtime/CMakeLists.txt
++++ llvm-toolchain-9_9.0.0/openmp/runtime/CMakeLists.txt
+@@ -338,7 +338,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..dd5b921e 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-9_9.0.0/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-9_9.0.0.orig/openmp/runtime/src/CMakeLists.txt
++++ llvm-toolchain-9_9.0.0/openmp/runtime/src/CMakeLists.txt
+@@ -170,7 +170,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..9584ba0a 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-9_9.0.0/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-9_9.0.0.orig/openmp/runtime/tools/check-execstack.pl
++++ llvm-toolchain-9_9.0.0/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..79bbd01f 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-9_9.0.0/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-9_9.0.0.orig/openmp/runtime/src/kmp_affinity.h
++++ llvm-toolchain-9_9.0.0/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 605c07ae..0f85dba4 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_9~svn342269/clang/bindings/python/clang/cindex.py
+Index: llvm-toolchain-9_9.0.0/clang/bindings/python/clang/cindex.py
 ===================================================================
---- llvm-toolchain-snapshot_9~svn342269.orig/clang/bindings/python/clang/cindex.py
-+++ llvm-toolchain-snapshot_9~svn342269/clang/bindings/python/clang/cindex.py
-@@ -4144,7 +4144,7 @@ class Config:
+--- llvm-toolchain-9_9.0.0.orig/clang/bindings/python/clang/cindex.py
++++ llvm-toolchain-9_9.0.0/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..010cd11d 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-9_9.0.0/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-9_9.0.0.orig/clang/docs/CommandGuide/clang.rst
++++ llvm-toolchain-9_9.0.0/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/remove-test-freezing.diff b/debian/patches/remove-test-freezing.diff
index f34afe65..2d41d8ed 100644
--- a/debian/patches/remove-test-freezing.diff
+++ b/debian/patches/remove-test-freezing.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_7~svn335949/compiler-rt/test/sanitizer_common/TestCases/Linux/sysconf_interceptor_bypass_test.cc
+Index: llvm-toolchain-9_9.0.0/compiler-rt/test/sanitizer_common/TestCases/Linux/sysconf_interceptor_bypass_test.cc
 ===================================================================
---- llvm-toolchain-snapshot_7~svn335949.orig/compiler-rt/test/sanitizer_common/TestCases/Linux/sysconf_interceptor_bypass_test.cc
-+++ llvm-toolchain-snapshot_7~svn335949/compiler-rt/test/sanitizer_common/TestCases/Linux/sysconf_interceptor_bypass_test.cc
+--- llvm-toolchain-9_9.0.0.orig/compiler-rt/test/sanitizer_common/TestCases/Linux/sysconf_interceptor_bypass_test.cc
++++ llvm-toolchain-9_9.0.0/compiler-rt/test/sanitizer_common/TestCases/Linux/sysconf_interceptor_bypass_test.cc
 @@ -1,29 +0,0 @@
 -// RUN: %clangxx -O2 %s -o %t && %run %t 2>&1 | FileCheck %s
 -
diff --git a/debian/patches/scan-build-clang-path.diff b/debian/patches/scan-build-clang-path.diff
index 46c5d71d..bd6ed68c 100644
--- a/debian/patches/scan-build-clang-path.diff
+++ b/debian/patches/scan-build-clang-path.diff
@@ -2,10 +2,10 @@
  clang/tools/scan-build/bin/scan-build |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: llvm-toolchain-snapshot_9~svn356328/clang/tools/scan-build/bin/scan-build
+Index: llvm-toolchain-9_9.0.0/clang/tools/scan-build/bin/scan-build
 ===================================================================
---- llvm-toolchain-snapshot_9~svn356328.orig/clang/tools/scan-build/bin/scan-build
-+++ llvm-toolchain-snapshot_9~svn356328/clang/tools/scan-build/bin/scan-build
+--- llvm-toolchain-9_9.0.0.orig/clang/tools/scan-build/bin/scan-build
++++ llvm-toolchain-9_9.0.0/clang/tools/scan-build/bin/scan-build
 @@ -1477,7 +1477,7 @@ sub FindClang {
    if (!defined $Options{AnalyzerDiscoveryMethod}) {
      $Clang = Cwd::realpath("$RealBin/bin/clang") if (-f "$RealBin/bin/clang");
diff --git a/debian/patches/scan-view-fix-path.diff b/debian/patches/scan-view-fix-path.diff
index a37e6887..1f6f9e74 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-9_9.0.0/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-9_9.0.0.orig/clang/tools/scan-view/bin/scan-view
++++ llvm-toolchain-9_9.0.0/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/silent-MCJIIT-tests.diff b/debian/patches/silent-MCJIIT-tests.diff
index b6b67481..b8133e76 100644
--- a/debian/patches/silent-MCJIIT-tests.diff
+++ b/debian/patches/silent-MCJIIT-tests.diff
@@ -18,10 +18,10 @@
  test/Feature/load_module.ll                                             |    1 -
  17 files changed, 14 insertions(+), 17 deletions(-)
 
-Index: llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
+Index: llvm-toolchain-9_9.0.0/llvm/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn360997.orig/llvm/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
-+++ llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
+--- llvm-toolchain-9_9.0.0.orig/llvm/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
++++ llvm-toolchain-9_9.0.0/llvm/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
 @@ -1,5 +1,5 @@
  ; RUN: %lli -extra-module=%p/Inputs/cross-module-b.ll -relocation-model=pic -code-model=small %s > /dev/null
 -; XFAIL: mips-, mipsel-, i686, i386
@@ -29,10 +29,10 @@ Index: llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/MCJIT/cross
  
  declare i32 @FB()
  
-Index: llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
+Index: llvm-toolchain-9_9.0.0/llvm/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn360997.orig/llvm/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
-+++ llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
+--- llvm-toolchain-9_9.0.0.orig/llvm/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
++++ llvm-toolchain-9_9.0.0/llvm/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
 @@ -1,6 +1,6 @@
  ; REQUIRES: cxx-shared-library
  ; RUN: %lli -relocation-model=pic -code-model=large %s
@@ -41,10 +41,10 @@ Index: llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/MCJIT/eh-lg
  declare i8* @__cxa_allocate_exception(i64)
  declare void @__cxa_throw(i8*, i8*, i8*)
  declare i32 @__gxx_personality_v0(...)
-Index: llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
+Index: llvm-toolchain-9_9.0.0/llvm/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn360997.orig/llvm/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
-+++ llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
+--- llvm-toolchain-9_9.0.0.orig/llvm/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
++++ llvm-toolchain-9_9.0.0/llvm/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
 @@ -1,5 +1,5 @@
  ; RUN: %lli -extra-module=%p/Inputs/multi-module-b.ll -extra-module=%p/Inputs/multi-module-c.ll -relocation-model=pic -code-model=small %s > /dev/null
 -; XFAIL: mips-, mipsel-, i686, i386
@@ -52,10 +52,10 @@ Index: llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/MCJIT/multi
  
  declare i32 @FB()
  
-Index: llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
+Index: llvm-toolchain-9_9.0.0/llvm/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn360997.orig/llvm/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
-+++ llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
+--- llvm-toolchain-9_9.0.0.orig/llvm/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
++++ llvm-toolchain-9_9.0.0/llvm/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
 @@ -1,5 +1,5 @@
  ; RUN: %lli -disable-lazy-compilation=false -relocation-model=pic -code-model=small %s
 -; XFAIL: mips-, mipsel-, i686, i386, aarch64, arm
@@ -63,10 +63,10 @@ Index: llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/MCJIT/stubs
  
  define i32 @main() nounwind {
  entry:
-Index: llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll
+Index: llvm-toolchain-9_9.0.0/llvm/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn360997.orig/llvm/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll
-+++ llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll
+--- llvm-toolchain-9_9.0.0.orig/llvm/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll
++++ llvm-toolchain-9_9.0.0/llvm/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll
 @@ -1,5 +1,5 @@
  ; RUN: %lli -relocation-model=pic -code-model=small %s > /dev/null
 -; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386
@@ -74,10 +74,10 @@ Index: llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/MCJIT/test-
  
  @count = global i32 1, align 4
  
-Index: llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll
+Index: llvm-toolchain-9_9.0.0/llvm/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn360997.orig/llvm/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll
-+++ llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll
+--- llvm-toolchain-9_9.0.0.orig/llvm/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll
++++ llvm-toolchain-9_9.0.0/llvm/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll
 @@ -1,5 +1,5 @@
  ; RUN: %lli -O0 -relocation-model=pic -code-model=small %s
 -; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386
@@ -85,10 +85,10 @@ Index: llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/MCJIT/test-
  
  @.str = private unnamed_addr constant [6 x i8] c"data1\00", align 1
  @ptr = global i8* getelementptr inbounds ([6 x i8], [6 x i8]* @.str, i32 0, i32 0), align 4
-Index: llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll
+Index: llvm-toolchain-9_9.0.0/llvm/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn360997.orig/llvm/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll
-+++ llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll
+--- llvm-toolchain-9_9.0.0.orig/llvm/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll
++++ llvm-toolchain-9_9.0.0/llvm/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll
 @@ -1,5 +1,5 @@
  ; RUN: %lli -jit-kind=orc-mcjit -extra-module=%p/Inputs/cross-module-b.ll -relocation-model=pic -code-model=small %s > /dev/null
 -; XFAIL: mips-, mipsel-, i686, i386
@@ -96,10 +96,10 @@ Index: llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/OrcMCJIT/cr
  
  declare i32 @FB()
  
-Index: llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll
+Index: llvm-toolchain-9_9.0.0/llvm/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn360997.orig/llvm/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll
-+++ llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll
+--- llvm-toolchain-9_9.0.0.orig/llvm/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll
++++ llvm-toolchain-9_9.0.0/llvm/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll
 @@ -1,6 +1,6 @@
  ; REQUIRES: cxx-shared-library
  ; RUN: %lli -jit-kind=orc-mcjit -relocation-model=pic -code-model=large %s
@@ -108,10 +108,10 @@ Index: llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/OrcMCJIT/eh
  declare i8* @__cxa_allocate_exception(i64)
  declare void @__cxa_throw(i8*, i8*, i8*)
  declare i32 @__gxx_personality_v0(...)
-Index: llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll
+Index: llvm-toolchain-9_9.0.0/llvm/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn360997.orig/llvm/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll
-+++ llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll
+--- llvm-toolchain-9_9.0.0.orig/llvm/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll
++++ llvm-toolchain-9_9.0.0/llvm/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll
 @@ -1,5 +1,5 @@
  ; RUN: %lli -jit-kind=orc-mcjit -extra-module=%p/Inputs/multi-module-b.ll -extra-module=%p/Inputs/multi-module-c.ll -relocation-model=pic -code-model=small %s > /dev/null
 -; XFAIL: mips-, mipsel-, i686, i386
@@ -119,10 +119,10 @@ Index: llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/OrcMCJIT/mu
  
  declare i32 @FB()
  
-Index: llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll
+Index: llvm-toolchain-9_9.0.0/llvm/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn360997.orig/llvm/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll
-+++ llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll
+--- llvm-toolchain-9_9.0.0.orig/llvm/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll
++++ llvm-toolchain-9_9.0.0/llvm/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll
 @@ -1,6 +1,6 @@
  ; RUN: %lli -jit-kind=orc-mcjit -remote-mcjit -mcjit-remote-process=lli-child-target%exeext \
  ; RUN:   -relocation-model=pic -code-model=small %s > /dev/null
@@ -131,10 +131,10 @@ Index: llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/OrcMCJIT/re
  ; UNSUPPORTED: powerpc64-unknown-linux-gnu
  ; Remove UNSUPPORTED for powerpc64-unknown-linux-gnu if problem caused by r266663 is fixed
  
-Index: llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll
+Index: llvm-toolchain-9_9.0.0/llvm/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn360997.orig/llvm/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll
-+++ llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll
+--- llvm-toolchain-9_9.0.0.orig/llvm/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll
++++ llvm-toolchain-9_9.0.0/llvm/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll
 @@ -1,6 +1,6 @@
  ; RUN: %lli -jit-kind=orc-mcjit -remote-mcjit -mcjit-remote-process=lli-child-target%exeext \
  ; RUN:   -O0 -relocation-model=pic -code-model=small %s
@@ -143,10 +143,10 @@ Index: llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/OrcMCJIT/re
  ; UNSUPPORTED: powerpc64-unknown-linux-gnu
  ; Remove UNSUPPORTED for powerpc64-unknown-linux-gnu if problem caused by r266663 is fixed
  
-Index: llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll
+Index: llvm-toolchain-9_9.0.0/llvm/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn360997.orig/llvm/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll
-+++ llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll
+--- llvm-toolchain-9_9.0.0.orig/llvm/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll
++++ llvm-toolchain-9_9.0.0/llvm/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll
 @@ -1,5 +1,5 @@
  ; RUN: %lli -jit-kind=orc-mcjit -disable-lazy-compilation=false -relocation-model=pic -code-model=small %s
 -; XFAIL: mips-, mipsel-, i686, i386, aarch64, arm
@@ -154,10 +154,10 @@ Index: llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/OrcMCJIT/st
  
  define i32 @main() nounwind {
  entry:
-Index: llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll
+Index: llvm-toolchain-9_9.0.0/llvm/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn360997.orig/llvm/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll
-+++ llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll
+--- llvm-toolchain-9_9.0.0.orig/llvm/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll
++++ llvm-toolchain-9_9.0.0/llvm/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll
 @@ -1,5 +1,5 @@
  ; RUN: %lli -jit-kind=orc-mcjit -relocation-model=pic -code-model=small %s > /dev/null
 -; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386
@@ -165,10 +165,10 @@ Index: llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/OrcMCJIT/te
  
  @count = global i32 1, align 4
  
-Index: llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll
+Index: llvm-toolchain-9_9.0.0/llvm/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn360997.orig/llvm/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll
-+++ llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll
+--- llvm-toolchain-9_9.0.0.orig/llvm/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll
++++ llvm-toolchain-9_9.0.0/llvm/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll
 @@ -1,5 +1,5 @@
  ; RUN: %lli -jit-kind=orc-mcjit -O0 -relocation-model=pic -code-model=small %s
 -; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386
@@ -176,10 +176,10 @@ Index: llvm-toolchain-snapshot_9~svn360997/llvm/test/ExecutionEngine/OrcMCJIT/te
  
  @.str = private unnamed_addr constant [6 x i8] c"data1\00", align 1
  @ptr = global i8* getelementptr inbounds ([6 x i8], [6 x i8]* @.str, i32 0, i32 0), align 4
-Index: llvm-toolchain-snapshot_9~svn360997/llvm/test/Feature/load_module.ll
+Index: llvm-toolchain-9_9.0.0/llvm/test/Feature/load_module.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn360997.orig/llvm/test/Feature/load_module.ll
-+++ llvm-toolchain-snapshot_9~svn360997/llvm/test/Feature/load_module.ll
+--- llvm-toolchain-9_9.0.0.orig/llvm/test/Feature/load_module.ll
++++ llvm-toolchain-9_9.0.0/llvm/test/Feature/load_module.ll
 @@ -3,7 +3,6 @@
  ; RUN:   -disable-output 2>&1 | grep Hello
  ; REQUIRES: plugins
diff --git a/debian/patches/silent-amd-tet.diff b/debian/patches/silent-amd-tet.diff
index 324647d7..bfdc7343 100644
--- a/debian/patches/silent-amd-tet.diff
+++ b/debian/patches/silent-amd-tet.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_9~svn359674/llvm/test/MC/AMDGPU/hsa.s
+Index: llvm-toolchain-9_9.0.0/llvm/test/MC/AMDGPU/hsa.s
 ===================================================================
---- llvm-toolchain-snapshot_9~svn359674.orig/llvm/test/MC/AMDGPU/hsa.s
-+++ llvm-toolchain-snapshot_9~svn359674/llvm/test/MC/AMDGPU/hsa.s
+--- llvm-toolchain-9_9.0.0.orig/llvm/test/MC/AMDGPU/hsa.s
++++ llvm-toolchain-9_9.0.0/llvm/test/MC/AMDGPU/hsa.s
 @@ -1,5 +1,6 @@
  // RUN: llvm-mc -triple amdgcn--amdhsa -mcpu=kaveri -mattr=-code-object-v3 -show-encoding %s | FileCheck %s --check-prefix=ASM
  // RUN: llvm-mc -filetype=obj -triple amdgcn--amdhsa -mcpu=kaveri -mattr=-code-object-v3 -show-encoding %s | llvm-readobj --symbols -S --sd | FileCheck %s --check-prefix=ELF
diff --git a/debian/patches/silent-gold-test.diff b/debian/patches/silent-gold-test.diff
index 054f62a8..37e6ba75 100644
--- a/debian/patches/silent-gold-test.diff
+++ b/debian/patches/silent-gold-test.diff
@@ -12,10 +12,10 @@ Description: fails on debian unstable amd64
  ^
 
 
-Index: llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/start-lib-common.ll
+Index: llvm-toolchain-9_9.0.0/llvm/test/tools/gold/X86/start-lib-common.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn359674.orig/llvm/test/tools/gold/X86/start-lib-common.ll
-+++ llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/start-lib-common.ll
+--- llvm-toolchain-9_9.0.0.orig/llvm/test/tools/gold/X86/start-lib-common.ll
++++ llvm-toolchain-9_9.0.0/llvm/test/tools/gold/X86/start-lib-common.ll
 @@ -9,6 +9,7 @@
  ; RUN:    -shared %t1.o --start-lib %t2.o --end-lib -o %t3.o
  ; RUN: llvm-dis %t3.o -o - | FileCheck %s
@@ -24,10 +24,10 @@ Index: llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/start-lib-co
  target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
  @x = common global i32 0, align 4
  
-Index: llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/comdat.ll
+Index: llvm-toolchain-9_9.0.0/llvm/test/tools/gold/X86/comdat.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn359674.orig/llvm/test/tools/gold/X86/comdat.ll
-+++ llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/comdat.ll
+--- llvm-toolchain-9_9.0.0.orig/llvm/test/tools/gold/X86/comdat.ll
++++ llvm-toolchain-9_9.0.0/llvm/test/tools/gold/X86/comdat.ll
 @@ -5,6 +5,7 @@
  ; RUN:  -plugin-opt=save-temps
  ; RUN: FileCheck --check-prefix=RES %s < %t3.o.resolution.txt
diff --git a/debian/patches/silent-gold-utils.diff b/debian/patches/silent-gold-utils.diff
index c2b335e8..954ca276 100644
--- a/debian/patches/silent-gold-utils.diff
+++ b/debian/patches/silent-gold-utils.diff
@@ -15,10 +15,10 @@
  test/tools/gold/X86/visibility.ll                 |    1 +
  14 files changed, 19 insertions(+), 2 deletions(-)
 
-Index: llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/common_thinlto.ll
+Index: llvm-toolchain-9_9.0.0/llvm/test/tools/gold/X86/common_thinlto.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn359674.orig/llvm/test/tools/gold/X86/common_thinlto.ll
-+++ llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/common_thinlto.ll
+--- llvm-toolchain-9_9.0.0.orig/llvm/test/tools/gold/X86/common_thinlto.ll
++++ llvm-toolchain-9_9.0.0/llvm/test/tools/gold/X86/common_thinlto.ll
 @@ -17,6 +17,7 @@
  
  ; RUN: llvm-nm %t3 | FileCheck %s --check-prefix=NM
@@ -27,10 +27,10 @@ Index: llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/common_thinl
  
  source_filename = "common1.c"
  target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
-Index: llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/emit-llvm.ll
+Index: llvm-toolchain-9_9.0.0/llvm/test/tools/gold/X86/emit-llvm.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn359674.orig/llvm/test/tools/gold/X86/emit-llvm.ll
-+++ llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/emit-llvm.ll
+--- llvm-toolchain-9_9.0.0.orig/llvm/test/tools/gold/X86/emit-llvm.ll
++++ llvm-toolchain-9_9.0.0/llvm/test/tools/gold/X86/emit-llvm.ll
 @@ -21,6 +21,8 @@
  ; RUN: not test -a %t4.o
  
@@ -40,10 +40,10 @@ Index: llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/emit-llvm.ll
  
  target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
  target triple = "x86_64-unknown-linux-gnu"
-Index: llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/parallel.ll
+Index: llvm-toolchain-9_9.0.0/llvm/test/tools/gold/X86/parallel.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn359674.orig/llvm/test/tools/gold/X86/parallel.ll
-+++ llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/parallel.ll
+--- llvm-toolchain-9_9.0.0.orig/llvm/test/tools/gold/X86/parallel.ll
++++ llvm-toolchain-9_9.0.0/llvm/test/tools/gold/X86/parallel.ll
 @@ -5,6 +5,7 @@
  ; RUN: llvm-dis %t.1.5.precodegen.bc -o - | FileCheck --check-prefix=CHECK-BC1 %s
  ; RUN: llvm-nm %t.o | FileCheck --check-prefix=CHECK0 %s
@@ -52,10 +52,10 @@ Index: llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/parallel.ll
  
  target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
  target triple = "x86_64-unknown-linux-gnu"
-Index: llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/pr19901_thinlto.ll
+Index: llvm-toolchain-9_9.0.0/llvm/test/tools/gold/X86/pr19901_thinlto.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn359674.orig/llvm/test/tools/gold/X86/pr19901_thinlto.ll
-+++ llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/pr19901_thinlto.ll
+--- llvm-toolchain-9_9.0.0.orig/llvm/test/tools/gold/X86/pr19901_thinlto.ll
++++ llvm-toolchain-9_9.0.0/llvm/test/tools/gold/X86/pr19901_thinlto.ll
 @@ -4,6 +4,7 @@
  ; RUN:     --plugin-opt=thinlto \
  ; RUN:     -shared -m elf_x86_64 -o %t.so %t2.o %t.o
@@ -64,10 +64,10 @@ Index: llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/pr19901_thin
  
  ; CHECK:       Symbol {
  ; CHECK:         Name: f
-Index: llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/slp-vectorize.ll
+Index: llvm-toolchain-9_9.0.0/llvm/test/tools/gold/X86/slp-vectorize.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn359674.orig/llvm/test/tools/gold/X86/slp-vectorize.ll
-+++ llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/slp-vectorize.ll
+--- llvm-toolchain-9_9.0.0.orig/llvm/test/tools/gold/X86/slp-vectorize.ll
++++ llvm-toolchain-9_9.0.0/llvm/test/tools/gold/X86/slp-vectorize.ll
 @@ -7,6 +7,7 @@
  
  ; test that the vectorizer is run.
@@ -76,10 +76,10 @@ Index: llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/slp-vectoriz
  
  target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
  target triple = "x86_64-unknown-linux-gnu"
-Index: llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/strip_names.ll
+Index: llvm-toolchain-9_9.0.0/llvm/test/tools/gold/X86/strip_names.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn359674.orig/llvm/test/tools/gold/X86/strip_names.ll
-+++ llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/strip_names.ll
+--- llvm-toolchain-9_9.0.0.orig/llvm/test/tools/gold/X86/strip_names.ll
++++ llvm-toolchain-9_9.0.0/llvm/test/tools/gold/X86/strip_names.ll
 @@ -25,6 +25,7 @@
  ; NONAME:  %2 = load i32, i32* @GlobalValueName
  ; NONAME:  %3 = add i32 %0, %2
@@ -88,10 +88,10 @@ Index: llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/strip_names.
  
  target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
  target triple = "x86_64-unknown-linux-gnu"
-Index: llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/thinlto.ll
+Index: llvm-toolchain-9_9.0.0/llvm/test/tools/gold/X86/thinlto.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn359674.orig/llvm/test/tools/gold/X86/thinlto.ll
-+++ llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/thinlto.ll
+--- llvm-toolchain-9_9.0.0.orig/llvm/test/tools/gold/X86/thinlto.ll
++++ llvm-toolchain-9_9.0.0/llvm/test/tools/gold/X86/thinlto.ll
 @@ -141,6 +141,8 @@
  target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
  target triple = "x86_64-unknown-linux-gnu"
@@ -101,10 +101,10 @@ Index: llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/thinlto.ll
  declare void @g(...)
  
  define void @f() {
-Index: llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/thinlto_archive.ll
+Index: llvm-toolchain-9_9.0.0/llvm/test/tools/gold/X86/thinlto_archive.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn359674.orig/llvm/test/tools/gold/X86/thinlto_archive.ll
-+++ llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/thinlto_archive.ll
+--- llvm-toolchain-9_9.0.0.orig/llvm/test/tools/gold/X86/thinlto_archive.ll
++++ llvm-toolchain-9_9.0.0/llvm/test/tools/gold/X86/thinlto_archive.ll
 @@ -15,6 +15,7 @@
  ; RUN:    --plugin-opt=jobs=1 \
  ; RUN:    -shared %t.o %t.a -o %t4 2>&1 | FileCheck %s
@@ -113,10 +113,10 @@ Index: llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/thinlto_arch
  
  target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
  target triple = "x86_64-unknown-linux-gnu"
-Index: llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/thinlto_internalize.ll
+Index: llvm-toolchain-9_9.0.0/llvm/test/tools/gold/X86/thinlto_internalize.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn359674.orig/llvm/test/tools/gold/X86/thinlto_internalize.ll
-+++ llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/thinlto_internalize.ll
+--- llvm-toolchain-9_9.0.0.orig/llvm/test/tools/gold/X86/thinlto_internalize.ll
++++ llvm-toolchain-9_9.0.0/llvm/test/tools/gold/X86/thinlto_internalize.ll
 @@ -14,6 +14,8 @@
  ; h() should be internalized after promotion, and eliminated after inlining
  ; CHECK-NOT: @h.llvm.
@@ -126,10 +126,10 @@ Index: llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/thinlto_inte
  target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
  target triple = "x86_64-unknown-linux-gnu"
  define i32 @g() {
-Index: llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/thinlto_linkonceresolution.ll
+Index: llvm-toolchain-9_9.0.0/llvm/test/tools/gold/X86/thinlto_linkonceresolution.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn359674.orig/llvm/test/tools/gold/X86/thinlto_linkonceresolution.ll
-+++ llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/thinlto_linkonceresolution.ll
+--- llvm-toolchain-9_9.0.0.orig/llvm/test/tools/gold/X86/thinlto_linkonceresolution.ll
++++ llvm-toolchain-9_9.0.0/llvm/test/tools/gold/X86/thinlto_linkonceresolution.ll
 @@ -23,6 +23,8 @@
  ; OPT-NOT: @f()
  ; OPT2: define weak_odr hidden void @f()
@@ -139,10 +139,10 @@ Index: llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/thinlto_link
  target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
  target triple = "x86_64-unknown-linux-gnu"
  define i32 @g() {
-Index: llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/thinlto_weak_resolution.ll
+Index: llvm-toolchain-9_9.0.0/llvm/test/tools/gold/X86/thinlto_weak_resolution.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn359674.orig/llvm/test/tools/gold/X86/thinlto_weak_resolution.ll
-+++ llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/thinlto_weak_resolution.ll
+--- llvm-toolchain-9_9.0.0.orig/llvm/test/tools/gold/X86/thinlto_weak_resolution.ll
++++ llvm-toolchain-9_9.0.0/llvm/test/tools/gold/X86/thinlto_weak_resolution.ll
 @@ -9,6 +9,7 @@
  ; RUN:     --plugin-opt=save-temps \
  ; RUN:     -shared \
@@ -151,10 +151,10 @@ Index: llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/thinlto_weak
  
  ; RUN: llvm-nm %t3.o | FileCheck %s
  ; CHECK: weakfunc
-Index: llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/type-merge2.ll
+Index: llvm-toolchain-9_9.0.0/llvm/test/tools/gold/X86/type-merge2.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn359674.orig/llvm/test/tools/gold/X86/type-merge2.ll
-+++ llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/type-merge2.ll
+--- llvm-toolchain-9_9.0.0.orig/llvm/test/tools/gold/X86/type-merge2.ll
++++ llvm-toolchain-9_9.0.0/llvm/test/tools/gold/X86/type-merge2.ll
 @@ -6,6 +6,8 @@
  ; RUN:    -shared %t.o %t2.o -o %t3.o
  ; RUN: llvm-dis %t3.o.0.2.internalize.bc -o - | FileCheck %s
@@ -164,10 +164,10 @@ Index: llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/type-merge2.
  target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
  target triple = "x86_64-unknown-linux-gnu"
  
-Index: llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/vectorize.ll
+Index: llvm-toolchain-9_9.0.0/llvm/test/tools/gold/X86/vectorize.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn359674.orig/llvm/test/tools/gold/X86/vectorize.ll
-+++ llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/vectorize.ll
+--- llvm-toolchain-9_9.0.0.orig/llvm/test/tools/gold/X86/vectorize.ll
++++ llvm-toolchain-9_9.0.0/llvm/test/tools/gold/X86/vectorize.ll
 @@ -7,6 +7,7 @@
  
  ; test that the vectorizer is run.
@@ -176,10 +176,10 @@ Index: llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/vectorize.ll
  
  target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
  target triple = "x86_64-unknown-linux-gnu"
-Index: llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/visibility.ll
+Index: llvm-toolchain-9_9.0.0/llvm/test/tools/gold/X86/visibility.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn359674.orig/llvm/test/tools/gold/X86/visibility.ll
-+++ llvm-toolchain-snapshot_9~svn359674/llvm/test/tools/gold/X86/visibility.ll
+--- llvm-toolchain-9_9.0.0.orig/llvm/test/tools/gold/X86/visibility.ll
++++ llvm-toolchain-9_9.0.0/llvm/test/tools/gold/X86/visibility.ll
 @@ -16,6 +16,7 @@
  ; CHECK-NEXT: Other [
  ; CHECK-NEXT:   STV_PROTECTED
diff --git a/debian/patches/silent-llvm-isel-fuzzer.diff b/debian/patches/silent-llvm-isel-fuzzer.diff
index e3335312..bdc013e3 100644
--- a/debian/patches/silent-llvm-isel-fuzzer.diff
+++ b/debian/patches/silent-llvm-isel-fuzzer.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_9~svn360686/llvm/test/tools/llvm-isel-fuzzer/aarch64-execname-options.ll
+Index: llvm-toolchain-9_9.0.0/llvm/test/tools/llvm-isel-fuzzer/aarch64-execname-options.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn360686.orig/llvm/test/tools/llvm-isel-fuzzer/aarch64-execname-options.ll
-+++ llvm-toolchain-snapshot_9~svn360686/llvm/test/tools/llvm-isel-fuzzer/aarch64-execname-options.ll
+--- llvm-toolchain-9_9.0.0.orig/llvm/test/tools/llvm-isel-fuzzer/aarch64-execname-options.ll
++++ llvm-toolchain-9_9.0.0/llvm/test/tools/llvm-isel-fuzzer/aarch64-execname-options.ll
 @@ -2,6 +2,7 @@
  ; without copying the whole lib dir or polluting the build dir.
  ; REQUIRES: static-libs
@@ -10,10 +10,10 @@ Index: llvm-toolchain-snapshot_9~svn360686/llvm/test/tools/llvm-isel-fuzzer/aarc
  
  ; The above also applies if the binary is built with libc++.
  ; UNSUPPORTED: libcxx-used
-Index: llvm-toolchain-snapshot_9~svn360686/llvm/test/tools/llvm-isel-fuzzer/execname-options.ll
+Index: llvm-toolchain-9_9.0.0/llvm/test/tools/llvm-isel-fuzzer/execname-options.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn360686.orig/llvm/test/tools/llvm-isel-fuzzer/execname-options.ll
-+++ llvm-toolchain-snapshot_9~svn360686/llvm/test/tools/llvm-isel-fuzzer/execname-options.ll
+--- llvm-toolchain-9_9.0.0.orig/llvm/test/tools/llvm-isel-fuzzer/execname-options.ll
++++ llvm-toolchain-9_9.0.0/llvm/test/tools/llvm-isel-fuzzer/execname-options.ll
 @@ -1,6 +1,7 @@
  ; If the binary looks up libraries using an rpath, we can't test this
  ; without copying the whole lib dir or polluting the build dir.
diff --git a/debian/patches/silent-more-tests.diff b/debian/patches/silent-more-tests.diff
index be9279e3..febcff87 100644
--- a/debian/patches/silent-more-tests.diff
+++ b/debian/patches/silent-more-tests.diff
@@ -8,10 +8,10 @@
  test/Feature/load_module.ll               |    1 +
  4 files changed, 5 insertions(+), 1 deletion(-)
 
-Index: llvm-toolchain-snapshot_9~svn360997/llvm/test/BugPoint/metadata.ll
+Index: llvm-toolchain-9_9.0.0/llvm/test/BugPoint/metadata.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn360997.orig/llvm/test/BugPoint/metadata.ll
-+++ llvm-toolchain-snapshot_9~svn360997/llvm/test/BugPoint/metadata.ll
+--- llvm-toolchain-9_9.0.0.orig/llvm/test/BugPoint/metadata.ll
++++ llvm-toolchain-9_9.0.0/llvm/test/BugPoint/metadata.ll
 @@ -7,7 +7,8 @@
  ;
  ; RUN: bugpoint -load %llvmshlibdir/BugpointPasses%shlibext %s -output-prefix %t-notype -bugpoint-crashcalls -silence-passes -disable-namedmd-remove -disable-strip-debuginfo > /dev/null
@@ -22,10 +22,10 @@ Index: llvm-toolchain-snapshot_9~svn360997/llvm/test/BugPoint/metadata.ll
  ; Bugpoint should keep the call's metadata attached to the call.
  
  ; CHECK: call void @foo(), !dbg ![[LOC:[0-9]+]], !attach ![[CALL:[0-9]+]]
-Index: llvm-toolchain-snapshot_9~svn360997/llvm/test/Feature/load_module.ll
+Index: llvm-toolchain-9_9.0.0/llvm/test/Feature/load_module.ll
 ===================================================================
---- llvm-toolchain-snapshot_9~svn360997.orig/llvm/test/Feature/load_module.ll
-+++ llvm-toolchain-snapshot_9~svn360997/llvm/test/Feature/load_module.ll
+--- llvm-toolchain-9_9.0.0.orig/llvm/test/Feature/load_module.ll
++++ llvm-toolchain-9_9.0.0/llvm/test/Feature/load_module.ll
 @@ -3,6 +3,7 @@
  ; RUN:   -disable-output 2>&1 | grep Hello
  ; REQUIRES: plugins
diff --git a/debian/patches/silent-test-failing-codeverage.diff b/debian/patches/silent-test-failing-codeverage.diff
index 0d6b483f..c91852c0 100644
--- a/debian/patches/silent-test-failing-codeverage.diff
+++ b/debian/patches/silent-test-failing-codeverage.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_7~svn335581/llvm/test/ThinLTO/X86/autoupgrade.ll
+Index: llvm-toolchain-9_9.0.0/llvm/test/ThinLTO/X86/autoupgrade.ll
 ===================================================================
---- llvm-toolchain-snapshot_7~svn335581.orig/llvm/test/ThinLTO/X86/autoupgrade.ll
-+++ llvm-toolchain-snapshot_7~svn335581/llvm/test/ThinLTO/X86/autoupgrade.ll
+--- llvm-toolchain-9_9.0.0.orig/llvm/test/ThinLTO/X86/autoupgrade.ll
++++ llvm-toolchain-9_9.0.0/llvm/test/ThinLTO/X86/autoupgrade.ll
 @@ -19,6 +19,8 @@
  ; SUMMARYNAMES: ^2 = gv: (name: "globalfunc2",
  ; SUMMARYNAMES: ^3 = gv: (name: "globalfunc1"
diff --git a/debian/patches/silent-test-macho.diff b/debian/patches/silent-test-macho.diff
index f7667550..90777588 100644
--- a/debian/patches/silent-test-macho.diff
+++ b/debian/patches/silent-test-macho.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_9~svn360558/llvm/test/Object/macho-invalid.test
+Index: llvm-toolchain-9_9.0.0/llvm/test/Object/macho-invalid.test
 ===================================================================
---- llvm-toolchain-snapshot_9~svn360558.orig/llvm/test/Object/macho-invalid.test
-+++ llvm-toolchain-snapshot_9~svn360558/llvm/test/Object/macho-invalid.test
+--- llvm-toolchain-9_9.0.0.orig/llvm/test/Object/macho-invalid.test
++++ llvm-toolchain-9_9.0.0/llvm/test/Object/macho-invalid.test
 @@ -284,9 +284,6 @@ INVALID-DYLIB-WRONG-FILETYPE: macho-inva
  RUN: not llvm-objdump --macho --private-headers %p/Inputs/macho-invalid-dylib-no-id  2>&1 | FileCheck -check-prefix INVALID-DYLIB-NO-ID %s
  INVALID-DYLIB-NO-ID: macho-invalid-dylib-no-id': truncated or malformed object (no LC_ID_DYLIB load command in dynamic library filetype)
diff --git a/debian/patches/symbolizer-path.diff b/debian/patches/symbolizer-path.diff
index d431584f..8e039b08 100644
--- a/debian/patches/symbolizer-path.diff
+++ b/debian/patches/symbolizer-path.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-7-7/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc
+Index: llvm-toolchain-9_9.0.0/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc
 ===================================================================
---- llvm-toolchain-7-7.orig/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc
-+++ llvm-toolchain-7-7/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc
-@@ -26,6 +26,10 @@
+--- llvm-toolchain-9_9.0.0.orig/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc
++++ llvm-toolchain-9_9.0.0/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc
+@@ -25,6 +25,10 @@
  #include "sanitizer_symbolizer_internal.h"
  #include "sanitizer_symbolizer_libbacktrace.h"
  #include "sanitizer_symbolizer_mac.h"
@@ -13,7 +13,7 @@ Index: llvm-toolchain-7-7/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_
  
  #include <dlfcn.h>   // for dlsym()
  #include <errno.h>
-@@ -481,7 +485,7 @@ static SymbolizerTool *ChooseExternalSym
+@@ -480,7 +484,7 @@ static SymbolizerTool *ChooseExternalSym
      return new(*allocator) AtosSymbolizer(found_path, allocator);
    }
  #endif  // SANITIZER_MAC
diff --git a/debian/patches/test-keep-alive.diff b/debian/patches/test-keep-alive.diff
index 5003e650..80ff0a39 100644
--- a/debian/patches/test-keep-alive.diff
+++ b/debian/patches/test-keep-alive.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-5.0-5.0.1~+rc1/llvm/utils/lit/lit/ProgressBar.py
+Index: llvm-toolchain-9_9.0.0/llvm/utils/lit/lit/ProgressBar.py
 ===================================================================
---- llvm-toolchain-5.0-5.0.1~+rc1.orig/llvm/utils/lit/lit/ProgressBar.py
-+++ llvm-toolchain-5.0-5.0.1~+rc1/llvm/utils/lit/lit/ProgressBar.py
+--- llvm-toolchain-9_9.0.0.orig/llvm/utils/lit/lit/ProgressBar.py
++++ llvm-toolchain-9_9.0.0/llvm/utils/lit/lit/ProgressBar.py
 @@ -189,15 +189,7 @@ class SimpleProgressBar:
              return
  
diff --git a/debian/patches/unwind-chain-inclusion.diff b/debian/patches/unwind-chain-inclusion.diff
index 5e449701..b979e9fa 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-9_9.0.0/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-9_9.0.0.orig/clang/lib/Headers/unwind.h
++++ llvm-toolchain-9_9.0.0/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