From c22b2336ddf0b9a413eca464a33da5626f06d5df Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Tue, 20 Sep 2022 09:18:56 +0200
Subject: [PATCH] rebase of the patches

---
 ...e-Debian-provided-MathJax-everywhere.patch | 46 ++++++++---------
 debian/patches/26-set-correct-float-abi.diff  |  8 +--
 debian/patches/930008-arm.diff                |  8 +--
 .../clang-arm-default-vfp3-on-armv7a.patch    | 16 +++---
 debian/patches/clang-baseline-fix-i386.patch  |  8 +--
 debian/patches/clangd-atomic-cmake.patch      |  8 +--
 ...pilerrt-build-scudo-standalone-option.diff |  8 +--
 debian/patches/disable-sse2-old-x86.diff      |  8 +--
 debian/patches/hurd/hurd-pathmax.diff         | 20 ++++----
 debian/patches/issue-54242.diff               |  8 +--
 debian/patches/libcxx-armhf-ftbfs.diff        |  8 +--
 .../libcxx-libatomic-only-with-gcc-rtlib.diff |  8 +--
 ...bcxx-test-fix-lockfree-test-for-i386.patch | 18 +++----
 .../libcxx/libcxxabi-arm-ehabi-fix.patch      | 18 +++----
 .../llvm-runtimes-builtins-build-check.diff   |  8 +--
 debian/patches/lower-python-dep.diff          |  8 +--
 debian/patches/mips/mips-D101773-reloc.patch  |  8 +--
 debian/patches/openmp-fix-runtimes-build.diff | 50 +++++++++----------
 .../patches/remove-apple-clang-manpage.diff   | 10 ++--
 19 files changed, 137 insertions(+), 137 deletions(-)

diff --git a/debian/patches/0049-Use-Debian-provided-MathJax-everywhere.patch b/debian/patches/0049-Use-Debian-provided-MathJax-everywhere.patch
index 9b86e0b1..624d7fb1 100644
--- a/debian/patches/0049-Use-Debian-provided-MathJax-everywhere.patch
+++ b/debian/patches/0049-Use-Debian-provided-MathJax-everywhere.patch
@@ -13,11 +13,11 @@ Subject: Use Debian-provided MathJax everywhere.
  polly/docs/doxygen.cfg.in             | 2 +-
  8 files changed, 14 insertions(+), 5 deletions(-)
 
-Index: llvm-toolchain-snapshot_14~++20220112110040+612f5ed88231/clang-tools-extra/docs/conf.py
+Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang-tools-extra/docs/conf.py
 ===================================================================
---- llvm-toolchain-snapshot_14~++20220112110040+612f5ed88231.orig/clang-tools-extra/docs/conf.py
-+++ llvm-toolchain-snapshot_14~++20220112110040+612f5ed88231/clang-tools-extra/docs/conf.py
-@@ -123,6 +123,9 @@ html_theme = 'haiku'
+--- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/clang-tools-extra/docs/conf.py
++++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang-tools-extra/docs/conf.py
+@@ -119,6 +119,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_14~++20220112110040+612f5ed88231/clang-tools-extr
  # 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_14~++20220112110040+612f5ed88231/clang-tools-extra/docs/doxygen.cfg.in
+Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang-tools-extra/docs/doxygen.cfg.in
 ===================================================================
---- llvm-toolchain-snapshot_14~++20220112110040+612f5ed88231.orig/clang-tools-extra/docs/doxygen.cfg.in
-+++ llvm-toolchain-snapshot_14~++20220112110040+612f5ed88231/clang-tools-extra/docs/doxygen.cfg.in
+--- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/clang-tools-extra/docs/doxygen.cfg.in
++++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/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_14~++20220112110040+612f5ed88231/clang-tools-extr
  
  # 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_14~++20220112110040+612f5ed88231/clang/docs/analyzer/conf.py
+Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang/docs/analyzer/conf.py
 ===================================================================
---- llvm-toolchain-snapshot_14~++20220112110040+612f5ed88231.orig/clang/docs/analyzer/conf.py
-+++ llvm-toolchain-snapshot_14~++20220112110040+612f5ed88231/clang/docs/analyzer/conf.py
+--- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/clang/docs/analyzer/conf.py
++++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/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,11 +54,11 @@ Index: llvm-toolchain-snapshot_14~++20220112110040+612f5ed88231/clang/docs/analy
  # 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_14~++20220112110040+612f5ed88231/clang/docs/conf.py
+Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang/docs/conf.py
 ===================================================================
---- llvm-toolchain-snapshot_14~++20220112110040+612f5ed88231.orig/clang/docs/conf.py
-+++ llvm-toolchain-snapshot_14~++20220112110040+612f5ed88231/clang/docs/conf.py
-@@ -141,6 +141,9 @@ html_theme = 'haiku'
+--- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/clang/docs/conf.py
++++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang/docs/conf.py
+@@ -137,6 +137,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_14~++20220112110040+612f5ed88231/clang/docs/conf.
  # 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_14~++20220112110040+612f5ed88231/clang/docs/doxygen.cfg.in
+Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang/docs/doxygen.cfg.in
 ===================================================================
---- llvm-toolchain-snapshot_14~++20220112110040+612f5ed88231.orig/clang/docs/doxygen.cfg.in
-+++ llvm-toolchain-snapshot_14~++20220112110040+612f5ed88231/clang/docs/doxygen.cfg.in
+--- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/clang/docs/doxygen.cfg.in
++++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/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_14~++20220112110040+612f5ed88231/clang/docs/doxyg
  
  # 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_14~++20220112110040+612f5ed88231/llvm/docs/doxygen.cfg.in
+Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/llvm/docs/doxygen.cfg.in
 ===================================================================
---- llvm-toolchain-snapshot_14~++20220112110040+612f5ed88231.orig/llvm/docs/doxygen.cfg.in
-+++ llvm-toolchain-snapshot_14~++20220112110040+612f5ed88231/llvm/docs/doxygen.cfg.in
+--- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/llvm/docs/doxygen.cfg.in
++++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/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_14~++20220112110040+612f5ed88231/llvm/docs/doxyge
  
  # 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_14~++20220112110040+612f5ed88231/polly/docs/doxygen.cfg.in
+Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/polly/docs/doxygen.cfg.in
 ===================================================================
---- llvm-toolchain-snapshot_14~++20220112110040+612f5ed88231.orig/polly/docs/doxygen.cfg.in
-+++ llvm-toolchain-snapshot_14~++20220112110040+612f5ed88231/polly/docs/doxygen.cfg.in
+--- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/polly/docs/doxygen.cfg.in
++++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/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/26-set-correct-float-abi.diff b/debian/patches/26-set-correct-float-abi.diff
index 426bcb7a..f7ea5633 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_14~++20211114120952+5b4bfd8c2415/clang/lib/Driver/ToolChains/Arch/ARM.cpp
+Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang/lib/Driver/ToolChains/Arch/ARM.cpp
 ===================================================================
---- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/clang/lib/Driver/ToolChains/Arch/ARM.cpp
-+++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/clang/lib/Driver/ToolChains/Arch/ARM.cpp
-@@ -361,7 +361,7 @@ arm::FloatABI arm::getDefaultFloatABI(co
+--- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/clang/lib/Driver/ToolChains/Arch/ARM.cpp
++++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang/lib/Driver/ToolChains/Arch/ARM.cpp
+@@ -373,7 +373,7 @@ arm::FloatABI arm::getDefaultFloatABI(co
      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 dee0bce8..7c936a84 100644
--- a/debian/patches/930008-arm.diff
+++ b/debian/patches/930008-arm.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/llvm/lib/Support/Triple.cpp
+Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/llvm/lib/Support/Triple.cpp
 ===================================================================
---- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/llvm/lib/Support/Triple.cpp
-+++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/llvm/lib/Support/Triple.cpp
-@@ -1830,7 +1830,7 @@ StringRef Triple::getARMCPUForArch(Strin
+--- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/llvm/lib/Support/Triple.cpp
++++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/llvm/lib/Support/Triple.cpp
+@@ -1913,7 +1913,7 @@ StringRef Triple::getARMCPUForArch(Strin
      case llvm::Triple::EABIHF:
      case llvm::Triple::GNUEABIHF:
      case llvm::Triple::MuslEABIHF:
diff --git a/debian/patches/clang-arm-default-vfp3-on-armv7a.patch b/debian/patches/clang-arm-default-vfp3-on-armv7a.patch
index b96de64f..985a2d36 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_15~++20220407011631+46f0e2ceb487/llvm/include/llvm/Support/ARMTargetParser.def
+Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/llvm/include/llvm/Support/ARMTargetParser.def
 ===================================================================
---- llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487.orig/llvm/include/llvm/Support/ARMTargetParser.def
-+++ llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/llvm/include/llvm/Support/ARMTargetParser.def
-@@ -76,7 +76,7 @@ ARM_ARCH("armv6kz", ARMV6KZ, "6KZ", "v6k
+--- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/llvm/include/llvm/Support/ARMTargetParser.def
++++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/llvm/include/llvm/Support/ARMTargetParser.def
+@@ -68,7 +68,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_15~++20220407011631+46f0e2ceb487/llvm/include/llv
  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_15~++20220407011631+46f0e2ceb487/llvm/lib/Target/ARM/ARM.td
+Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/llvm/lib/Target/ARM/ARM.td
 ===================================================================
---- llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487.orig/llvm/lib/Target/ARM/ARM.td
-+++ llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/llvm/lib/Target/ARM/ARM.td
-@@ -855,7 +855,8 @@ def ARMv6sm   : Architecture<"armv6s-m",
+--- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/llvm/lib/Target/ARM/ARM.td
++++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/llvm/lib/Target/ARM/ARM.td
+@@ -892,7 +892,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 f248a1ac..74961c10 100644
--- a/debian/patches/clang-baseline-fix-i386.patch
+++ b/debian/patches/clang-baseline-fix-i386.patch
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/clang/lib/Driver/ToolChains/Arch/X86.cpp
+Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang/lib/Driver/ToolChains/Arch/X86.cpp
 ===================================================================
---- llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487.orig/clang/lib/Driver/ToolChains/Arch/X86.cpp
-+++ llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/clang/lib/Driver/ToolChains/Arch/X86.cpp
-@@ -109,8 +109,8 @@ std::string x86::getX86TargetCPU(const D
+--- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/clang/lib/Driver/ToolChains/Arch/X86.cpp
++++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang/lib/Driver/ToolChains/Arch/X86.cpp
+@@ -114,8 +114,8 @@ std::string x86::getX86TargetCPU(const D
    case llvm::Triple::FreeBSD:
      return "i686";
    default:
diff --git a/debian/patches/clangd-atomic-cmake.patch b/debian/patches/clangd-atomic-cmake.patch
index be7ee153..d0a38279 100644
--- a/debian/patches/clangd-atomic-cmake.patch
+++ b/debian/patches/clangd-atomic-cmake.patch
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/clang-tools-extra/clangd/CMakeLists.txt
+Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang-tools-extra/clangd/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/clang-tools-extra/clangd/CMakeLists.txt
-+++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/clang-tools-extra/clangd/CMakeLists.txt
+--- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/clang-tools-extra/clangd/CMakeLists.txt
++++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang-tools-extra/clangd/CMakeLists.txt
 @@ -52,6 +52,11 @@ endif()
  
  include_directories(BEFORE "${CMAKE_CURRENT_BINARY_DIR}/../clang-tidy")
@@ -14,7 +14,7 @@ Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/clang-tools-extr
  add_clang_library(clangDaemon
    AST.cpp
    ASTSignals.cpp
-@@ -164,6 +169,7 @@ clang_target_link_libraries(clangDaemon
+@@ -166,6 +171,7 @@ clang_target_link_libraries(clangDaemon
  target_link_libraries(clangDaemon
    PRIVATE
    ${LLVM_PTHREAD_LIB}
diff --git a/debian/patches/compilerrt-build-scudo-standalone-option.diff b/debian/patches/compilerrt-build-scudo-standalone-option.diff
index e777eb94..e13a3bc8 100644
--- a/debian/patches/compilerrt-build-scudo-standalone-option.diff
+++ b/debian/patches/compilerrt-build-scudo-standalone-option.diff
@@ -1,10 +1,10 @@
 add option to disable compiler-rt scudo standalone allocator as it is
 not always supported by all arch profiles such as arm5vt of ARM32 arch
-Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/compiler-rt/CMakeLists.txt
+Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/compiler-rt/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8.orig/compiler-rt/CMakeLists.txt
-+++ llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/compiler-rt/CMakeLists.txt
-@@ -267,6 +267,12 @@ option(COMPILER_RT_USE_BUILTINS_LIBRARY
+--- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/compiler-rt/CMakeLists.txt
++++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/compiler-rt/CMakeLists.txt
+@@ -271,6 +271,12 @@ option(COMPILER_RT_USE_BUILTINS_LIBRARY
  
  include(config-ix)
  
diff --git a/debian/patches/disable-sse2-old-x86.diff b/debian/patches/disable-sse2-old-x86.diff
index fb986b5a..b02eb070 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_15~++20220314071859+3b61587c9e27/llvm/include/llvm/Support/X86TargetParser.def
+Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/llvm/include/llvm/Support/X86TargetParser.def
 ===================================================================
---- llvm-toolchain-snapshot_15~++20220314071859+3b61587c9e27.orig/llvm/include/llvm/Support/X86TargetParser.def
-+++ llvm-toolchain-snapshot_15~++20220314071859+3b61587c9e27/llvm/include/llvm/Support/X86TargetParser.def
-@@ -225,7 +225,7 @@ CPU_SPECIFIC("pentium_mmx", "pentium-mmx
+--- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/llvm/include/llvm/Support/X86TargetParser.def
++++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/llvm/include/llvm/Support/X86TargetParser.def
+@@ -226,7 +226,7 @@ CPU_SPECIFIC("pentium_mmx", "pentium-mmx
  CPU_SPECIFIC("pentium_ii", "pentium2", 'E', "+cmov,+mmx")
  CPU_SPECIFIC("pentium_iii", "pentium3", 'H', "+cmov,+mmx,+sse")
  CPU_SPECIFIC_ALIAS("pentium_iii_no_xmm_regs", "pentium3", "pentium_iii")
diff --git a/debian/patches/hurd/hurd-pathmax.diff b/debian/patches/hurd/hurd-pathmax.diff
index a46a54ba..421aebd8 100644
--- a/debian/patches/hurd/hurd-pathmax.diff
+++ b/debian/patches/hurd/hurd-pathmax.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/clang/lib/Basic/FileManager.cpp
+Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang/lib/Basic/FileManager.cpp
 ===================================================================
---- llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487.orig/clang/lib/Basic/FileManager.cpp
-+++ llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/clang/lib/Basic/FileManager.cpp
-@@ -599,6 +599,12 @@ FileManager::getNoncachedStatValue(Strin
+--- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/clang/lib/Basic/FileManager.cpp
++++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang/lib/Basic/FileManager.cpp
+@@ -610,6 +610,12 @@ FileManager::getNoncachedStatValue(Strin
    return std::error_code();
  }
  
@@ -15,10 +15,10 @@ Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/clang/lib/Basic/
  void FileManager::GetUniqueIDMapping(
      SmallVectorImpl<const FileEntry *> &UIDToFiles) const {
    UIDToFiles.clear();
-Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/lldb/include/lldb/lldb-defines.h
+Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/lldb/include/lldb/lldb-defines.h
 ===================================================================
---- llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487.orig/lldb/include/lldb/lldb-defines.h
-+++ llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/lldb/include/lldb/lldb-defines.h
+--- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/lldb/include/lldb/lldb-defines.h
++++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/lldb/include/lldb/lldb-defines.h
 @@ -15,6 +15,11 @@
  #define INT32_MAX 2147483647
  #endif
@@ -31,10 +31,10 @@ Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/lldb/include/lld
  #if !defined(UINT32_MAX)
  #define UINT32_MAX 4294967295U
  #endif
-Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/polly/lib/External/ppcg/cuda_common.c
+Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/polly/lib/External/ppcg/cuda_common.c
 ===================================================================
---- llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487.orig/polly/lib/External/ppcg/cuda_common.c
-+++ llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/polly/lib/External/ppcg/cuda_common.c
+--- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/polly/lib/External/ppcg/cuda_common.c
++++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/polly/lib/External/ppcg/cuda_common.c
 @@ -15,6 +15,11 @@
  #include "cuda_common.h"
  #include "ppcg.h"
diff --git a/debian/patches/issue-54242.diff b/debian/patches/issue-54242.diff
index 3b0abd6d..3f4fa75a 100644
--- a/debian/patches/issue-54242.diff
+++ b/debian/patches/issue-54242.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/mlir/lib/ExecutionEngine/CMakeLists.txt
+Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/mlir/lib/ExecutionEngine/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8.orig/mlir/lib/ExecutionEngine/CMakeLists.txt
-+++ llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/mlir/lib/ExecutionEngine/CMakeLists.txt
-@@ -57,7 +57,7 @@ endif(LLVM_USE_PERF)
+--- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/mlir/lib/ExecutionEngine/CMakeLists.txt
++++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/mlir/lib/ExecutionEngine/CMakeLists.txt
+@@ -56,7 +56,7 @@ endif(LLVM_USE_PERF)
  add_mlir_library(MLIRExecutionEngine
    ExecutionEngine.cpp
  
diff --git a/debian/patches/libcxx-armhf-ftbfs.diff b/debian/patches/libcxx-armhf-ftbfs.diff
index 6251d322..fde8436a 100644
--- a/debian/patches/libcxx-armhf-ftbfs.diff
+++ b/debian/patches/libcxx-armhf-ftbfs.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/libcxx/include/atomic
+Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/libcxx/include/atomic
 ===================================================================
---- llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8.orig/libcxx/include/atomic
-+++ llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/libcxx/include/atomic
-@@ -2687,9 +2687,13 @@ typedef conditional<_LIBCPP_CONTENTION_L
+--- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/libcxx/include/atomic
++++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/libcxx/include/atomic
+@@ -2640,9 +2640,13 @@ typedef conditional<_LIBCPP_CONTENTION_L
  #endif
  
  #if !defined(_LIBCPP_NO_LOCK_FREE_TYPES)
diff --git a/debian/patches/libcxx-libatomic-only-with-gcc-rtlib.diff b/debian/patches/libcxx-libatomic-only-with-gcc-rtlib.diff
index a87e1a11..3a53afe6 100644
--- a/debian/patches/libcxx-libatomic-only-with-gcc-rtlib.diff
+++ b/debian/patches/libcxx-libatomic-only-with-gcc-rtlib.diff
@@ -1,9 +1,9 @@
 if libatomic is found only link it if libgcc is the rtlib
-Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/libcxx/CMakeLists.txt
+Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/libcxx/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8.orig/libcxx/CMakeLists.txt
-+++ llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/libcxx/CMakeLists.txt
-@@ -774,12 +774,14 @@ function(cxx_link_system_libraries targe
+--- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/libcxx/CMakeLists.txt
++++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/libcxx/CMakeLists.txt
+@@ -777,12 +777,14 @@ function(cxx_link_system_libraries targe
      endif()
    elseif (LIBCXX_HAS_GCC_LIB)
      target_link_libraries(${target} PRIVATE gcc)
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 c47b6e7c..ba43d6ed 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,13 +10,13 @@ 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_15~++20220407011631+46f0e2ceb487/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp
+Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp
 ===================================================================
---- llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487.orig/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp
-+++ llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp
-@@ -21,6 +21,14 @@
- # error Feature test macro missing.
- #endif
+--- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp
++++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp
+@@ -17,6 +17,14 @@
+ 
+ #include "test_macros.h"
  
 +#if defined(__i386__) && defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8)
 +/* Fix for clang setting __GCC_ATOMIC_LLONG_LOCK_FREE incorecctly for x86
@@ -26,6 +26,6 @@ Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/libcxx/test/std/
 +#define ATOMIC_LLONG_LOCK_FREE 2
 +#endif
 +
- template <typename T> void checkAlwaysLockFree() {
-   if (std::atomic<T>::is_always_lock_free)
-     assert(std::atomic<T>().is_lock_free());
+ template <typename T>
+ void checkAlwaysLockFree() {
+   if (std::atomic<T>::is_always_lock_free) {
diff --git a/debian/patches/libcxx/libcxxabi-arm-ehabi-fix.patch b/debian/patches/libcxx/libcxxabi-arm-ehabi-fix.patch
index 8e26cf32..fa5d859c 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_14~++20211114120952+5b4bfd8c2415/libcxxabi/src/cxa_exception.cpp
+Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/libcxxabi/src/cxa_exception.cpp
 ===================================================================
---- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/libcxxabi/src/cxa_exception.cpp
-+++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/libcxxabi/src/cxa_exception.cpp
+--- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/libcxxabi/src/cxa_exception.cpp
++++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/libcxxabi/src/cxa_exception.cpp
 @@ -275,15 +275,16 @@ __cxa_throw(void *thrown_object, std::ty
  
  #ifdef __USING_SJLJ_EXCEPTIONS__
@@ -30,7 +30,7 @@ Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/libcxxabi/src/cx
  // 2.5.3 Exception Handlers
  /*
  The adjusted pointer is computed by the personality routine during phase 1
-@@ -551,7 +552,11 @@ void __cxa_end_catch() {
+@@ -567,7 +568,11 @@ void __cxa_end_catch() {
              //    to touch a foreign exception in any way, that is undefined
              //     behavior.  They likely can't since the only way to catch
              //     a foreign exception is with catch (...)!
@@ -42,7 +42,7 @@ Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/libcxxabi/src/cx
              globals->caughtExceptions = 0;
          }
      }
-@@ -608,8 +613,10 @@ void __cxa_rethrow() {
+@@ -624,8 +629,10 @@ void __cxa_rethrow() {
      }
  #ifdef __USING_SJLJ_EXCEPTIONS__
      _Unwind_SjLj_RaiseException(&exception_header->unwindHeader);
@@ -54,7 +54,7 @@ Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/libcxxabi/src/cx
  #endif
  
      //  If we get here, some kind of unwinding error has occurred.
-@@ -733,8 +740,10 @@ __cxa_rethrow_primary_exception(void* th
+@@ -749,8 +756,10 @@ __cxa_rethrow_primary_exception(void* th
          dep_exception_header->unwindHeader.exception_cleanup = dependent_exception_cleanup;
  #ifdef __USING_SJLJ_EXCEPTIONS__
          _Unwind_SjLj_RaiseException(&dep_exception_header->unwindHeader);
@@ -66,10 +66,10 @@ Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/libcxxabi/src/cx
  #endif
          // Some sort of unwinding error.  Note that terminate is a handler.
          __cxa_begin_catch(&dep_exception_header->unwindHeader);
-Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/libcxxabi/src/cxa_exception.h
+Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/libcxxabi/src/cxa_exception.h
 ===================================================================
---- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/libcxxabi/src/cxa_exception.h
-+++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/libcxxabi/src/cxa_exception.h
+--- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/libcxxabi/src/cxa_exception.h
++++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/libcxxabi/src/cxa_exception.h
 @@ -27,6 +27,45 @@ _LIBCXXABI_HIDDEN uint64_t __getExceptio
  _LIBCXXABI_HIDDEN void     __setExceptionClass  (      _Unwind_Exception*, uint64_t);
  _LIBCXXABI_HIDDEN bool     __isOurExceptionClass(const _Unwind_Exception*);
diff --git a/debian/patches/llvm-runtimes-builtins-build-check.diff b/debian/patches/llvm-runtimes-builtins-build-check.diff
index a79efc52..b92225b3 100644
--- a/debian/patches/llvm-runtimes-builtins-build-check.diff
+++ b/debian/patches/llvm-runtimes-builtins-build-check.diff
@@ -1,10 +1,10 @@
 add a check and only set up and build compiler-rt builtins if they have
 not been disabled
-Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/llvm/runtimes/CMakeLists.txt
+Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/llvm/runtimes/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8.orig/llvm/runtimes/CMakeLists.txt
-+++ llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/llvm/runtimes/CMakeLists.txt
-@@ -134,7 +134,12 @@ endfunction()
+--- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/llvm/runtimes/CMakeLists.txt
++++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/llvm/runtimes/CMakeLists.txt
+@@ -124,7 +124,12 @@ endfunction()
  # is required because the other runtimes need the builtin libraries present
  # before the just-built compiler can pass the configuration tests.
  get_compiler_rt_path(compiler_rt_path)
diff --git a/debian/patches/lower-python-dep.diff b/debian/patches/lower-python-dep.diff
index 1870d8a1..e00aed77 100644
--- a/debian/patches/lower-python-dep.diff
+++ b/debian/patches/lower-python-dep.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_16~++20220806085305+0c9258612b67/llvm/CMakeLists.txt
+Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/llvm/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_16~++20220806085305+0c9258612b67.orig/llvm/CMakeLists.txt
-+++ llvm-toolchain-snapshot_16~++20220806085305+0c9258612b67/llvm/CMakeLists.txt
-@@ -763,8 +763,8 @@ set(LLVM_PROFDATA_FILE "" CACHE FILEPATH
+--- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/llvm/CMakeLists.txt
++++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/llvm/CMakeLists.txt
+@@ -811,8 +811,8 @@ set(LLVM_PROFDATA_FILE "" CACHE FILEPATH
    "Profiling data file to use when compiling in order to improve runtime performance.")
  
  if(LLVM_INCLUDE_TESTS)
diff --git a/debian/patches/mips/mips-D101773-reloc.patch b/debian/patches/mips/mips-D101773-reloc.patch
index 516285cb..09213f3c 100644
--- a/debian/patches/mips/mips-D101773-reloc.patch
+++ b/debian/patches/mips/mips-D101773-reloc.patch
@@ -24,11 +24,11 @@ Differential Revision: https://reviews.llvm.org/D101773
  2 files changed, 33 insertions(+)
  create mode 100644 llvm/test/MC/Mips/mips_lo16.s
 
-Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/llvm/lib/MC/ELFObjectWriter.cpp
+Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/llvm/lib/MC/ELFObjectWriter.cpp
 ===================================================================
---- llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487.orig/llvm/lib/MC/ELFObjectWriter.cpp
-+++ llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/llvm/lib/MC/ELFObjectWriter.cpp
-@@ -1367,6 +1367,17 @@ bool ELFObjectWriter::shouldRelocateWith
+--- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/llvm/lib/MC/ELFObjectWriter.cpp
++++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/llvm/lib/MC/ELFObjectWriter.cpp
+@@ -1369,6 +1369,17 @@ bool ELFObjectWriter::shouldRelocateWith
        if (TargetObjectWriter->getEMachine() == ELF::EM_MIPS &&
            !hasRelocationAddend())
          return true;
diff --git a/debian/patches/openmp-fix-runtimes-build.diff b/debian/patches/openmp-fix-runtimes-build.diff
index 242b3276..a80cd5da 100644
--- a/debian/patches/openmp-fix-runtimes-build.diff
+++ b/debian/patches/openmp-fix-runtimes-build.diff
@@ -1,10 +1,10 @@
 include required runtimes as dependencies to openmp targets to make sure
 they are built first when included as part of a runtimes build since openmp
 can depend on them
-Index: llvm-toolchain-snapshot_16~++20220910093754+e57ded44d499/llvm/runtimes/CMakeLists.txt
+Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/llvm/runtimes/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_16~++20220910093754+e57ded44d499.orig/llvm/runtimes/CMakeLists.txt
-+++ llvm-toolchain-snapshot_16~++20220910093754+e57ded44d499/llvm/runtimes/CMakeLists.txt
+--- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/llvm/runtimes/CMakeLists.txt
++++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/llvm/runtimes/CMakeLists.txt
 @@ -235,6 +235,7 @@ function(runtime_default_target)
                                        -DLLVM_ENABLE_PROJECTS_USED=${LLVM_ENABLE_PROJECTS_USED}
                                        -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=${LLVM_ENABLE_PER_TARGET_RUNTIME_DIR_default}
@@ -22,10 +22,10 @@ Index: llvm-toolchain-snapshot_16~++20220910093754+e57ded44d499/llvm/runtimes/CM
      # We need to add the runtimes as a dependency because compiler-rt can be
      # built as part of runtimes and we need the profile runtime for PGO
      add_dependencies(clang-bootstrap-deps runtimes)
-Index: llvm-toolchain-snapshot_16~++20220910093754+e57ded44d499/openmp/CMakeLists.txt
+Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/openmp/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_16~++20220910093754+e57ded44d499.orig/openmp/CMakeLists.txt
-+++ llvm-toolchain-snapshot_16~++20220910093754+e57ded44d499/openmp/CMakeLists.txt
+--- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/openmp/CMakeLists.txt
++++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/openmp/CMakeLists.txt
 @@ -83,6 +83,28 @@ else()
    set(LIBOMP_HEADERS_INSTALL_PATH "${OPENMP_INSTALL_LIBDIR}/clang/${CLANG_VERSION}/include")
  endif()
@@ -55,10 +55,10 @@ Index: llvm-toolchain-snapshot_16~++20220910093754+e57ded44d499/openmp/CMakeList
  # Build host runtime library, after LIBOMPTARGET variables are set since they are needed
  # to enable time profiling support in the OpenMP runtime.
  add_subdirectory(runtime)
-Index: llvm-toolchain-snapshot_16~++20220910093754+e57ded44d499/openmp/libomptarget/plugins/CMakeLists.txt
+Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/openmp/libomptarget/plugins/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_16~++20220910093754+e57ded44d499.orig/openmp/libomptarget/plugins/CMakeLists.txt
-+++ llvm-toolchain-snapshot_16~++20220910093754+e57ded44d499/openmp/libomptarget/plugins/CMakeLists.txt
+--- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/openmp/libomptarget/plugins/CMakeLists.txt
++++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/openmp/libomptarget/plugins/CMakeLists.txt
 @@ -48,6 +48,8 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "${tma
        NO_INSTALL_RPATH
      )
@@ -68,10 +68,10 @@ Index: llvm-toolchain-snapshot_16~++20220910093754+e57ded44d499/openmp/libomptar
      # Install plugin under the lib destination folder.
      install(TARGETS "omptarget.rtl.${tmachine_libname}"
        LIBRARY DESTINATION "${OPENMP_INSTALL_LIBDIR}")
-Index: llvm-toolchain-snapshot_16~++20220910093754+e57ded44d499/openmp/libomptarget/plugins/cuda/CMakeLists.txt
+Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/openmp/libomptarget/plugins/cuda/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_16~++20220910093754+e57ded44d499.orig/openmp/libomptarget/plugins/cuda/CMakeLists.txt
-+++ llvm-toolchain-snapshot_16~++20220910093754+e57ded44d499/openmp/libomptarget/plugins/cuda/CMakeLists.txt
+--- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/openmp/libomptarget/plugins/cuda/CMakeLists.txt
++++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/openmp/libomptarget/plugins/cuda/CMakeLists.txt
 @@ -84,6 +84,8 @@ else()
  endif()
  add_dependencies(omptarget.rtl.cuda omptarget.devicertl.nvptx)
@@ -81,10 +81,10 @@ Index: llvm-toolchain-snapshot_16~++20220910093754+e57ded44d499/openmp/libomptar
  # Install plugin under the lib destination folder.
  install(TARGETS omptarget.rtl.cuda LIBRARY DESTINATION "${OPENMP_INSTALL_LIBDIR}")
  set_target_properties(omptarget.rtl.cuda PROPERTIES 
-Index: llvm-toolchain-snapshot_16~++20220910093754+e57ded44d499/openmp/libomptarget/src/CMakeLists.txt
+Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/openmp/libomptarget/src/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_16~++20220910093754+e57ded44d499.orig/openmp/libomptarget/src/CMakeLists.txt
-+++ llvm-toolchain-snapshot_16~++20220910093754+e57ded44d499/openmp/libomptarget/src/CMakeLists.txt
+--- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/openmp/libomptarget/src/CMakeLists.txt
++++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/openmp/libomptarget/src/CMakeLists.txt
 @@ -34,7 +34,9 @@ add_llvm_library(omptarget
    PRIVATE
    "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/exports"
@@ -96,11 +96,11 @@ Index: llvm-toolchain-snapshot_16~++20220910093754+e57ded44d499/openmp/libomptar
  target_include_directories(omptarget PRIVATE ${LIBOMPTARGET_INCLUDE_DIR})
  
  # libomptarget.so needs to be aware of where the plugins live as they
-Index: llvm-toolchain-snapshot_16~++20220910093754+e57ded44d499/openmp/runtime/CMakeLists.txt
+Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/openmp/runtime/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_16~++20220910093754+e57ded44d499.orig/openmp/runtime/CMakeLists.txt
-+++ llvm-toolchain-snapshot_16~++20220910093754+e57ded44d499/openmp/runtime/CMakeLists.txt
-@@ -287,6 +287,10 @@ if(LIBOMP_STATS)
+--- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/openmp/runtime/CMakeLists.txt
++++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/openmp/runtime/CMakeLists.txt
+@@ -292,6 +292,10 @@ if(LIBOMP_STATS)
    set(LIBOMP_USE_STDCPPLIB TRUE)
  endif()
  
@@ -111,10 +111,10 @@ Index: llvm-toolchain-snapshot_16~++20220910093754+e57ded44d499/openmp/runtime/C
  # Shared library can be switched to a static library
  set(LIBOMP_ENABLE_SHARED TRUE CACHE BOOL
    "Shared library instead of static library?")
-Index: llvm-toolchain-snapshot_16~++20220910093754+e57ded44d499/openmp/runtime/src/CMakeLists.txt
+Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/openmp/runtime/src/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_16~++20220910093754+e57ded44d499.orig/openmp/runtime/src/CMakeLists.txt
-+++ llvm-toolchain-snapshot_16~++20220910093754+e57ded44d499/openmp/runtime/src/CMakeLists.txt
+--- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/openmp/runtime/src/CMakeLists.txt
++++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/openmp/runtime/src/CMakeLists.txt
 @@ -135,6 +135,7 @@ endif()
  if(NOT ${LIBOMP_USE_STDCPPLIB})
    set(LIBOMP_LINKER_LANGUAGE C)
@@ -132,10 +132,10 @@ Index: llvm-toolchain-snapshot_16~++20220910093754+e57ded44d499/openmp/runtime/s
  # Get the library's location within the build tree for the unit tester
  if(NOT WIN32)
    get_target_property(LIBOMP_LIBRARY_DIR omp LIBRARY_OUTPUT_DIRECTORY)
-Index: llvm-toolchain-snapshot_16~++20220910093754+e57ded44d499/openmp/tools/archer/CMakeLists.txt
+Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/openmp/tools/archer/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_16~++20220910093754+e57ded44d499.orig/openmp/tools/archer/CMakeLists.txt
-+++ llvm-toolchain-snapshot_16~++20220910093754+e57ded44d499/openmp/tools/archer/CMakeLists.txt
+--- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/openmp/tools/archer/CMakeLists.txt
++++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/openmp/tools/archer/CMakeLists.txt
 @@ -14,6 +14,9 @@ if(LIBOMP_OMPT_SUPPORT)
    add_library(archer SHARED ompt-tsan.cpp)
    add_library(archer_static STATIC ompt-tsan.cpp)
diff --git a/debian/patches/remove-apple-clang-manpage.diff b/debian/patches/remove-apple-clang-manpage.diff
index c12f1a70..47e7bd78 100644
--- a/debian/patches/remove-apple-clang-manpage.diff
+++ b/debian/patches/remove-apple-clang-manpage.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/clang/docs/CommandGuide/clang.rst
+Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang/docs/CommandGuide/clang.rst
 ===================================================================
---- llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487.orig/clang/docs/CommandGuide/clang.rst
-+++ llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/clang/docs/CommandGuide/clang.rst
-@@ -321,24 +321,10 @@ Clang fully supports cross compilation a
+--- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/clang/docs/CommandGuide/clang.rst
++++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang/docs/CommandGuide/clang.rst
+@@ -345,24 +345,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.
  
@@ -27,7 +27,7 @@ Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/clang/docs/Comma
  .. option:: --print-supported-cpus
  
    Print out a list of supported processors for the given target (specified
-@@ -657,11 +643,6 @@ ENVIRONMENT
+@@ -681,11 +667,6 @@ ENVIRONMENT
    These environment variables specify additional paths, as for :envvar:`CPATH`, which are
    only used when processing the appropriate language.