diff --git a/debian/patches/fix-typo-1018770.diff b/debian/patches/fix-typo-1018770.diff
index 8530a49e..65123ed9 100644
--- a/debian/patches/fix-typo-1018770.diff
+++ b/debian/patches/fix-typo-1018770.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-14-14.0.6/llvm/include/llvm/Target/TargetMachine.h
+Index: llvm-toolchain-snapshot_16~++20220908094745+0444b40ed339/llvm/include/llvm/Target/TargetMachine.h
 ===================================================================
---- llvm-toolchain-14-14.0.6.orig/llvm/include/llvm/Target/TargetMachine.h
-+++ llvm-toolchain-14-14.0.6/llvm/include/llvm/Target/TargetMachine.h
-@@ -439,13 +439,13 @@ public:
+--- llvm-toolchain-snapshot_16~++20220908094745+0444b40ed339.orig/llvm/include/llvm/Target/TargetMachine.h
++++ llvm-toolchain-snapshot_16~++20220908094745+0444b40ed339/llvm/include/llvm/Target/TargetMachine.h
+@@ -447,13 +447,13 @@ public:
                                       raw_pwrite_stream &, raw_pwrite_stream *,
                                       CodeGenFileType, CGPassBuilderOption,
                                       PassInstrumentationCallbacks *) {
diff --git a/debian/patches/openmp-fix-runtimes-build.diff b/debian/patches/openmp-fix-runtimes-build.diff
index 81ccf8ca..242b3276 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~++20220909084606+06413618eae9/llvm/runtimes/CMakeLists.txt
+Index: llvm-toolchain-snapshot_16~++20220910093754+e57ded44d499/llvm/runtimes/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_16~++20220909084606+06413618eae9.orig/llvm/runtimes/CMakeLists.txt
-+++ llvm-toolchain-snapshot_16~++20220909084606+06413618eae9/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
 @@ -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,13 +22,13 @@ Index: llvm-toolchain-snapshot_16~++20220909084606+06413618eae9/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~++20220909084606+06413618eae9/openmp/CMakeLists.txt
+Index: llvm-toolchain-snapshot_16~++20220910093754+e57ded44d499/openmp/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_16~++20220909084606+06413618eae9.orig/openmp/CMakeLists.txt
-+++ llvm-toolchain-snapshot_16~++20220909084606+06413618eae9/openmp/CMakeLists.txt
-@@ -75,6 +75,28 @@ option(OPENMP_ENABLE_LIBOMPTARGET "Enabl
-        ${ENABLE_LIBOMPTARGET})
- option(OPENMP_ENABLE_LIBOMP_PROFILING "Enable time profiling for libomp." OFF)
+--- llvm-toolchain-snapshot_16~++20220910093754+e57ded44d499.orig/openmp/CMakeLists.txt
++++ llvm-toolchain-snapshot_16~++20220910093754+e57ded44d499/openmp/CMakeLists.txt
+@@ -83,6 +83,28 @@ else()
+   set(LIBOMP_HEADERS_INSTALL_PATH "${OPENMP_INSTALL_LIBDIR}/clang/${CLANG_VERSION}/include")
+ endif()
  
 +option(OPENMP_USE_LLVM_UNWINDER "Build and use the LLVM unwinder" OFF)
 +
@@ -55,24 +55,24 @@ Index: llvm-toolchain-snapshot_16~++20220909084606+06413618eae9/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~++20220909084606+06413618eae9/openmp/libomptarget/plugins/CMakeLists.txt
+Index: llvm-toolchain-snapshot_16~++20220910093754+e57ded44d499/openmp/libomptarget/plugins/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_16~++20220909084606+06413618eae9.orig/openmp/libomptarget/plugins/CMakeLists.txt
-+++ llvm-toolchain-snapshot_16~++20220909084606+06413618eae9/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
 @@ -48,6 +48,8 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "${tma
        NO_INSTALL_RPATH
      )
  
-+    add_runtimes_build_depends_if_needed("omptarget.rtl.${tmachine_libname}")
++  add_runtimes_build_depends_if_needed("omptarget.rtl.${tmachine_libname}")
 +
      # Install plugin under the lib destination folder.
      install(TARGETS "omptarget.rtl.${tmachine_libname}"
        LIBRARY DESTINATION "${OPENMP_INSTALL_LIBDIR}")
-Index: llvm-toolchain-snapshot_16~++20220909084606+06413618eae9/openmp/libomptarget/plugins/cuda/CMakeLists.txt
+Index: llvm-toolchain-snapshot_16~++20220910093754+e57ded44d499/openmp/libomptarget/plugins/cuda/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_16~++20220909084606+06413618eae9.orig/openmp/libomptarget/plugins/cuda/CMakeLists.txt
-+++ llvm-toolchain-snapshot_16~++20220909084606+06413618eae9/openmp/libomptarget/plugins/cuda/CMakeLists.txt
-@@ -80,6 +80,8 @@ else()
+--- 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
+@@ -84,6 +84,8 @@ else()
  endif()
  add_dependencies(omptarget.rtl.cuda omptarget.devicertl.nvptx)
  
@@ -81,10 +81,10 @@ Index: llvm-toolchain-snapshot_16~++20220909084606+06413618eae9/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~++20220909084606+06413618eae9/openmp/libomptarget/src/CMakeLists.txt
+Index: llvm-toolchain-snapshot_16~++20220910093754+e57ded44d499/openmp/libomptarget/src/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_16~++20220909084606+06413618eae9.orig/openmp/libomptarget/src/CMakeLists.txt
-+++ llvm-toolchain-snapshot_16~++20220909084606+06413618eae9/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
 @@ -34,7 +34,9 @@ add_llvm_library(omptarget
    PRIVATE
    "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/exports"
@@ -96,10 +96,10 @@ Index: llvm-toolchain-snapshot_16~++20220909084606+06413618eae9/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~++20220909084606+06413618eae9/openmp/runtime/CMakeLists.txt
+Index: llvm-toolchain-snapshot_16~++20220910093754+e57ded44d499/openmp/runtime/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_16~++20220909084606+06413618eae9.orig/openmp/runtime/CMakeLists.txt
-+++ llvm-toolchain-snapshot_16~++20220909084606+06413618eae9/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)
    set(LIBOMP_USE_STDCPPLIB TRUE)
  endif()
@@ -111,10 +111,10 @@ Index: llvm-toolchain-snapshot_16~++20220909084606+06413618eae9/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~++20220909084606+06413618eae9/openmp/runtime/src/CMakeLists.txt
+Index: llvm-toolchain-snapshot_16~++20220910093754+e57ded44d499/openmp/runtime/src/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_16~++20220909084606+06413618eae9.orig/openmp/runtime/src/CMakeLists.txt
-+++ llvm-toolchain-snapshot_16~++20220909084606+06413618eae9/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
 @@ -135,6 +135,7 @@ endif()
  if(NOT ${LIBOMP_USE_STDCPPLIB})
    set(LIBOMP_LINKER_LANGUAGE C)
@@ -132,10 +132,10 @@ Index: llvm-toolchain-snapshot_16~++20220909084606+06413618eae9/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~++20220909084606+06413618eae9/openmp/tools/archer/CMakeLists.txt
+Index: llvm-toolchain-snapshot_16~++20220910093754+e57ded44d499/openmp/tools/archer/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_16~++20220909084606+06413618eae9.orig/openmp/tools/archer/CMakeLists.txt
-+++ llvm-toolchain-snapshot_16~++20220909084606+06413618eae9/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
 @@ -14,6 +14,9 @@ if(LIBOMP_OMPT_SUPPORT)
    add_library(archer SHARED ompt-tsan.cpp)
    add_library(archer_static STATIC ompt-tsan.cpp)